Merge pull request #2073 from BrzVlad/fix-sgen
authorMark Probst <mark.probst@gmail.com>
Wed, 23 Sep 2015 21:23:26 +0000 (14:23 -0700)
committerMark Probst <mark.probst@gmail.com>
Wed, 23 Sep 2015 21:23:26 +0000 (14:23 -0700)
Fix sgen

291 files changed:
configure.ac
eglib/configure.ac
external/referencesource
mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
mcs/class/Mono.C5/Makefile
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteBase.cs
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/UnsafeNativeMethods.cs
mcs/class/Mono.Data.Sqlite/Test/SqliteConnectionTest.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/ObjectMirror.cs
mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs
mcs/class/Mono.Debugger.Soft/Test/dtest.cs
mcs/class/Mono.Security/Mono.Security.Cryptography/CryptoTools.cs
mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs
mcs/class/System.Drawing/System.Drawing/Point.cs
mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
mcs/class/System.Net.Http/System.Net.Http/HttpClientHandler.cs
mcs/class/System.Net.Http/Test/System.Net.Http/HttpClientTest.cs
mcs/class/System.Security/System.Security.Cryptography.Xml/SignedXml.cs
mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels.Http/HttpReplyChannel.cs
mcs/class/System.ServiceModel/System.ServiceModel.Channels/ReplyChannelBase.cs
mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescriptionGenerator.cs
mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ChannelDispatcher.cs
mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs
mcs/class/System.ServiceModel/Test/System.ServiceModel.Description/ContractDescriptionTest.cs
mcs/class/System.Web.Services/Test/System.Web.Services.Protocols/SocketResponder.cs
mcs/class/System.Web/System.Web.Caching/ResponseElement.cs [deleted file]
mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs [deleted file]
mcs/class/System.Web/System.Web.Compilation/FolderLevelBuildProviderAppliesTo.cs [deleted file]
mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs [deleted file]
mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs [deleted file]
mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/AdapterDictionary.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/AuthenticationMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleAction.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsRedirectMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthPasswordFormat.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/FormsProtectionEnum.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyCompatibilityMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidation.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComImpersonationLevel.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelLogLevel.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/SerializationMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebCachingSectionGroup.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/TraceDisplayMode.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/WebApplicationLevel.cs [deleted file]
mcs/class/System.Web/System.Web.Configuration_2.0/XhtmlConformanceMode.cs [deleted file]
mcs/class/System.Web/System.Web.Profile/ProfileEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.Routing/IRouteConstraint.cs [deleted file]
mcs/class/System.Web/System.Web.Routing/IRouteHandler.cs [deleted file]
mcs/class/System.Web/System.Web.Routing/RouteDirection.cs [deleted file]
mcs/class/System.Web/System.Web.Security/FormsAuthenticationEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.Security/PassportAuthenticationEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.Security/WindowsAuthenticationEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateBehavior.cs [deleted file]
mcs/class/System.Web/System.Web.UI.Adapters/WmlPostFieldType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebActionable.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartField.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartRow.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartTable.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeState.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PersonalizationScope.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartAuthorizationEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartCancelEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventArgs.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartExportMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartHelpMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartVerbsEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventArgs.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/AutoCompleteType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ContentDirection.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventArgs.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControlMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataControlCellType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowState.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeleteEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeletedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewModeEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewPageEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdateEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdatedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeleteEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeletedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewModeEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewPageEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdateEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdatedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewCancelEditEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeleteEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeletedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewEditEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewPageEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewRowEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewSelectEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewSortEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdateEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdatedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/HotSpotMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundItemControl.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/IFieldControl.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/IPersistedSelector.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ImageMapEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/LiteralMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventArgs.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/LogoutAction.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/MailMessageEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/MenuEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/MenuRenderingMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceDisposingEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceFilteringEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceMethodEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceSelectingEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceStatusEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/Orientation.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/PagerButtons.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/PathDirection.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SendMailErrorEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SortDirection.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TableCaptionAlign.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderScope.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TableRowSection.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeSelectAction.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/TreeViewImageSet.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs [deleted file]
mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ClientIDMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ConflictOptions.cs [deleted file]
mcs/class/System.Web/System.Web.UI/DataSourceCacheExpiry.cs [deleted file]
mcs/class/System.Web/System.Web.UI/DataSourceCapabilities.cs [deleted file]
mcs/class/System.Web/System.Web.UI/DataSourceOperation.cs [deleted file]
mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs [deleted file]
mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs [deleted file]
mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs [deleted file]
mcs/class/System.Web/System.Web.UI/PersistenceMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI/TemplateInstance.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ViewStateEncryptionMode.cs [deleted file]
mcs/class/System.Web/System.Web.UI/ViewStateMode.cs [deleted file]
mcs/class/System.Web/System.Web.Util/RequestValidationSource.cs [deleted file]
mcs/class/System.Web/System.Web.dll.sources
mcs/class/System.Web/System.Web/HttpApplicationStateWrapper.cs [deleted file]
mcs/class/System.Web/System.Web/HttpBrowserCapabilitiesWrapper.cs [deleted file]
mcs/class/System.Web/System.Web/HttpCachePolicyWrapper.cs [deleted file]
mcs/class/System.Web/System.Web/HttpSessionStateWrapper.cs [deleted file]
mcs/class/System.Web/System.Web/ReadEntityBodyMode.cs [deleted file]
mcs/class/System.Web/System.Web/RequestNotification.cs [deleted file]
mcs/class/System.Web/System.Web/RequestNotificationStatus.cs [deleted file]
mcs/class/System.Web/System.Web/TraceContextEventArgs.cs [deleted file]
mcs/class/System.Web/System.Web/TraceContextEventHandler.cs [deleted file]
mcs/class/System.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
mcs/class/System.Windows.Forms/Test/System.Windows.Forms/TrackBarTest.cs
mcs/class/System/System.Diagnostics/Stopwatch.cs
mcs/class/System/System.Net.Mail/SmtpClient.cs
mcs/class/System/System.Net/IPAddress.cs
mcs/class/System/Test/System.Net.Mail/SmtpClientTest.cs
mcs/class/System/Test/System.Net.Sockets/SocketTest.cs
mcs/class/System/Test/System.Net/IPAddressTest.cs
mcs/class/System/Test/System.Net/SocketResponder.cs
mcs/class/corlib/System.Runtime.InteropServices/SafeHandle.cs
mcs/class/corlib/System/Delegate.cs
mcs/class/corlib/System/Environment.cs
mcs/class/corlib/System/MulticastDelegate.cs
mcs/class/corlib/Test/System.Reflection/MethodInfoTest.cs
mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
mcs/tools/Makefile
mcs/tools/linker-analyzer/ConsoleDependencyGraph.cs [new file with mode: 0644]
mcs/tools/linker-analyzer/Info.plist [new file with mode: 0644]
mcs/tools/linker-analyzer/LinkerAnalyzer.csproj [new file with mode: 0644]
mcs/tools/linker-analyzer/LinkerAnalyzer.sln [new file with mode: 0644]
mcs/tools/linker-analyzer/LinkerAnalyzerCore/DependencyGraph.cs [new file with mode: 0644]
mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj [new file with mode: 0644]
mcs/tools/linker-analyzer/LinkerAnalyzerCore/Properties/AssemblyInfo.cs [new file with mode: 0644]
mcs/tools/linker-analyzer/Main.cs [new file with mode: 0644]
mcs/tools/linker-analyzer/Makefile [new file with mode: 0644]
mcs/tools/linker-analyzer/linkeranalyzer.exe.sources [new file with mode: 0644]
mcs/tools/linker/Mono.Linker.Steps/MarkStep.cs
mcs/tools/linker/Mono.Linker.Steps/OutputStep.cs
mcs/tools/linker/Mono.Linker.Steps/ResolveFromAssemblyStep.cs
mcs/tools/linker/Mono.Linker/Annotations.cs
mcs/tools/linker/Mono.Linker/Pipeline.cs
mcs/tools/resgen/monoresgen.cs
mcs/tools/security/makecert.cs
mcs/tools/tuner/Mono.Tuner/Dispatcher.cs
mcs/tools/xbuild/data/12.0/Microsoft.Common.targets
mcs/tools/xbuild/data/14.0/Microsoft.Common.targets
mcs/tools/xbuild/data/2.0/Microsoft.Common.targets
mcs/tools/xbuild/data/3.5/Microsoft.Common.targets
mcs/tools/xbuild/data/4.0/Microsoft.Common.targets
mono/io-layer/sockets.c
mono/io-layer/wthreads.c
mono/metadata/appdomain.c
mono/metadata/culture-info-tables.h
mono/metadata/icall.c
mono/metadata/object-internals.h
mono/metadata/socket-io.c
mono/metadata/sysmath.c
mono/metadata/threadpool-ms-io.c
mono/metadata/threads.c
mono/mini/Makefile.am.in
mono/mini/aot-compiler.c
mono/mini/debugger-agent.c
mono/mini/iltests.il.in
mono/mini/method-to-ir.c
mono/mini/mini-amd64.c
mono/mini/mini-arm.c
mono/mini/mini-arm.h
mono/mini/mini-codegen.c
mono/mini/mini-llvm.c
mono/mini/mini-runtime.c
mono/mini/mini.h
mono/profiler/decode.c
mono/profiler/proflog.h
mono/profiler/ptestrunner.pl
mono/unit-tests/Makefile.am
mono/utils/mono-context.h
mono/utils/mono-networkinterfaces.c
mono/utils/mono-threads.c
mono/utils/mono-threads.h
tools/locale-builder/Driver.cs

index a1b19f5921efee07fb3052b7e52aace9db87440d..3725b6b41af10e5d1d7d3828928c050e4da4fec2 100644 (file)
@@ -13,7 +13,11 @@ AC_CANONICAL_HOST
 # The extra brackets are to foil regex-based scans.
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects]
+                 m4_esyscmd([case `automake --version | head -n 1` in    # parallel-tests is default in automake 1.13+, we need to explicitly enable it
+                             *1.11*|*1.12*) echo parallel-tests;;        # for 1.11 and 1.12 but not below as those versions don't recognize the flag
+                             esac]))                                     # TODO: remove this hack once we require automake 1.11+
+
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -3970,7 +3974,7 @@ echo "
 
    Libraries:
        .NET 4.6:        $with_profile4_x
-       MonoDroid:       $with_monodroid
+       Xamarin.Android: $with_monodroid
        Xamarin.iOS:     $with_monotouch
        Xamarin.WatchOS: $with_monotouch_watch
        Xamarin.TVOS:    $with_monotouch_tv
index 85f9f3fe301c9c87777eb52307c4220cd932eed8..2197c6f9c96605404f19ee9bc6b0b038f94986fb 100644 (file)
@@ -182,6 +182,7 @@ 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 sys/resource.h)
+AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+="-liconv -lcharset"])])
 AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
 AC_SUBST(HAVE_ALLOCA_H)
 
index 2ad9d547dc74b18b9f27bbab020ef9285ae56c9f..ba947d84c060deaee8deb2d4663beb3d9411b67c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 2ad9d547dc74b18b9f27bbab020ef9285ae56c9f
+Subproject commit ba947d84c060deaee8deb2d4663beb3d9411b67c
index 9e7ba2405204959bcbe2eda7480dc49ca5e72ce5..54627c732faf2d4ff154569d5af538f61faa52f7 100644 (file)
@@ -93,7 +93,7 @@ namespace Microsoft.Build.BuildEngine {
                {
                        this.binPath = binPath;
                        this.buildEnabled = true;
-                       this.projects = new Dictionary <string, Project> ();
+                       this.projects = new Dictionary <string, Project> (StringComparer.OrdinalIgnoreCase);
                        this.eventSource = new EventSource ();
                        this.loggers = new List <ILogger> ();
                        this.buildStarted = false;
index 19363185e8687468b4d15db041e134d3dbc794ed..71430e729329903df359647cba9950ff227dd722 100644 (file)
@@ -12,4 +12,6 @@ EXTRA_DISTFILES = \
        LICENSE.txt \
        c5.pub c5.snk c5.xml
 
+NO_INSTALL = yes
+
 include ../../build/library.make
index e698dde9d6d208f21c70257a30d4a0e639624cbf..df8a5d787ab0daefe2ea5714dc621b1342f9f8b2 100644 (file)
@@ -206,8 +206,13 @@ namespace Mono.Data.Sqlite
 #if !SQLITE_STANDARD\r
         int n = UnsafeNativeMethods.sqlite3_close_interop(db);\r
 #else\r
-      ResetConnection(db);\r
-      int n = UnsafeNativeMethods.sqlite3_close(db);\r
+        ResetConnection(db);\r
+        int n;\r
+        try {\r
+          n = UnsafeNativeMethods.sqlite3_close_v2(db);\r
+        } catch (EntryPointNotFoundException) {\r
+          n = UnsafeNativeMethods.sqlite3_close(db);\r
+        }\r
 #endif\r
         if (n > 0) throw new SqliteException(n, SQLiteLastError(db));\r
       }\r
index c5ae7c6ff2cf89e15ebc564530921fa6c3d0474b..4b440b951ed56cd07ede1b2c0f6aa3a3ebc21615 100644 (file)
@@ -135,6 +135,13 @@ namespace Mono.Data.Sqlite
     [DllImport(SQLITE_DLL)]\r
 #endif\r
     internal static extern int sqlite3_close(IntPtr db);\r
+               \r
+#if !PLATFORM_COMPACTFRAMEWORK\r
+    [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
+#else\r
+    [DllImport(SQLITE_DLL)]\r
+#endif\r
+    internal static extern int sqlite3_close_v2(IntPtr db);\r
 \r
 #if !PLATFORM_COMPACTFRAMEWORK\r
     [DllImport(SQLITE_DLL, CallingConvention = CallingConvention.Cdecl)]\r
index d65ee3f9ae6179fd80d5d8b06ff97d596b5f5b55..9afb83a2b39676721deb8f0bb40537f0ed88b67f 100644 (file)
@@ -44,6 +44,26 @@ namespace MonoTests.Mono.Data.Sqlite
                 readonly static string _connectionString = "URI=file://" + _uri + ", version=3";
                 SqliteConnection _conn = new SqliteConnection ();
 
+               [Test]
+               public void ReleaseDatabaseFileHandles ()
+               {
+                       _conn.ConnectionString = _connectionString;
+                       _conn.Open ();
+                       
+                       SqliteCommand cmd = _conn.CreateCommand ();
+                       cmd.CommandText = "PRAGMA legacy_file_format;";
+                       cmd.ExecuteScalar ();
+                       
+                       // close connection before the command
+                       _conn.Dispose ();
+                       
+                       // then close the command
+                       cmd.Dispose ();
+                       
+                       // the locks should be released, and we should be able to delete the database
+                       File.Delete (_uri);
+               }
+
                 [Test]
                 [ExpectedException (typeof (ArgumentNullException))]
                 public void ConnectionStringTest_Null ()
index a35e49d0b47c2f56568ffb19c953528aa0e15c23..05ea6bcdaf44aa4a2714b2c8758767164ffb0170 100644 (file)
@@ -382,7 +382,8 @@ namespace Mono.Debugger.Soft
                ERR_UNLOADED = 103,
                ERR_NO_INVOCATION = 104,
                ABSENT_INFORMATION = 105,
-               NO_SEQ_POINT_AT_IL_OFFSET = 106
+               NO_SEQ_POINT_AT_IL_OFFSET = 106,
+               INVOKE_ABORTED = 107
        }
 
        public class ErrorHandlerEventArgs : EventArgs {
@@ -417,7 +418,7 @@ namespace Mono.Debugger.Soft
                 * with newer runtimes, and vice versa.
                 */
                internal const int MAJOR_VERSION = 2;
-               internal const int MINOR_VERSION = 41;
+               internal const int MINOR_VERSION = 42;
 
                enum WPSuspendPolicy {
                        NONE = 0,
index 6c20cd9937a0be9aaf2d1f677068edbedfa8f97b..022cbdceab44bd850f5685c035617bd59d4020b1 100644 (file)
@@ -442,6 +442,9 @@ namespace Mono.Debugger.Soft
 
                        Interlocked.Decrement (ref r.NumPending);
 
+                       if (error != 0)
+                               r.ErrorCode = error;
+
                        if (r.NumPending == 0) {
                                r.IsCompleted = true;
                                ((ManualResetEvent)r.AsyncWaitHandle).Set ();
index b0cf1dfa13d29c06c943f2992fe15b05265b1307..7b99f7b7e32ed594e92f9cb7da7abbaff676dc13 100644 (file)
@@ -342,6 +342,8 @@ public class Tests : TestsBase, ITest2
                        frames_in_native ();
                if (args.Length > 0 && args [0] == "invoke-single-threaded")
                        new Tests ().invoke_single_threaded ();
+               if (args.Length > 0 && args [0] == "invoke-abort")
+                       new Tests ().invoke_abort ();
                new Tests ().evaluate_method ();
                return 3;
        }
@@ -944,6 +946,15 @@ public class Tests : TestsBase, ITest2
        public void invoke_single_threaded_2 () {
        }
 
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       public void invoke_abort () {
+       }
+
+       [MethodImplAttribute (MethodImplOptions.NoInlining)]
+       public void invoke_abort_2 () {
+               Thread.Sleep (1000000);
+       }
+
        public void invoke_return_void () {
        }
 
index 0b47f1fbeb2c75de4f83067cd1412c5298cd8c63..ff7b3616df855d53c0acc30c6f22b5e68b5e112c 100644 (file)
@@ -2506,6 +2506,28 @@ public class DebuggerTests
                        invoke_results.Add (res);
        }
 
+       [Test]
+       public void InvokeAbort () {
+               vm.Detach ();
+
+               Start (new string [] { "dtest-app.exe", "invoke-abort" });
+
+               Event e = run_until ("invoke_abort");
+
+               StackFrame f = e.Thread.GetFrames ()[0];
+
+               var obj = f.GetThis () as ObjectMirror;
+               var t = obj.Type;
+               var m = t.GetMethod ("invoke_abort_2");
+               // Invoke multiple times to check that the subsequent invokes are aborted too
+               var res = (IInvokeAsyncResult)obj.BeginInvokeMultiple (e.Thread, new MethodMirror[] { m, m, m, m }, null, InvokeOptions.None, delegate { }, null);
+               Thread.Sleep (500);
+               res.Abort ();
+               AssertThrows<CommandException> (delegate {
+                               obj.EndInvokeMethod (res);
+                       });
+       }
+
        [Test]
        public void GetThreads () {
                vm.GetThreads ();
index d57ce5ae55c1e69d7a444b3568960b11554979be..054038731aec8a6f15ef7c9ece468b1603ae68b9 100644 (file)
@@ -88,6 +88,10 @@ namespace Mono.Security.Cryptography {
                // block size (which isn't their real internal block size)
                public BlockProcessor (ICryptoTransform transform, int blockSize)
                {
+                       if (transform == null)
+                               throw new ArgumentNullException ("transform");
+                       if (blockSize <= 0)
+                               throw new ArgumentOutOfRangeException ("blockSize");
                        this.transform = transform;
                        this.blockSize = blockSize;
                        block = new byte [blockSize];
index 5adb549bb9b749509323df148fceb608c4799245..8e172ad3a4d57b404fd04d6528d289f3c0ccdf57 100644 (file)
@@ -843,7 +843,7 @@ namespace System.Drawing.Printing
                        if (!settings.PrintToFile) {
                                StringBuilder sb = new StringBuilder (1024);
                                int length = sb.Capacity;
-                               cupsTempFile (sb, length);
+                               cupsTempFd (sb, length);
                                name = sb.ToString ();
                                tmpfile = name;
                        }
@@ -889,7 +889,7 @@ namespace System.Drawing.Printing
                static extern void cupsFreeDests (int num_dests, IntPtr dests);
 
                [DllImport("libcups", CharSet=CharSet.Ansi)]
-               static extern IntPtr cupsTempFile (StringBuilder sb, int len);
+               static extern IntPtr cupsTempFd (StringBuilder sb, int len);
 
                [DllImport("libcups", CharSet=CharSet.Ansi)]
                static extern IntPtr cupsGetDefault ();
index 643d82c7ef8804ec80c6859f6e5c54ba3618d823..4737c4f1d455d97c26b28ffa11dc82468b0de1c4 100644 (file)
@@ -226,7 +226,7 @@ namespace System.Drawing
                public Point (int dw)
                {
                        y = dw >> 16;
-                       x = dw & 0xffff;
+                       x = unchecked ((short) (dw & 0xffff));
                }
 
                /// <summary>
index 71bb2abec8baec2a81ab03ac491173456914a45d..346ae6f1d509e20445a1db4fc8c384d4229e860f 100644 (file)
@@ -155,6 +155,15 @@ namespace MonoTests.System.Drawing{
                        Assert.AreEqual (pt_i, pt1_1, "#2");
                        Assert.AreEqual (pt_sz, pt1_1, "#3");
                }
+
+               [Test]
+               public void ConstructorNegativeLocationTest ()
+               {
+                       var pt = new Point (unchecked ((int) 0xffe0fc00));
+
+                       Assert.AreEqual (-32, pt.Y, "#1"); // (short) 0xffe0
+                       Assert.AreEqual (-1024, pt.X, "#2"); // (short) 0xfc00
+               }
                
                [Test]
                public void PropertyTest () 
index 087e62474d2f986c1b84228fb3a2e30201e4d952..0a9d60fb98ec8bfc9c445982b5622ce200126493 100644 (file)
@@ -276,6 +276,14 @@ namespace System.Net.Http
                        var headers = wr.Headers;
                        foreach (var header in request.Headers) {
                                var values = header.Value;
+                               if (header.Key == "Host") {
+                                       //
+                                       // Host must be explicitly set for HttpWebRequest
+                                       //
+                                       wr.Host = request.Headers.Host;
+                                       continue;
+                               }
+
                                if (header.Key == "Transfer-Encoding") {
                                        // Chunked Transfer-Encoding is never set for HttpWebRequest. It's detected
                                        // from ContentLength by HttpWebRequest
index ec049a932105ea973be9d262937694c89f83348e..510a2d63d45122db80bf3d145cbcc953051b807f 100644 (file)
@@ -606,6 +606,39 @@ namespace MonoTests.System.Net.Http
                        }
                }
 
+               [Test]
+               public void Send_Complete_CustomHeaders_Host ()
+               {
+                       bool? failed = null;
+                       var listener = CreateListener (l => {
+                               var request = l.Request;
+
+                               try {
+                                       Assert.AreEqual ("customhost", request.Headers["Host"], "#1");
+                                       failed = false;
+                               } catch {
+                                       failed = true;
+                               }
+                       });
+
+                       try {
+                               var client = new HttpClient ();
+
+                               client.DefaultRequestHeaders.Add("Host", "customhost");
+
+                               var request = new HttpRequestMessage (HttpMethod.Get, LocalServer);
+
+                               var response = client.SendAsync (request, HttpCompletionOption.ResponseHeadersRead).Result;
+
+                               Assert.AreEqual ("", response.Content.ReadAsStringAsync ().Result, "#100");
+                               Assert.AreEqual (HttpStatusCode.OK, response.StatusCode, "#101");
+                               Assert.AreEqual (false, failed, "#102");
+                       } finally {
+                               listener.Abort ();
+                               listener.Close ();
+                       }
+               }
+
                [Test]
                public void Send_Transfer_Encoding_Chunked ()
                {
index 8293e1d4f99168dd43fc2bbbb86548d640dedb99..05c2b091d98b229262f43bc1c25577656f0009a2 100644 (file)
@@ -691,6 +691,12 @@ namespace System.Security.Cryptography.Xml {
                        if (xel == null) {
                                // search an "undefined" ID
                                xel = (XmlElement) document.SelectSingleNode ("//*[@Id='" + idValue + "']");
+                               if (xel == null) {
+                                       xel = (XmlElement) document.SelectSingleNode ("//*[@ID='" + idValue + "']");
+                                       if (xel == null) {
+                                               xel = (XmlElement) document.SelectSingleNode ("//*[@id='" + idValue + "']");
+                                       }
+                               }
                        }
                        return xel;
                }
index bede256b8c947ef6598f1906468e823fff50d072..1e32b6fcdbf9810ed8c00f329635c3836f70ab1f 100644 (file)
@@ -1920,8 +1920,57 @@ namespace MonoTests.System.Runtime.Serialization.Json
                                serializer.WriteObject (ms, person2);
                        }
                }
+
+               [Test]
+               public void Bug15028()
+               {
+                       DataContractJsonSerializer ser = new DataContractJsonSerializer(typeof(Bug15028));
+                       using (MemoryStream memoryStream = new MemoryStream())
+                       {
+                               ser.WriteObject(memoryStream, new Bug15028());
+                               string output = Encoding.Default.GetString(memoryStream.ToArray());
+                               Assert.AreEqual(@"{""Int0"":1,""Int1"":1,""IntZero1"":0,""Str0"":"""",""Str1"":"""",""StrNull1"":null}", output);
+                       }
+               }
        }
        
+
+       [DataContract]
+       public class Bug15028
+       {
+               [DataMember(EmitDefaultValue = false)]
+               public string StrNull0 { get; private set; }
+
+               [DataMember(EmitDefaultValue = false)]
+               public string Str0 { get; private set; }
+
+               [DataMember(EmitDefaultValue = true)]
+               public string StrNull1 { get; private set; }
+
+               [DataMember(EmitDefaultValue = true)]
+               public string Str1 { get; private set; }
+
+               [DataMember(EmitDefaultValue = false)]
+               public int IntZero0 { get; private set; }
+
+               [DataMember(EmitDefaultValue = false)]
+               public int Int0 { get; private set; }
+
+               [DataMember(EmitDefaultValue = true)]
+               public int IntZero1 { get; private set; }
+
+               [DataMember(EmitDefaultValue = true)]
+               public int Int1 { get; private set; }
+
+               public Bug15028()
+               {
+                       Str0 = string.Empty;
+                       Str1 = string.Empty;
+                       Int0 = 1;
+                       Int1 = 1;
+               }
+       }
+
        public class CharTest
        {
                public char Foo;
index 16c38c77932c39409c4349ee2ea501d67051c820..03e7cad1f1c4f7eff0afaab6e7c41ebd1801f848 100644 (file)
@@ -92,8 +92,8 @@ namespace System.ServiceModel.Channels.Http
                        AbortConnections (timeout);
                        // FIXME: this wait is sort of hack (because it should not be required), but without it some tests are blocked.
                        // This hack even had better be moved to base.CancelAsync().
-                       if (CurrentAsyncResult != null)
-                               CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
+//                     if (CurrentAsyncResult != null)
+//                             CurrentAsyncResult.AsyncWaitHandle.WaitOne (TimeSpan.FromMilliseconds (300));
                        return base.CancelAsync (timeout);
                }
 
index d73b0866495cf0a32fe3ef8b2796ea619e8a36f2..4e47ecf0035d8fda5470806c3f5ad8686b0c21f7 100644 (file)
@@ -87,15 +87,16 @@ namespace System.ServiceModel.Channels
 
                protected override void OnClose (TimeSpan timeout)
                {
-                       if (CurrentAsyncThread != null)
+                       if (currentAsyncThreads.Count > 0)
                                if (!CancelAsync (timeout))
-                                       CurrentAsyncThread.Abort ();
+                                       foreach (Thread asyncThread in currentAsyncThreads)
+                                               asyncThread.Abort ();
                }
 
                public virtual bool CancelAsync (TimeSpan timeout)
                {
                        // FIXME: It should wait for the actual completion.
-                       return CurrentAsyncResult == null;
+                       return currentAsyncResults.Count > 0;
                        //return CurrentAsyncResult == null || CurrentAsyncResult.AsyncWaitHandle.WaitOne (timeout);
                }
 
@@ -111,18 +112,18 @@ namespace System.ServiceModel.Channels
                TryReceiveDelegate try_recv_delegate;
 
                object async_result_lock = new object ();
-               protected Thread CurrentAsyncThread { get; private set; }
-               protected IAsyncResult CurrentAsyncResult { get; private set; }
+               HashSet<Thread> currentAsyncThreads = new HashSet<Thread>();
+               HashSet<IAsyncResult> currentAsyncResults = new HashSet<IAsyncResult>();
 
                public virtual IAsyncResult BeginTryReceiveRequest (TimeSpan timeout, AsyncCallback callback, object state)
                {
-                       if (CurrentAsyncResult != null)
-                               throw new InvalidOperationException ("Another async TryReceiveRequest operation is in progress");
+                       IAsyncResult result = null;
+
                        if (try_recv_delegate == null)
                                try_recv_delegate = new TryReceiveDelegate (delegate (TimeSpan tout, out RequestContext ctx) {
                                        lock (async_result_lock) {
-                                               if (CurrentAsyncResult != null)
-                                                       CurrentAsyncThread = Thread.CurrentThread;
+                                               if (currentAsyncResults.Contains (result))
+                                                       currentAsyncThreads.Add (Thread.CurrentThread);
                                        }
                                        try {
                                                return TryReceiveRequest (tout, out ctx);
@@ -143,19 +144,19 @@ namespace System.ServiceModel.Channels
                                                //the whole app.  Ignore for now
                                        } finally {
                                                lock (async_result_lock) {
-                                                       CurrentAsyncResult = null;
-                                                       CurrentAsyncThread = null;
+                                                       currentAsyncResults.Remove (result);
+                                                       currentAsyncThreads.Remove (Thread.CurrentThread);
                                                }
                                        }
                                        ctx = null;
                                        return false;
                                        });
                        RequestContext dummy;
-                       IAsyncResult result;
                        lock (async_result_lock) {
-                               result = CurrentAsyncResult = try_recv_delegate.BeginInvoke (timeout, out dummy, callback, state);
+                               result = try_recv_delegate.BeginInvoke (timeout, out dummy, callback, state);
+                               currentAsyncResults.Add (result);
                        }
-                       // Note that at this point CurrentAsyncResult can be null here if delegate has run to completion
+                       // Note that at this point result can be missing from currentAsyncResults here if delegate has run to completion
                        return result;
                }
 
index a7665b8cab6daa0a6a334a3cf3561d08c3bfdbd5..80238d41ff89bf3ee89270260cc6cbfb82a4f12d 100644 (file)
@@ -139,6 +139,45 @@ namespace System.ServiceModel.Description
                        return ret;
                }
 
+               internal static Type GetContractAssignableToInterfaces(Type given, Type [] givenInterfaces)
+               {
+                       if ((given != null) && (givenInterfaces.Count() < 1))
+                               return null;
+                       Dictionary<Type,int> interfaceGraph = new Dictionary<Type,int> ();
+                       foreach (var smaller in givenInterfaces) {
+                               interfaceGraph [smaller] = 0;
+                               foreach (var bigger in givenInterfaces) {
+                                       if (smaller.IsAssignableFrom (bigger)) {
+                                               interfaceGraph [smaller]++;
+                                       }
+                               }
+                       }
+
+                       List<Type> possibleInterfaces = new List<Type> ();
+                       foreach (var node in interfaceGraph) {
+                               if (node.Value == 1) {
+                                       possibleInterfaces.Add(node.Key);
+                               }
+                       }
+                       // For this purpose a contract is a set of interfaces. it is necessary to find the interface representative of rest of the set. It will be assignable to all of 
+                       // the others but can only be assigned to by itself. This will give it  count of ! in its slot in the interfaceGraph. To be a valid set there can be only one with a count of one
+                       // in its slot.  More results in InvalidOperation exceptioni with ambigours error message, less means that the interface we want is the one passed in by the parameter given
+                       // and by returning null we give the callign method permission to use it..
+                       switch (possibleInterfaces.Count()) 
+                       {
+                               case 0:
+                               break;
+                               case 1:
+                               return possibleInterfaces [0];
+                               break;
+                               default:
+                               if (!given.IsInterface) 
+                                       throw new InvalidOperationException ("The contract type of " + given + " is ambiguous: can be either " + possibleInterfaces[0] + " or " + possibleInterfaces[1]);
+                               break;
+                       }
+                       return null;
+               }
+
                internal static ContractDescription GetContractInternal (Type givenContractType, Type givenServiceType, Type serviceTypeForCallback)
                {
                        if (givenContractType == null)
@@ -153,16 +192,12 @@ namespace System.ServiceModel.Description
                                exactContractType = givenContractType;
                                sca = contracts [givenContractType];
                        } else {
-                               foreach (Type t in contracts.Keys)
-                                       if (t.IsAssignableFrom(givenContractType)) {
-                                               if (t.IsAssignableFrom (exactContractType)) // exact = IDerived, t = IBase
-                                                       continue;
-                                               if (sca != null && (exactContractType == null || !exactContractType.IsAssignableFrom (t))) // t = IDerived, exact = IBase
-                                                       throw new InvalidOperationException ("The contract type of " + givenContractType + " is ambiguous: can be either " + exactContractType + " or " + t);
-                                               exactContractType = t;
-                                               sca = contracts [t];
-                                       }
+                               Type[] contractTypes = contracts.Keys.ToArray() as Type [];
+                               exactContractType = GetContractAssignableToInterfaces(givenContractType, contractTypes);
+                               if (exactContractType != null)
+                                       sca = contracts[exactContractType];
                        }
+
                        if (exactContractType == null)
                                exactContractType = givenContractType;
                        if (sca == null) {
@@ -171,6 +206,7 @@ namespace System.ServiceModel.Description
                                else
                                        return null; // no contract
                        }
+
                        string name = sca.Name ?? exactContractType.Name;
                        string ns = sca.Namespace ?? "http://tempuri.org/";
 
@@ -197,17 +233,18 @@ namespace System.ServiceModel.Description
                         */
 
                        var inherited = new Collection<ContractDescription> ();
-                       foreach (var it in cd.ContractType.GetInterfaces ()) {
+               var interfaces = cd.ContractType.GetInterfaces ();
+                       foreach (var it in interfaces ) {
                                var icd = GetContractInternal (it, givenServiceType, null);
                                if (icd != null)
                                        inherited.Add (icd);
                        }
 
                        foreach (var icd in inherited) {
-                               foreach (var od in icd.Operations)
-                                       if (!cd.Operations.Any(o => o.Name == od.Name && o.SyncMethod == od.SyncMethod && 
-                                                              o.BeginMethod == od.BeginMethod && o.InCallbackContract == od.InCallbackContract))
+                               foreach (var od in icd.Operations) {
+                                       if (!cd.Operations.Any (o => o.Name == od.Name && o.SyncMethod == od.SyncMethod && o.BeginMethod == od.BeginMethod && o.InCallbackContract == od.InCallbackContract))
                                                cd.Operations.Add (od);
+                               }
                        }
 
                        FillOperationsForInterface (cd, cd.ContractType, givenServiceType, false);
index c005094275c5a9c5020dc612fd811eeb8fa8af98..65b5c8cf38ae6913b2482b54609ecc8ee45064e4 100644 (file)
@@ -455,8 +455,11 @@ namespace System.ServiceModel.Dispatcher
                        public void CloseInput ()
                        {
                                foreach (var ch in channels.ToArray ()) {
-                                       if (ch.State == CommunicationState.Closed)
-                                               RemoveChannel (ch);
+                                       if (ch.State == CommunicationState.Closed) {
+                                               lock (channels) {
+                                                       RemoveChannel (ch);
+                                               }
+                                       }
                                        else {
                                                try {
                                                        ch.Close (close_timeout - (DateTime.Now - close_started));
index 19236d062c9681c9f91effe9d65222360fa7eaee..2fed9fb3cdb9ff644e3bc27dddc450c3aa99d8a0 100644 (file)
@@ -101,7 +101,9 @@ namespace System.ServiceModel
                        ContractDescription cd = GetExistingContract (implementedContract);
                        if (cd == null) {
                                cd = ContractDescription.GetContract (implementedContract);
-                               contracts.Add (cd.ContractType.FullName, cd);
+                               if (!contracts.ContainsKey (cd.ContractType.FullName)) {
+                                       contracts.Add (cd.ContractType.FullName, cd);
+                               }
                        }
 
                        return AddServiceEndpointCore (cd, binding, ea, listenUri);
@@ -121,7 +123,8 @@ namespace System.ServiceModel
                        contracts = new Dictionary<string,ContractDescription> ();
                        implementedContracts = contracts;
                        ServiceDescription sd;
-                       foreach (ContractDescription cd in GetServiceContractDescriptions())
+                       IEnumerable<ContractDescription>  contractDescriptions = GetServiceContractDescriptions ();
+                       foreach (ContractDescription cd in contractDescriptions)
                                contracts.Add (cd.ContractType.FullName, cd);
 
                        if (SingletonInstance != null) {
index f6c297d3c9ba9f6cdefa62f67511f99c33bd4b49..77430e87481bf6eadd81b3beda8756b3a0bccc29 100644 (file)
@@ -1009,5 +1009,82 @@ namespace MonoTests.System.ServiceModel.Description
                        [MyWebGet]
                        string Get ();
                }
+
+               public interface IA1 : IB1, IB2 
+               {
+                       void MethodA1 ();
+               }
+
+               public interface IA2 : IB1, IB2 
+               {
+                       void MethodA2 ();
+               }
+
+               [ServiceContract]
+               public interface IB1 : IC1, IC2 
+               {
+                       [OperationContract]                             
+                       void MethodB1 ();
+               }
+
+               [ServiceContract]
+               public interface IB2 : IC1, IC2 
+               {
+                       [OperationContract]                             
+                       void MethodB2 ();
+               }
+
+               public interface IC1 {}
+               public interface IC2 {}
+
+               [ServiceContract]
+               public interface IS : IA1, IA2 
+               {
+                       [OperationContract]                             
+                       void MethodS()  ;       
+               }
+
+               public class S : IS
+               {
+                       #region IS implementation
+                       public void MethodS ()
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       #endregion
+                       #region IA2 implementation
+                       public void MethodA2 ()
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       #endregion
+                       #region IA1 implementation
+                       public void MethodA1 ()
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       #endregion
+                       #region IB2 implementation
+                       public void MethodB2 ()
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       #endregion
+                       #region IB1 implementation
+                       public void MethodB1 ()
+                       {
+                               throw new NotImplementedException ();
+                       }
+                       #endregion
+
+               }
+               [Test]
+               public void DualSpreadingInheritanceTest()
+               {
+                       var cd = ContractDescription.GetContract (typeof(S));
+                       Assert.IsNotNull(cd);
+                       Assert.IsTrue (cd.Name == "IS");
+               }
+
        }
 }
index 8e26ee6fbfcf5aac076fda2d56a3e00f84908422..0682fa9081475aa7905c0f2fa0f4e877b1278c3c 100644 (file)
@@ -96,6 +96,9 @@ namespace MonoTests.System.Web.Services.Protocols
                                if (tcpListener != null) {
                                        tcpListener.Stop ();
                                        tcpListener = null;
+                                       listenThread.Abort ();
+                                       listenThread.Join ();
+                                       listenThread = null;
                                }
                        }
                }
diff --git a/mcs/class/System.Web/System.Web.Caching/ResponseElement.cs b/mcs/class/System.Web/System.Web.Caching/ResponseElement.cs
deleted file mode 100644 (file)
index 2775278..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Authors:
-//   Marek Habersack <mhabersack@novell.com>
-//
-// (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.
-//
-
-namespace System.Web.Caching
-{
-       [Serializable]
-       public abstract class ResponseElement
-       {
-               protected ResponseElement ()
-               {
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs b/mcs/class/System.Web/System.Web.Compilation/BuildProviderAppliesTo.cs
deleted file mode 100644 (file)
index f49eedf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.Compilation.BuildProviderAppliesTo
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006 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.Web.Compilation
-{
-       [Flags]
-       public enum BuildProviderAppliesTo
-       {
-               Web = 1,            /* generate code from files in directories *other* than App_Code,
-                                      App_LocalResources, and App_GlobalResources */
-               Code = 1 << 1,      /* generate code only for App_Code/* */
-               Resources = 1 << 2, /* generate code only for App_LocalResources/* and App_GlobalResources/* */
-               All = 7             /* generate code for everything.  default value for the attribute */
-       }
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/FolderLevelBuildProviderAppliesTo.cs b/mcs/class/System.Web/System.Web.Compilation/FolderLevelBuildProviderAppliesTo.cs
deleted file mode 100644 (file)
index 9a03ab2..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Authors:
-//   Marek Habersack <mhabersack@novell.com>
-//
-// (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;
-
-namespace System.Web.Compilation
-{
-       [FlagsAttribute]
-       public enum FolderLevelBuildProviderAppliesTo
-       {
-               None = 0x00,
-               Code = 0x01,
-               WebReferences = 0x02,
-               LocalResources = 0x04,
-               GlobalResources = 0x08
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs b/mcs/class/System.Web/System.Web.Compilation/IAssemblyPostProcessor.cs
deleted file mode 100644 (file)
index 5c1d4fc..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.Compilation.IAssemblyPostProcessor
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (C) 2006-2009 Novell, Inc (http://www.novell.com)
-//
-
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web.Compilation
-{
-       public interface IAssemblyPostProcessor : IDisposable
-       {
-               void PostProcessAssembly (string path);
-       }
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs b/mcs/class/System.Web/System.Web.Compilation/IImplicitResourceProvider.cs
deleted file mode 100644 (file)
index bb204bd..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.Compilation.IImplicitResourceProvider.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-
-
-using System.Collections;
-using System.Globalization;
-
-namespace System.Web.Compilation
-{
-        public interface IImplicitResourceProvider
-        {
-                object GetObject (ImplicitResourceKey key, CultureInfo culture);
-               ICollection GetImplicitResourceKeys (string keyPrefix);
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs b/mcs/class/System.Web/System.Web.Compilation/ImplicitResourceKey.cs
deleted file mode 100644 (file)
index 4f3357a..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// System.Web.Compilation.IImplicitResourceProvider.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Compilation
-{
-        public sealed class ImplicitResourceKey
-        {
-               string filter;
-               string keyPrefix;
-               string property;
-
-               public ImplicitResourceKey (string filter, string keyPrefix, string property)
-               {
-                       this.filter = filter;
-                       this.keyPrefix = keyPrefix;
-                       this.property = property;
-               }
-
-                public ImplicitResourceKey ()
-                {
-                }
-
-                public string Filter {
-                       get { return filter; }
-                       set { filter = value; }
-               }
-
-                public string KeyPrefix {
-                       get { return keyPrefix; }
-                       set { keyPrefix = value; }
-               }
-
-                public string Property {
-                       get { return property; }
-                       set { property = value; }
-               }
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AdapterDictionary.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AdapterDictionary.cs
deleted file mode 100644 (file)
index bddb721..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.Configuration.AdapterDictionary
-//
-// Authors:
-//     Lluis Sanchez Gual (lluis@novell.com)
-//
-// (C) 2004 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.Specialized;
-using System.Runtime.Serialization;
-
-namespace System.Web.Configuration
-{
-       [Serializable]
-       public class AdapterDictionary: OrderedDictionary, IDeserializationCallback
-       {
-               public string this [string key] {
-                       get { return (string) base [key]; }
-                       set { base [key] = value; }
-               }
-
-               [MonoTODO ("Not implemented")]
-               void IDeserializationCallback.OnDeserialization (object sender)
-               {
-                       throw new NotImplementedException ();
-               }
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthenticationMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthenticationMode.cs
deleted file mode 100644 (file)
index a42b964..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.Configuration.AuthenticationMode.cs
-//
-// Authors:
-//   Miguel de Icaza (miguel@novell.com)
-//
-// (C) 2005 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.
-//
-
-namespace System.Web.Configuration {
-       public enum AuthenticationMode {
-               None,
-               Windows,
-               Passport,
-               Forms
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleAction.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/AuthorizationRuleAction.cs
deleted file mode 100644 (file)
index 9f8aef4..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.Configuration.AuthorizationRuleAction.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-        public enum AuthorizationRuleAction
-        {
-                Deny,
-                Allow
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsMode.cs
deleted file mode 100644 (file)
index 174484f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Configuration.CustomErrorsMode.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-        public enum CustomErrorsMode
-        {
-                RemoteOnly,
-                On,
-                Off
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsRedirectMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/CustomErrorsRedirectMode.cs
deleted file mode 100644 (file)
index 49656c0..0000000
+++ /dev/null
@@ -1,37 +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;
-
-namespace System.Web.Configuration
-{
-       public enum CustomErrorsRedirectMode
-       {
-               ResponseRedirect,
-               ResponseRewrite
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthPasswordFormat.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/FormsAuthPasswordFormat.cs
deleted file mode 100644 (file)
index 5ac12e1..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.Configuration.FormsAuthPasswordFormat.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.Configuration {
-
-       public enum FormsAuthPasswordFormat
-       {
-               Clear,
-               SHA1,
-               MD5
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/FormsProtectionEnum.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/FormsProtectionEnum.cs
deleted file mode 100644 (file)
index 2b14f12..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Configuration.FormsProtectionEnum.cs
-//
-// Author:
-//     Gonzalo Paniagua Javier <gonzalo@ximian.com>
-//
-// 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.Web.Configuration {
-       public enum FormsProtectionEnum {
-               All, 
-               None, 
-               Encryption, 
-               Validation
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyCompatibilityMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyCompatibilityMode.cs
deleted file mode 100644 (file)
index 38c5e55..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.Configuration.MachineKeyCompatibilityMode
-//
-// Authors:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2010 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.Web.Configuration {
-
-       public enum MachineKeyCompatibilityMode {
-               Framework20SP1 = 0,
-               Framework20SP2 = 1
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidation.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/MachineKeyValidation.cs
deleted file mode 100644 (file)
index 47d7ef1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.Configuration.MachineKeyValidation.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004, 2010 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-       public
-       enum MachineKeyValidation
-       {
-               MD5 = 0,
-               SHA1 = 1,
-               TripleDES = 2,
-               AES = 3,
-               HMACSHA256 = 4,
-               HMACSHA384 = 5,
-               HMACSHA512 = 6,
-               Custom = 7
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs
deleted file mode 100644 (file)
index fd4b3f9..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.Configuration.PagesEnableSessionState.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-
-namespace System.Web.Configuration
-{
-               public
-               enum PagesEnableSessionState
-               {
-                       False = 0,
-                       ReadOnly = 1,
-                       True = 2
-               }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs
deleted file mode 100644 (file)
index 5fc0be9..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.Configuration.ProcessModelComAuthenticationLevel.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-        public enum ProcessModelComAuthenticationLevel
-        {
-                None,
-                Call,
-                Connect,
-                Default,
-                Pkt,
-                PktIntegrity,
-                PktPrivacy
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComImpersonationLevel.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelComImpersonationLevel.cs
deleted file mode 100644 (file)
index dbc587f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.Configuration.ProcessModelComImpersonationLevel.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-        public enum ProcessModelComImpersonationLevel
-        {
-                Default,
-                Anonymous,
-                Delegate,
-                Identify,
-                Impersonate
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelLogLevel.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ProcessModelLogLevel.cs
deleted file mode 100644 (file)
index 8c48062..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Configuration.ProcessModelLogLevel.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-        public enum ProcessModelLogLevel
-        {
-                None,
-                All,
-                Errors
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SerializationMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SerializationMode.cs
deleted file mode 100644 (file)
index 05ba2c8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.Configuration.SerializationMode.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-
-namespace System.Web.Configuration
-{
-        public enum SerializationMode
-        {
-                String = 0,
-                Xml = 1,
-                Binary = 2,
-                ProviderSpecific = 3
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebCachingSectionGroup.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/SystemWebCachingSectionGroup.cs
deleted file mode 100644 (file)
index 3451f50..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// System.Web.Configuration.SystemWebCachingSectionGroup
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (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;
-using System.Configuration;
-
-
-namespace System.Web.Configuration {
-
-       public sealed class SystemWebCachingSectionGroup : ConfigurationSectionGroup
-       {
-               [ConfigurationProperty ("cache")]
-               public CacheSection Cache {
-                       get { return (CacheSection) Sections ["cache"];}
-               }
-
-               [ConfigurationProperty ("outputCache")]
-               public OutputCacheSection OutputCache {
-                       get { return (OutputCacheSection) Sections ["outputCache"];}
-               }
-
-               [ConfigurationProperty ("outputCacheSettings")]
-               public OutputCacheSettingsSection OutputCacheSettings {
-                       get { return (OutputCacheSettingsSection) Sections ["outputCacheSettings"];}
-               }
-
-               [ConfigurationProperty ("sqlCacheDependency")]
-               public SqlCacheDependencySection SqlCacheDependency {
-                       get { return (SqlCacheDependencySection) Sections ["sqlCacheDependency"];}
-               }
-
-       }
-
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/TraceDisplayMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/TraceDisplayMode.cs
deleted file mode 100644 (file)
index e3dc717..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.Configuration.TraceDisplayMode.cs
-//
-// Authors:
-//     Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-using System.Resources;
-
-namespace System.Web.Configuration
-{
-        public enum TraceDisplayMode
-        {
-                SortByTime = 1,
-                SortByCategory = 2
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/WebApplicationLevel.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/WebApplicationLevel.cs
deleted file mode 100644 (file)
index a70dd9a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.Configuration.WebApplicationLevel enum
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.Configuration {
-
-       public enum WebApplicationLevel {
-               AboveApplication = 10,
-               AtApplication = 20,
-               BelowApplication = 30
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/XhtmlConformanceMode.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/XhtmlConformanceMode.cs
deleted file mode 100644 (file)
index 279e0fe..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Configuration.XhtmlConformanceMode.cs
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.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.
-//
-// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.Configuration
-{
-       public enum XhtmlConformanceMode
-       {
-               Transitional,
-               Legacy,
-               Strict
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Profile/ProfileEventHandler.cs b/mcs/class/System.Web/System.Web.Profile/ProfileEventHandler.cs
deleted file mode 100644 (file)
index 8ee7aaa..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.ProfileEventHandler.cs
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (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;
-
-namespace System.Web.Profile
-{
-       public delegate void ProfileEventHandler (object sender, ProfileEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.Routing/IRouteConstraint.cs b/mcs/class/System.Web/System.Web.Routing/IRouteConstraint.cs
deleted file mode 100644 (file)
index 0011843..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// IRouteConstraint.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.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Web;
-
-namespace System.Web.Routing
-{
-       [TypeForwardedFrom ("System.Web.Routing, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       public interface IRouteConstraint
-       {
-               bool Match (HttpContextBase httpContext, Route route, string parameterName, RouteValueDictionary values, RouteDirection routeDirection);
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Routing/IRouteHandler.cs b/mcs/class/System.Web/System.Web.Routing/IRouteHandler.cs
deleted file mode 100644 (file)
index a9a0d09..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// IRouteHandler.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.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Web;
-
-namespace System.Web.Routing
-{
-       [TypeForwardedFrom ("System.Web.Routing, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       public interface IRouteHandler
-       {
-               IHttpHandler GetHttpHandler (RequestContext requestContext);
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Routing/RouteDirection.cs b/mcs/class/System.Web/System.Web.Routing/RouteDirection.cs
deleted file mode 100644 (file)
index 693d1dc..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// RouteDirection.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.Runtime.CompilerServices;
-
-namespace System.Web.Routing
-{
-       [TypeForwardedFrom ("System.Web.Routing, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       public enum RouteDirection
-       {
-               IncomingRequest,
-               UrlGeneration
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Security/FormsAuthenticationEventHandler.cs b/mcs/class/System.Web/System.Web.Security/FormsAuthenticationEventHandler.cs
deleted file mode 100644 (file)
index 710aa55..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.Security.FormsAuthenticationEventHandler
-//
-// Authors:
-//     Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2002 Ximian, Inc (http://www.ximian.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.Web.Security
-{
-       public delegate void FormsAuthenticationEventHandler (object sender, FormsAuthenticationEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.Security/PassportAuthenticationEventHandler.cs b/mcs/class/System.Web/System.Web.Security/PassportAuthenticationEventHandler.cs
deleted file mode 100644 (file)
index 3cad8b5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.Security.PassportAuthenticationEventHandler
-//
-// Authors:
-//     Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2002 Ximian, Inc (http://www.ximian.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.Web.Security
-{
-       [Obsolete ("This type is obsolete. The Passport authentication product is no longer supported and has been superseded by Live ID.")]
-       public delegate void PassportAuthenticationEventHandler (object sender,
-                                                                PassportAuthenticationEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs b/mcs/class/System.Web/System.Web.Security/RoleManagerEventHandler.cs
deleted file mode 100644 (file)
index ad0cabe..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.Security.RoleManagerEventHandler
-//
-// Authors:
-//     Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// 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.Web.Security {
-       public delegate void RoleManagerEventHandler (object sender, RoleManagerEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.Security/WindowsAuthenticationEventHandler.cs b/mcs/class/System.Web/System.Web.Security/WindowsAuthenticationEventHandler.cs
deleted file mode 100644 (file)
index 29b67e2..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.Security.WindowsAuthenticationEventHandler
-//
-// Authors:
-//     Gonzalo Paniagua Javier (gonzalo@ximian.com)
-//
-// (C) 2002 Ximian, Inc (http://www.ximian.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.Web.Security
-{
-       public delegate void WindowsAuthenticationEventHandler (object sender,
-                                                               WindowsAuthenticationEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateBehavior.cs b/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateBehavior.cs
deleted file mode 100644 (file)
index 488104f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//
-// Authors:
-//      Marek Habersack <mhabersack@novell.com>
-//
-
-//
-// Copyright (C) 2010 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;
-
-namespace System.Web.SessionState
-{
-       public enum SessionStateBehavior
-       {
-               Default,
-               Required,
-               ReadOnly,
-               Disabled
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.Adapters/WmlPostFieldType.cs b/mcs/class/System.Web/System.Web.UI.Adapters/WmlPostFieldType.cs
deleted file mode 100644 (file)
index c1cb480..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.Adapters.WmlPostFieldType.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI.Adapters {
-       public enum WmlPostFieldType {
-               Normal = 0,
-               Submit = 1,
-               Variable = 2,
-               Raw = 3
-       } 
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebActionable.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebActionable.cs
deleted file mode 100644 (file)
index 314e7bf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebActionable.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts
-{
-       public interface IWebActionable
-       {
-               WebPartVerbCollection Verbs { get; }
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartField.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartField.cs
deleted file mode 100644 (file)
index 94f7d45..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPartField.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts
-{
-       public interface IWebPartField
-       {
-               void GetFieldValue (FieldCallback callback);
-               PropertyDescriptor Schema { get; }
-       }
-
-       public delegate void FieldCallback (object fieldValue);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartRow.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartRow.cs
deleted file mode 100644 (file)
index f5bcdcd..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPartRow.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts
-{
-       public interface IWebPartRow
-       {
-               void GetRowData (RowCallback callback);
-               PropertyDescriptorCollection Schema { get; }
-       }
-
-       public delegate void RowCallback (object rowData);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartTable.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartTable.cs
deleted file mode 100644 (file)
index 74fac3a..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.IWebPartTable.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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;
-using System.ComponentModel;
-
-namespace System.Web.UI.WebControls.WebParts
-{
-       public interface IWebPartTable
-       {
-               PropertyDescriptorCollection Schema { get; }
-               void GetTableData (TableCallback callback);
-       }
-
-       public delegate void TableCallback (ICollection tableData);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeState.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeState.cs
deleted file mode 100644 (file)
index 034a7e5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.PartChromeState.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls.WebParts {
-        public enum PartChromeState {
-                Normal = 0,
-               Minimized = 1           
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeType.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PartChromeType.cs
deleted file mode 100644 (file)
index d8a22ab..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.PartChromeType.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls.WebParts {
-        public enum PartChromeType {
-                Default = 0,
-               TitleAndBorder = 1,
-               None = 2,
-               TitleOnly = 3,
-               BorderOnly = 4          
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PersonalizationScope.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/PersonalizationScope.cs
deleted file mode 100644 (file)
index e951ca2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.PersonalizationScope.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls.WebParts {
-        public enum PersonalizationScope {
-                User = 0,
-               Shared = 1
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartAuthorizationEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartAuthorizationEventHandler.cs
deleted file mode 100644 (file)
index bfa5bb1..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartAuthorizationEventHandler.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts {
-       public delegate void WebPartAuthorizationEventHandler (object source, WebPartAuthorizationEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartCancelEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartCancelEventHandler.cs
deleted file mode 100644 (file)
index 74b22bd..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartCancelEventHandler.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts {
-       public delegate void WebPartCancelEventHandler (object source, WebPartCancelEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventArgs.cs
deleted file mode 100644 (file)
index d033e6a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartEventArgs.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts
-{
-       public class WebPartEventArgs : EventArgs
-       {
-               WebPart part;
-               
-               public WebPartEventArgs (WebPart part) 
-               {
-                       this.part = part; 
-               }
-               
-               public WebPart WebPart {
-                       get { return part; }
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartEventHandler.cs
deleted file mode 100644 (file)
index a57c67d..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartEventHandler.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts {
-       public delegate void WebPartEventHandler (object source, WebPartEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartExportMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartExportMode.cs
deleted file mode 100644 (file)
index c761b46..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartExportMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls.WebParts {
-        public enum WebPartExportMode {
-                None = 0,
-               All = 1,
-               NonSensitiveData = 2
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartHelpMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartHelpMode.cs
deleted file mode 100644 (file)
index cb5acaa..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartHelpMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls.WebParts {
-        public enum WebPartHelpMode {
-                Modal = 0,
-               Modeless = 1,
-               Navigate = 2
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartVerbsEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls.WebParts/WebPartVerbsEventHandler.cs
deleted file mode 100644 (file)
index 302abe8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.WebParts.WebPartVerbsEventHandler.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls.WebParts {
-       public delegate void WebPartVerbsEventHandler (object source, WebPartVerbsEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs
deleted file mode 100644 (file)
index 87cc6a2..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// 
-// System.Web.UI.WebControls.AdCreatedEventHandler
-//
-// Author:
-//        Ben Maurer <bmaurer@novell.com>
-//
-// (c) 2005 Novell
-//
-// 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.Web.UI.WebControls {
-       public delegate void AdCreatedEventHandler (object sender, AdCreatedEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventArgs.cs
deleted file mode 100644 (file)
index 57ecfb8..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// System.Web.UI.WebControls.AuthenticateEventArgs.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public class AuthenticateEventArgs : EventArgs 
-       {
-               bool authenticated;
-               
-               public AuthenticateEventArgs (): this (false)
-               {
-               }
-               
-               public AuthenticateEventArgs (bool authenticated)
-               {
-                       this.authenticated = authenticated;
-               }
-               
-               public bool Authenticated { 
-                       get { return authenticated; } 
-                       set { authenticated = value; }
-               }
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AuthenticateEventHandler.cs
deleted file mode 100644 (file)
index d7643b4..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.AuthenticateEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void AuthenticateEventHandler (object sender, AuthenticateEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AutoCompleteType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AutoCompleteType.cs
deleted file mode 100644 (file)
index 2f9adb9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// System.Web.UI.WebControls.AutoCompleteType.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI.WebControls
-{
-       public enum AutoCompleteType
-       {
-               None = 0,
-               Disabled = 1,
-               Cellular = 2,
-               Company = 3,
-               Department = 4,
-               DisplayName = 5,
-               Email = 6,
-               FirstName = 7,
-               Gender = 8,
-               HomeCity = 9,
-               HomeCountryRegion = 10,
-               HomeFax = 11,
-               HomePhone = 12,
-               HomeState = 13,
-               HomeStreetAddress = 14,
-               HomeZipCode = 15,
-               Homepage = 16,
-               JobTitle = 17,
-               LastName = 18,
-               MiddleName = 19,
-               Notes = 20,
-               Office = 21,
-               Pager = 22,
-               BusinessCity = 23,
-               BusinessCountryRegion = 24,
-               BusinessFax = 25,
-               BusinessPhone = 26,
-               BusinessState = 27,
-               BusinessStreetAddress = 28,
-               BusinessUrl = 29,
-               BusinessZipCode = 30,
-               Search = 31,
-       } 
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs
deleted file mode 100644 (file)
index c3d11ef..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.BorderStyle.cs
-//
-// Author:
-//      Dick Porter  <dick@ximian.com>
-//
-// Copyright (C) 2005-2010 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.Web.UI.WebControls
-{
-       public enum BorderStyle
-       {
-               NotSet,
-               None,
-               Dotted,
-               Dashed,
-               Solid,
-               Double,
-               Groove,
-               Ridge,
-               Inset,
-               Outset
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BulletedListEventHandler.cs
deleted file mode 100644 (file)
index f6a44d2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.BulletedListEventHandler.cs
-//
-// Authors:
-//   Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// 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.Web.UI.WebControls
-{
-       public delegate void BulletedListEventHandler (object sender, BulletedListEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs
deleted file mode 100644 (file)
index b18eeb9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.ButtonColumnType.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// Copyright (C) 2005-2010 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;
-
-namespace System.Web.UI.WebControls
-{
-       public enum ButtonColumnType
-       {
-               LinkButton,
-               PushButton
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonType.cs
deleted file mode 100644 (file)
index afcaa14..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.ButtonType.cs
-//
-// Author: Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum ButtonType
-        {
-                Button = 0,
-                Image = 1,
-                Link = 2,
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs
deleted file mode 100644 (file)
index 3820c52..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.CalendarSelectionMode.cs
-//
-// Author:
-//      Jordi Mas i Hernandez  <jordi@ximian.com>
-//
-// Copyright (C) 2005-2010 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.Web.UI.WebControls
-{
-       public enum CalendarSelectionMode
-       {
-               None,
-               Day,
-               DayWeek,
-               DayWeekMonth
-       }
-}
index 905740a1ea9d9f4d4e896cadb7e7ceaa1e177f25..27c3a7fb9dc870f7018c9a6956ef0871173ecb54 100644 (file)
@@ -370,7 +370,11 @@ namespace System.Web.UI.WebControls
                                Page page = Page;
                                string onclick = page != null ? page.ClientScript.GetPostBackEventReference (GetPostBackOptions (), true) : String.Empty;
                                onclick = String.Concat ("setTimeout('", onclick.Replace ("\\", "\\\\").Replace ("'", "\\'"), "', 0)");
-                               w.AddAttribute (HtmlTextWriterAttribute.Onclick, BuildScriptAttribute ("onclick", onclick));
+                               if (common_attrs != null && common_attrs ["onclick"] != null) {
+                                       onclick = ClientScriptManager.EnsureEndsWithSemicolon (common_attrs ["onclick"]) + onclick;
+                                       common_attrs.Remove ("onclick");
+                               }
+                               w.AddAttribute (HtmlTextWriterAttribute.Onclick, onclick);
                        }
 
                        if (AccessKey.Length > 0)
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs
deleted file mode 100644 (file)
index 1ed9272..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// System.Web.UI.WebControls.CommandEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void CommandEventHandler (object sender, CommandEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentDirection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentDirection.cs
deleted file mode 100644 (file)
index 7dd164e..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.ContentDirection.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum ContentDirection
-       {
-                NotSet = 0,
-               LeftToRight = 1,
-               RightToLeft = 2
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventArgs.cs
deleted file mode 100644 (file)
index 580c655..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// System.Web.UI.WebControls.CreateUserErrorEventArgs.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.Security;
-
-namespace System.Web.UI.WebControls
-{
-       public class CreateUserErrorEventArgs : EventArgs 
-       {
-               MembershipCreateStatus status;
-               
-               public CreateUserErrorEventArgs (MembershipCreateStatus status)
-               {
-                       this.status = status;
-               }
-               
-               public MembershipCreateStatus CreateUserError { 
-                       get { return status; } 
-                       set { status = value; }
-               }
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CreateUserErrorEventHandler.cs
deleted file mode 100644 (file)
index 708b204..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.CreateUserErrorEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void CreateUserErrorEventHandler (object sender, CreateUserErrorEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControlMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataBoundControlMode.cs
deleted file mode 100644 (file)
index df8d68f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-// 
-// System.Web.UI.WebControls.DataBoundControlMode
-//
-// 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.
-//
-
-namespace System.Web.UI.WebControls
-{
-       public enum DataBoundControlMode
-       {
-               ReadOnly,
-               Edit,
-               Insert
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlCellType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlCellType.cs
deleted file mode 100644 (file)
index bda308a..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.UI.WebControls.DataControlCellType.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-namespace System.Web.UI.WebControls
-{
-        public enum DataControlCellType
-       {
-                Header = 0,
-               Footer = 1,
-               DataCell = 2
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowState.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowState.cs
deleted file mode 100644 (file)
index cf0ecfa..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.DataControlRowState.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-namespace System.Web.UI.WebControls
-{
-       [Flags]
-        public enum DataControlRowState
-       {
-                Normal = 0,
-               Alternate = 1,
-               Selected = 2,
-               Edit = 4,
-               Insert = 8
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataControlRowType.cs
deleted file mode 100644 (file)
index 6d02c79..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.DataControlRowType.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-namespace System.Web.UI.WebControls
-{
-        public enum DataControlRowType
-       {
-                Header = 0,
-               Footer = 1,
-               DataRow = 2,
-               Separator = 3,
-               Pager = 4,
-               EmptyDataRow = 5                                
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs
deleted file mode 100644 (file)
index a9d198e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DataGridCommandEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DataGridCommandEventHandler (
-               object sender,
-               DataGridCommandEventArgs e);
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs
deleted file mode 100644 (file)
index 7047c04..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.DataGridItemEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DataGridItemEventHandler (
-               object sender,
-               DataGridItemEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs
deleted file mode 100644 (file)
index ce8adc8..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.DataGridPageChangedEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DataGridPageChangedEventHandler (
-               object sender,
-               DataGridPageChangedEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs
deleted file mode 100644 (file)
index b88303b..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.DataGridSortCommandEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DataGridSortCommandEventHandler (
-               object sender,
-               DataGridSortCommandEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs
deleted file mode 100644 (file)
index b36c526..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DataListCommandEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DataListCommandEventHandler (
-               object sender,
-               DataListCommandEventArgs e);
-
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs
deleted file mode 100644 (file)
index 5fb9d3c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// System.Web.UI.WebControls.DataListItemEventHandler
-//
-// Author: Ben Maurer <bmaurer@novell.com>
-//
-// 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.Web.UI.WebControls {
-       public delegate void DataListItemEventHandler (object sender, DataListItemEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs
deleted file mode 100644 (file)
index e7e0075..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.DayNameFormat.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// Copyright (C) 2005-2010 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;
-
-namespace System.Web.UI.WebControls
-{
-       public enum DayNameFormat
-       {
-               Full,
-               Short,
-               FirstLetter,
-               FirstTwoLetters,
-               Shortest
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs
deleted file mode 100644 (file)
index 022c8e2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.DayRenderEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void DayRenderEventHandler (
-               object sender,
-               DayRenderEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewCommandEventHandler.cs
deleted file mode 100644 (file)
index da199dd..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewCommandEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewCommandEventHandler (object sender, DetailsViewCommandEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeleteEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeleteEventHandler.cs
deleted file mode 100644 (file)
index 8ce41dc..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewDeleteEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewDeleteEventHandler (object sender, DetailsViewDeleteEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeletedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewDeletedEventHandler.cs
deleted file mode 100644 (file)
index ff6007a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewDeletedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewDeletedEventHandler (object sender, DetailsViewDeletedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertEventHandler.cs
deleted file mode 100644 (file)
index c9a3865..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewInsertEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewInsertEventHandler (object sender, DetailsViewInsertEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewInsertedEventHandler.cs
deleted file mode 100644 (file)
index 4f9fa82..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewInsertedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewInsertedEventHandler (object sender, DetailsViewInsertedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewMode.cs
deleted file mode 100644 (file)
index 8f2904b..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum DetailsViewMode
-       {
-                ReadOnly = 0,
-               Edit = 1,
-               Insert = 2                              
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewModeEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewModeEventHandler.cs
deleted file mode 100644 (file)
index 817c6f3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewModeEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewModeEventHandler (object sender, DetailsViewModeEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewPageEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewPageEventHandler.cs
deleted file mode 100644 (file)
index bc17846..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewPageEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewPageEventHandler (object sender, DetailsViewPageEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdateEventHandler.cs
deleted file mode 100644 (file)
index 07f1461..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewUpdateEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewUpdateEventHandler (object sender, DetailsViewUpdateEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdatedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DetailsViewUpdatedEventHandler.cs
deleted file mode 100644 (file)
index b3cfdd8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.DetailsViewUpdatedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void DetailsViewUpdatedEventHandler (object sender, DetailsViewUpdatedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs
deleted file mode 100644 (file)
index 540daba..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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.
-//
-// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-//
-// Authors:
-//     Peter Bartok    (pbartok@novell.com)
-//
-//
-
-namespace System.Web.UI.WebControls {
-       public enum FirstDayOfWeek {
-               Sunday          = 0,
-               Monday          = 1,
-               Tuesday         = 2,
-               Wednesday       = 3,
-               Thursday        = 4,
-               Friday          = 5,
-               Saturday        = 6,
-               Default         = 7
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs
deleted file mode 100644 (file)
index 8ef4eae..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// System.Web.UI.WebControls.FontSize.cs
-//
-// Authors:
-//   Miguel de Icaza (miguel@novell.com)
-//
-// (C) 2005 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.
-//
-
-namespace System.Web.UI.WebControls {
-       public enum FontSize {
-               NotSet,
-               AsUnit,
-               Smaller,
-               Larger,
-               XXSmall,
-               XSmall,
-               Small,
-               Medium,
-               Large,
-               XLarge,
-               XXLarge
-               
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewCommandEventHandler.cs
deleted file mode 100644 (file)
index 1c34d9e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewCommandEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewCommandEventHandler (object sender, FormViewCommandEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeleteEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeleteEventHandler.cs
deleted file mode 100644 (file)
index 13cd81e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewDeleteEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewDeleteEventHandler (object sender, FormViewDeleteEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeletedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewDeletedEventHandler.cs
deleted file mode 100644 (file)
index a35e161..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewDeletedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewDeletedEventHandler (object sender, FormViewDeletedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertEventHandler.cs
deleted file mode 100644 (file)
index e7de479..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewInsertEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewInsertEventHandler (object sender, FormViewInsertEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewInsertedEventHandler.cs
deleted file mode 100644 (file)
index 6b835cb..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewInsertedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewInsertedEventHandler (object sender, FormViewInsertedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewMode.cs
deleted file mode 100644 (file)
index 4858c4e..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum FormViewMode
-       {
-                ReadOnly = 0,
-               Edit = 1,
-               Insert = 2              
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewModeEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewModeEventHandler.cs
deleted file mode 100644 (file)
index 0cdee23..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebContrls.FormViewModeEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewModeEventHandler (object sender, FormViewModeEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewPageEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewPageEventHandler.cs
deleted file mode 100644 (file)
index 9a77a43..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewPageEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewPageEventHandler (object sender, FormViewPageEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdateEventHandler.cs
deleted file mode 100644 (file)
index 0b1b8c5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebContrls.FormViewUpdateEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewUpdateEventHandler (object sender, FormViewUpdateEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdatedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FormViewUpdatedEventHandler.cs
deleted file mode 100644 (file)
index fa8df60..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.FormViewUpdatedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void FormViewUpdatedEventHandler (object sender, FormViewUpdatedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs
deleted file mode 100644 (file)
index ad247e4..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.HtmlControls.GridLines.cs
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       public enum GridLines {
-               None,
-               Horizontal,
-               Vertical,
-               Both
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewCancelEditEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewCancelEditEventHandler.cs
deleted file mode 100644 (file)
index 7a98246..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewCancelEditEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewCancelEditEventHandler (object sender, GridViewCancelEditEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewCommandEventHandler.cs
deleted file mode 100644 (file)
index 807aec7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewCommandEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewCommandEventHandler (object sender, GridViewCommandEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeleteEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeleteEventHandler.cs
deleted file mode 100644 (file)
index 42bf971..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewDeleteEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewDeleteEventHandler (object sender, GridViewDeleteEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeletedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewDeletedEventHandler.cs
deleted file mode 100644 (file)
index cb17de0..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewDeletedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewDeletedEventHandler (object sender, GridViewDeletedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewEditEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewEditEventHandler.cs
deleted file mode 100644 (file)
index 621ffd9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewEditEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewEditEventHandler (object sender, GridViewEditEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewPageEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewPageEventHandler.cs
deleted file mode 100644 (file)
index 39b638a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewPageEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewPageEventHandler (object sender, GridViewPageEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewRowEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewRowEventHandler.cs
deleted file mode 100644 (file)
index 3ab9a8e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewRowEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewRowEventHandler (object sender, GridViewRowEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewSelectEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewSelectEventHandler.cs
deleted file mode 100644 (file)
index 62b2ca2..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewSelectEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewSelectEventHandler (object sender, GridViewSelectEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewSortEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewSortEventHandler.cs
deleted file mode 100644 (file)
index a285525..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewSortEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewSortEventHandler (object sender, GridViewSortEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdateEventHandler.cs
deleted file mode 100644 (file)
index 7161bd4..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebContrls.GridViewUpdateEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewUpdateEventHandler (object sender, GridViewUpdateEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdatedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridViewUpdatedEventHandler.cs
deleted file mode 100644 (file)
index 94abf59..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.GridViewUpdatedEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void GridViewUpdatedEventHandler (object sender, GridViewUpdatedEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs
deleted file mode 100644 (file)
index 8b41202..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.WebControls.HorizontalAlign.cs
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       [TypeConverter (typeof (System.Web.UI.WebControls.HorizontalAlignConverter))]
-       public enum HorizontalAlign {
-               NotSet,
-               Left,
-               Center,
-               Right,
-               Justify
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HotSpotMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HotSpotMode.cs
deleted file mode 100644 (file)
index 0ee5fa6..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.HotSpotMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum HotSpotMode
-       {
-                NotSet = 0,
-               Navigate = 1,
-               PostBack = 2,
-               Inactive = 3            
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundItemControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IDataBoundItemControl.cs
deleted file mode 100644 (file)
index 71e8612..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.WebControls.IDataBoundItemControl
-//
-// Authors:
-//     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.
-//
-
-using System.ComponentModel;
-using System.Collections;
-using System.Security.Permissions;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI.WebControls
-{
-       public interface IDataBoundItemControl : IDataBoundControl
-       {
-               DataKey DataKey { get; }
-               DataBoundControlMode Mode { get; }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IFieldControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IFieldControl.cs
deleted file mode 100644 (file)
index 840faf0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.IFieldControl
-//
-// Authors:
-//     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.
-//
-
-using System.ComponentModel;
-using System.Collections;
-using System.Security.Permissions;
-using System.Web.UI.WebControls;
-
-namespace System.Web.UI.WebControls
-{
-       public interface IFieldControl
-       {
-               IAutoFieldGenerator FieldsGenerator { get; set; }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IPersistedSelector.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IPersistedSelector.cs
deleted file mode 100644 (file)
index 85a62d5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.WebControls.IPersistedSelector.cs
-//
-// Author:
-//      Atsushi Enomoto  <atsushi@ximian.com>
-//
-// (C) 2008-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Security.Permissions;
-using System.Web;
-
-namespace System.Web.UI.WebControls
-{
-       public interface IPersistedSelector
-       {
-               DataKey DataKey { get; set; }
-       }
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
deleted file mode 100644 (file)
index a8bd885..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.UI.WebControls.ImageAlign.cs
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       public enum ImageAlign {
-               NotSet,
-               Left,
-               Right,
-               Baseline,
-               Top,
-               Middle,
-               Bottom,
-               AbsBottom,
-               AbsMiddle,
-               TextTop
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageMapEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageMapEventHandler.cs
deleted file mode 100644 (file)
index ad0566f..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.ImageMapEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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.Web.UI.WebControls
-{
-       public delegate void ImageMapEventHandler (object sender, ImageMapEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs
deleted file mode 100644 (file)
index 539cad6..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.UI.WebControls.ListItemType.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ListItemType
-       {
-               Header,
-               Footer,
-               Item,
-               AlternatingItem,
-               SelectedItem,
-               EditItem,
-               Separator,
-               Pager
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs
deleted file mode 100644 (file)
index 64ee486..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.ListItemType.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ListSelectionMode
-       {
-                  Single,
-                  Multiple
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LiteralMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LiteralMode.cs
deleted file mode 100644 (file)
index c23f344..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.LiteralMode.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum LiteralMode {
-                Transform = 0,
-               PassThrough = 1,
-               Encode = 2              
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventArgs.cs
deleted file mode 100644 (file)
index 6e72687..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// System.Web.UI.WebControls.LoginCancelEventArgs class
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       public class LoginCancelEventArgs : EventArgs 
-       {
-               bool cancel;
-
-               public LoginCancelEventArgs ()
-               {
-                       cancel = false;
-               }
-
-               public LoginCancelEventArgs (bool cancel)
-               {
-                       this.cancel = cancel;
-               }
-
-               public bool Cancel {
-                       get { return cancel; }
-                       set { cancel = value; }
-               }
-
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LoginCancelEventHandler.cs
deleted file mode 100644 (file)
index 8953b48..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.LoginCancelEventHandler delegate
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void LoginCancelEventHandler (object sender, LoginCancelEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LoginFailureAction.cs
deleted file mode 100644 (file)
index e4fb167..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// System.Web.UI.WebControls.LoginFailureAction.cs
-//
-// Author: Duncan Mak (duncan@ximian.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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-
-        public enum LoginFailureAction
-        {
-                Refresh = 0,                
-                RedirectToLoginPage = 1,
-        }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LogoutAction.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LogoutAction.cs
deleted file mode 100644 (file)
index e942866..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.LogoutAction.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum LogoutAction {
-                Refresh = 0,
-               Redirect = 1,
-               RedirectToLoginPage = 2         
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MailMessageEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MailMessageEventHandler.cs
deleted file mode 100644 (file)
index a9baaf1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebControls.MailMessageEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void MailMessageEventHandler (object sender, MailMessageEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MenuEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MenuEventHandler.cs
deleted file mode 100644 (file)
index 0286227..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebControls.MenuEventHandler.cs
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void MenuEventHandler (object sender, MenuEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MenuRenderingMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MenuRenderingMode.cs
deleted file mode 100644 (file)
index 9baa741..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// 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;
-
-namespace System.Web.UI.WebControls
-{
-       public enum MenuRenderingMode
-       {
-               Default,
-               Table,
-               List,
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs
deleted file mode 100644 (file)
index 1bc2cec..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.MonthChangedEventHandler.cs
-//
-// Authors:
-//     Jackson Harper (jackson@ximian.com)
-//
-// (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;
-
-namespace System.Web.UI.WebControls {
-
-       public delegate void MonthChangedEventHandler (object sender,
-                       MonthChangedEventArgs e);
-
-}
-
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs
deleted file mode 100644 (file)
index 0fa4064..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.NextPrevFormat.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum NextPrevFormat
-       {
-               CustomText,
-               ShortMonth,
-               FullMonth
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceDisposingEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceDisposingEventHandler.cs
deleted file mode 100644 (file)
index f90e1b1..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebContrls.ObjectDataSourceDisposingEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void ObjectDataSourceDisposingEventHandler (object sender, ObjectDataSourceDisposingEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceFilteringEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceFilteringEventHandler.cs
deleted file mode 100644 (file)
index b806640..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.ObjectDataSourceFilteringEventHandler.cs
-//
-// Authors:
-//     Lluis Sanchez Gual (lluis@novell.com)
-//
-// (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.Web.UI.WebControls
-{
-       public delegate void ObjectDataSourceFilteringEventHandler (object sender, ObjectDataSourceFilteringEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceMethodEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceMethodEventHandler.cs
deleted file mode 100644 (file)
index 8814e61..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebContrls.ObjectDataSourceMethodEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void ObjectDataSourceMethodEventHandler (object sender, ObjectDataSourceMethodEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceSelectingEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceSelectingEventHandler.cs
deleted file mode 100644 (file)
index a4abf86..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebContrls.ObjectDataSourceSelectingEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void ObjectDataSourceSelectingEventHandler (object sender, ObjectDataSourceSelectingEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceStatusEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ObjectDataSourceStatusEventHandler.cs
deleted file mode 100644 (file)
index 9d96763..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebContrls.ObjectDataSourceStatusEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void ObjectDataSourceStatusEventHandler (object sender, ObjectDataSourceStatusEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Orientation.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Orientation.cs
deleted file mode 100644 (file)
index 6f9ff79..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.Orientation.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum Orientation {
-                Horizontal = 0,
-               Vertical = 1
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagerButtons.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagerButtons.cs
deleted file mode 100644 (file)
index dfb8dce..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.PagerButtons.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum PagerButtons {
-                NextPrevious = 0,
-               Numeric = 1,
-               NextPreviousFirstLast = 2,
-               NumericFirstLast = 3
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs
deleted file mode 100644 (file)
index 20dcf26..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.PagerMode.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum PagerMode
-       {
-               NextPrev,
-               NumericPages
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs
deleted file mode 100644 (file)
index 7793a71..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.PagerPosition.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum PagerPosition
-       {
-               Bottom,
-               Top,
-               TopAndBottom
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PathDirection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PathDirection.cs
deleted file mode 100644 (file)
index c124802..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.PathDirection.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum PathDirection {
-                RootToCurrent = 0,
-               CurrentToRoot = 1
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs
deleted file mode 100644 (file)
index 21eb560..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.WebControls.RepeatDirection.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum RepeatDirection
-       {
-               Horizontal,
-               Vertical
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs
deleted file mode 100644 (file)
index d0ff4c5..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.RepeatLayout.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// Copyright (C) 2005-2010 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum RepeatLayout
-       {
-               Table,
-               Flow,
-               UnorderedList,
-               OrderedList
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs
deleted file mode 100644 (file)
index 828b25d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.RepeaterEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void RepeaterCommandEventHandler (
-               object sender,
-               RepeaterCommandEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs
deleted file mode 100644 (file)
index 56c2d6a..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// System.Web.UI.WebControls.RepeaterItemEventHandler
-//
-// Author: Ben Maurer <bmaurer@novell.com>
-//
-// 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.Web.UI.WebControls {
-       public delegate void RepeaterItemEventHandler (object sender, RepeaterItemEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SendMailErrorEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SendMailErrorEventHandler.cs
deleted file mode 100644 (file)
index 9ca58aa..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebContrls.SendMailErrorEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void SendMailErrorEventHandler (object sender, SendMailErrorEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs
deleted file mode 100644 (file)
index 99f86e8..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// System.Web.UI.WebControls.ServerValidateEventHandler.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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.Web.UI.WebControls {
-
-       public delegate void ServerValidateEventHandler (
-               object sender,
-               ServerValidateEventArgs e);
-}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemEventHandler.cs
deleted file mode 100644 (file)
index 03d4d16..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebControls.SiteMapNodeItemEventHandler.cs;
-//
-// Authors:
-//   Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void SiteMapNodeItemEventHandler (object sender, SiteMapNodeItemEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapNodeItemType.cs
deleted file mode 100644 (file)
index 20def31..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.SiteMapNodeItemType.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum SiteMapNodeItemType {
-                Root = 0,
-               Parent = 1,
-               Current = 2,
-               PathSeparator = 3
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SortDirection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SortDirection.cs
deleted file mode 100644 (file)
index b6d6ac2..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.SortDirection.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls
-{
-        public enum SortDirection
-        {
-                       Ascending = 0,
-                       Descending = 1          
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs
deleted file mode 100644 (file)
index 477e8e9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceCommandEventHandler
-//
-// Authors:
-//     Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// 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.Web.UI.WebControls {
-       public delegate void SqlDataSourceCommandEventHandler (object source, SqlDataSourceCommandEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceCommandType.cs
deleted file mode 100644 (file)
index ba766e6..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceCommandType
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (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.Web.UI.WebControls {
-
-       public enum SqlDataSourceCommandType
-       {
-               Text = 0,
-               StoredProcedure = 1
-       }
-
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceFilteringEventHandler.cs
deleted file mode 100644 (file)
index b5c8cd9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceFilteringEventHandler
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (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.Web.UI.WebControls {
-       public delegate void SqlDataSourceFilteringEventHandler (object sender, SqlDataSourceFilteringEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceMode.cs
deleted file mode 100644 (file)
index f30828e..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceMode
-//
-// Authors:
-//     Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// 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.Specialized;
-using System.Text;
-
-namespace System.Web.UI.WebControls {
-       public enum SqlDataSourceMode {
-               DataReader,
-               DataSet
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceSelectingEventHandler.cs
deleted file mode 100644 (file)
index f2bbad3..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceSelectingEventHandler
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void SqlDataSourceSelectingEventHandler (object source, SqlDataSourceSelectingEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs
deleted file mode 100644 (file)
index 90176d6..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.SqlDataSourceStatusEventHandler
-//
-// Authors:
-//     Ben Maurer (bmaurer@users.sourceforge.net)
-//
-// (C) 2003 Ben Maurer
-//
-
-//
-// 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.Web.UI.WebControls {
-       public delegate void SqlDataSourceStatusEventHandler (object source, SqlDataSourceStatusEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableCaptionAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableCaptionAlign.cs
deleted file mode 100644 (file)
index 47fbf84..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.TableCaptionAlign.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-
-       // present in Fx 1.1 SP1
-        public enum TableCaptionAlign {
-                NotSet = 0,
-               Top = 1,
-               Bottom = 2,
-               Left = 3,
-               Right = 4               
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderScope.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderScope.cs
deleted file mode 100644 (file)
index 0e92808..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.TableHeaderScope.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum TableHeaderScope {
-                NotSet = 0,
-               Row = 1,
-               Column = 2              
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRowSection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRowSection.cs
deleted file mode 100644 (file)
index 09246fe..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.TableRowSection.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum TableRowSection {
-                       TableHeader = 0,
-                       TableBody = 1,
-                       TableFooter = 2                         
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs
deleted file mode 100644 (file)
index b792f8a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.TextAlign.cs
-//
-// Author:
-//      Dick Porter  <dick@ximian.com>
-//
-// 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.Web.UI.WebControls {
-       public enum TextAlign {
-               Left = 0x01,
-               Right
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs
deleted file mode 100644 (file)
index eb3287b..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.UI.WebControls.TextBoxMode.cs
-//
-// Authors:
-//     Jordi Mas i Hernandez (jordi@ximian.com)
-//
-// (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.Web.UI.WebControls {
-       public enum TextBoxMode {
-               SingleLine,
-               MultiLine,
-               Password,
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs
deleted file mode 100644 (file)
index 50a3976..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.TitleFormat.cs
-//
-// Authors:
-//     Jordi Mas i Hernandez (jordi@ximian.com)
-//
-// (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.Web.UI.WebControls
-{
-       public enum TitleFormat
-       {
-               Month,
-               MonthYear
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeEventHandler.cs
deleted file mode 100644 (file)
index b63cd3c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// System.Web.UI.WebControls.TreeNodeEventHandler.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004 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.Web.UI.WebControls {
-       public delegate void TreeNodeEventHandler (object source, TreeNodeEventArgs e);
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeSelectAction.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeNodeSelectAction.cs
deleted file mode 100644 (file)
index 03ac383..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.WebControls.TreeNodeSelectAction.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-       public enum TreeNodeSelectAction {
-               Select = 0,
-               Expand = 1,
-               SelectExpand = 2,
-               None = 3                                
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TreeViewImageSet.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TreeViewImageSet.cs
deleted file mode 100644 (file)
index bafa273..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// System.Web.UI.WebControls.TreeViewImageSet.cs
-//
-// Author: Sanjay Gupta (gsanjay@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.
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
-//
-
-namespace System.Web.UI.WebControls {
-        public enum TreeViewImageSet {
-                Custom = 0,
-               XPFileExplorer = 1,
-               Msdn = 2,
-               WindowsHelp = 3,
-               Simple = 4,
-               Simple2 = 5,
-               BulletedList = 6,
-               BulletedList2 = 7,
-               BulletedList3 = 8,
-               BulletedList4 = 9,
-               Arrows = 10,
-               News = 11,
-               Contacts = 12,
-               Inbox = 13,
-               Events = 14,
-               Faq = 15                                
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs
deleted file mode 100644 (file)
index dfe59ff..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// System.Web.UI.WebControls.UnitType.cs
-//
-// Authors:
-//   Miguel de Icaza (miguel@novell.com)
-//
-// (C) 2005 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.
-//
-
-namespace System.Web.UI.WebControls {
-       public enum UnitType {
-               // Empty
-               Pixel = 1,
-               Point,
-               Pica,
-               Inch,
-               Mm,
-               Cm,
-               Percentage,
-               Em,
-               Ex
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs
deleted file mode 100644 (file)
index b6333ac..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.UI.WebControls.ValidationCompareOperator.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ValidationCompareOperator
-       {
-               Equal,
-               NotEqual,
-               GreaterThan,
-               GreaterThanEqual,
-               LessThan,
-               LessThanEqual,
-               DataTypeCheck
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs
deleted file mode 100644 (file)
index 5d25210..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.ValidationSummaryDisplayMode.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ValidationDataType
-       {
-               String,
-               Integer,
-               Double,
-               Date,
-               Currency
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs
deleted file mode 100644 (file)
index 73a3ffb..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.ValidationSummaryDisplayMode.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ValidationSummaryDisplayMode
-       {
-               List,
-               BulletList,
-               SingleParagraph
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs
deleted file mode 100644 (file)
index 172c228..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.WebControls.ValidatorDisplay.cs
-//
-// Author: Duncan Mak (duncan@novell.com)
-//
-// 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;
-
-namespace System.Web.UI.WebControls {
-
-       public enum ValidatorDisplay
-       {
-               None,
-               Static,
-               Dynamic
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs
deleted file mode 100644 (file)
index efe067d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.WebControls.VerticalAlign.cs
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// 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.Web.UI.WebControls {
-
-       [TypeConverter (typeof (System.Web.UI.WebControls.VerticalAlignConverter))]
-       public enum VerticalAlign {
-               NotSet,
-               Top,
-               Middle,
-               Bottom
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/ClientIDMode.cs b/mcs/class/System.Web/System.Web.UI/ClientIDMode.cs
deleted file mode 100644 (file)
index 75a4af7..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2002,2003 Ximian, Inc. (http://www.ximian.com)
-// Copyright (C) 2003-2010 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;
-
-namespace System.Web.UI
-{
-       public enum ClientIDMode
-       {
-               Inherit,
-               AutoID,
-               Predictable,
-               Static
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs b/mcs/class/System.Web/System.Web.UI/ConflictOptions.cs
deleted file mode 100644 (file)
index 4480548..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.ConflictOptions.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI {
-       public enum ConflictOptions {
-               OverwriteChanges = 0,
-               CompareAllValues = 1
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceCacheExpiry.cs b/mcs/class/System.Web/System.Web.UI/DataSourceCacheExpiry.cs
deleted file mode 100644 (file)
index 8413fc9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// System.Web.UI.DataSourceCacheExpiry.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI {
-       public enum DataSourceCacheExpiry {
-               Absolute = 0,
-               Sliding = 1
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceCapabilities.cs b/mcs/class/System.Web/System.Web.UI/DataSourceCapabilities.cs
deleted file mode 100644 (file)
index 0de8d95..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.DataSourceCapabilities.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI {
-       [Flags]
-       public enum DataSourceCapabilities {
-               None = 0,
-               Sort = 1,
-               Page = 2,
-               RetrieveTotalRowCount = 4
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceOperation.cs b/mcs/class/System.Web/System.Web.UI/DataSourceOperation.cs
deleted file mode 100644 (file)
index 6cea69c..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.DataSourceOperation.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI {
-       public enum DataSourceOperation {
-               Delete = 0,
-               Insert = 1,
-               Select = 2,
-               Update = 3,
-               SelectCount = 4 
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
deleted file mode 100644 (file)
index e4d334f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-// 
-// System.Web.UI.HtmlTextWriterTag
-//
-// Author:
-//        Ben Maurer <bmaurer@novell.com>
-//
-// (c) 2005-2010 Novell
-//
-// 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.Web.UI
-{
-       public enum HtmlTextWriterAttribute {
-               Accesskey,
-               Align,
-               Alt,
-               Background,
-               Bgcolor,
-               Border,
-               Bordercolor,
-               Cellpadding,
-               Cellspacing,
-               Checked,
-               Class,
-               Cols,
-               Colspan,
-               Disabled,
-               For,
-               Height,
-               Href,
-               Id,
-               Maxlength,
-               Multiple,
-               Name,
-               Nowrap,
-               Onchange,
-               Onclick,
-               ReadOnly,
-               Rows,
-               Rowspan,
-               Rules,
-               Selected,
-               Size,
-               Src,
-               Style,
-               Tabindex,
-               Target,
-               Title,
-               Type,
-               Valign,
-               Value,
-               Width,
-               Wrap,
-               Abbr,
-               AutoComplete,
-               Axis,
-               Content,
-               Coords,
-               DesignerRegion,
-               Dir,
-               Headers,
-               Longdesc,
-               Rel,
-               Scope,
-               Shape,
-               Usemap,
-               VCardName
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs
deleted file mode 100644 (file)
index 95c33db..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-// 
-// System.Web.UI.HtmlTextWriterStyle
-//
-// Author:
-//        Ben Maurer <bmaurer@novell.com>
-//
-// (c) 2005-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.
-//
-
-namespace System.Web.UI
-{
-       public enum HtmlTextWriterStyle {
-               BackgroundColor,
-               BackgroundImage,
-               BorderCollapse,
-               BorderColor,
-               BorderStyle,
-               BorderWidth,
-               Color,
-               FontFamily,
-               FontSize,
-               FontStyle,
-               FontWeight,
-               Height,
-               TextDecoration,
-               Width,
-               ListStyleImage,
-               ListStyleType,
-               Cursor,
-               Direction,
-               Display,
-               Filter,
-               FontVariant,
-               Left,
-               Margin,
-               MarginBottom,
-               MarginLeft,
-               MarginRight,
-               MarginTop,
-               Overflow,
-               OverflowX,
-               OverflowY,
-               Padding,
-               PaddingBottom,
-               PaddingLeft,
-               PaddingRight,
-               PaddingTop,
-               Position,
-               TextAlign,
-               VerticalAlign,
-               TextOverflow,
-               Top,
-               Visibility,
-               WhiteSpace,
-               ZIndex
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs
deleted file mode 100644 (file)
index 37277f5..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-// 
-// System.Web.UI.HtmlTextWriterTag
-//
-// Author:
-//        Ben Maurer <bmaurer@novell.com>
-//
-// (c) 2005-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.
-//
-
-namespace System.Web.UI
-{
-       public enum HtmlTextWriterTag {
-               Unknown,
-               A,
-               Acronym,
-               Address,
-               Area,
-               B,
-               Base,
-               Basefont,
-               Bdo,
-               Bgsound,
-               Big,
-               Blockquote,
-               Body,
-               Br,
-               Button,
-               Caption,
-               Center,
-               Cite,
-               Code,
-               Col,
-               Colgroup,
-               Dd,
-               Del,
-               Dfn,
-               Dir,
-               Div,
-               Dl,
-               Dt,
-               Em,
-               Embed,
-               Fieldset,
-               Font,
-               Form,
-               Frame,
-               Frameset,
-               H1,
-               H2,
-               H3,
-               H4,
-               H5,
-               H6,
-               Head,
-               Hr,
-               Html,
-               I,
-               Iframe,
-               Img,
-               Input,
-               Ins,
-               Isindex,
-               Kbd,
-               Label,
-               Legend,
-               Li,
-               Link,
-               Map,
-               Marquee,
-               Menu,
-               Meta,
-               Nobr,
-               Noframes,
-               Noscript,
-               Object,
-               Ol,
-               Option,
-               P,
-               Param,
-               Pre,
-               Q,
-               Rt,
-               Ruby,
-               S,
-               Samp,
-               Script,
-               Select,
-               Small,
-               Span,
-               Strike,
-               Strong,
-               Style,
-               Sub,
-               Sup,
-               Table,
-               Tbody,
-               Td,
-               Textarea,
-               Tfoot,
-               Th,
-               Thead,
-               Title,
-               Tr,
-               Tt,
-               U,
-               Ul,
-               Var,
-               Wbr,
-               Xml
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs b/mcs/class/System.Web/System.Web.UI/ICallbackEventHandler.cs
deleted file mode 100644 (file)
index cd2a65b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.ICallbackEventHandler.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 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;
-
-namespace System.Web.UI
-{
-       public interface ICallbackEventHandler
-       {
-               string GetCallbackResult ();
-               void RaiseCallbackEvent (string eventArgs);
-       }
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs b/mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs
deleted file mode 100644 (file)
index 94daa50..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// System.Web.UI.IPostBackEventHandler.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// 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.Web;
-
-namespace System.Web.UI
-{
-        public interface IPostBackEventHandler
-        {
-                void RaisePostBackEvent(string eventArgument);
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs b/mcs/class/System.Web/System.Web.UI/IThemeResolutionService.cs
deleted file mode 100644 (file)
index df19c8c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// System.Web.UI.IThemeResolutionService.cs
-//
-// Authors:
-//      Sanjay Gupta (gsanjay@novell.com)
-//
-// (C) 2004-2010 Novell, Inc (http://www.novell.com)
-//
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-
-namespace System.Web.UI
-{
-       public interface IThemeResolutionService
-       {
-               ThemeProvider [] GetAllThemeProviders ();
-               ThemeProvider GetStylesheetThemeProvider ();
-               ThemeProvider GetThemeProvider ();
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs b/mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs
deleted file mode 100644 (file)
index b360905..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// System.Web.UI.ImageClickEventHandler.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// 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.Web;
-
-namespace System.Web.UI
-{
-        public delegate void ImageClickEventHandler(object sender, ImageClickEventArgs e);
-}
diff --git a/mcs/class/System.Web/System.Web.UI/PersistenceMode.cs b/mcs/class/System.Web/System.Web.UI/PersistenceMode.cs
deleted file mode 100644 (file)
index 125ed53..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// System.Web.UI.PersistenceMode.cs
-//
-// Author:
-//   Bob Smith <bob@thestuff.net>
-//
-// (C) Bob Smith
-//
-
-//
-// 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.Web;
-
-namespace System.Web.UI
-{
-        public enum PersistenceMode
-        {
-                Attribute = 0,
-               InnerProperty = 1,
-               InnerDefaultProperty = 2,
-                EncodedInnerDefaultProperty = 3,
-        }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateInstance.cs b/mcs/class/System.Web/System.Web.UI/TemplateInstance.cs
deleted file mode 100644 (file)
index 6cf743d..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// System.Web.UI.TemplateInstance.cs
-//
-// Authors:
-//     Sanjay Gupta (gsanjay@novell.com)
-//
-// Copyright (C) 2004-2010 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.Web.UI 
-{
-       public enum TemplateInstance 
-       {
-               Multiple = 0,
-               Single = 1
-       } 
-}
-
diff --git a/mcs/class/System.Web/System.Web.UI/ViewStateEncryptionMode.cs b/mcs/class/System.Web/System.Web.UI/ViewStateEncryptionMode.cs
deleted file mode 100644 (file)
index 03593a0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// System.Web.Configuration.ViewStateEncryptionMode
-//
-// Authors:
-//     Chris Toshok (toshok@ximian.com)
-//
-// (C) 2005-2010 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.Web.UI
-{
-       public enum ViewStateEncryptionMode
-       {
-               Auto,
-               Always,
-               Never
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.UI/ViewStateMode.cs b/mcs/class/System.Web/System.Web.UI/ViewStateMode.cs
deleted file mode 100644 (file)
index 1243f60..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Authors:
-//   Marek Habersack <mhabersack@novell.com>
-//
-// (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.
-//
-namespace System.Web.UI
-{
-       public enum ViewStateMode
-       {
-               Inherit,
-               Enabled,
-               Disabled
-       }
-}
diff --git a/mcs/class/System.Web/System.Web.Util/RequestValidationSource.cs b/mcs/class/System.Web/System.Web.Util/RequestValidationSource.cs
deleted file mode 100644 (file)
index 7153d71..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// 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.
-//
-namespace System.Web.Util
-{
-       public enum RequestValidationSource
-       {
-               QueryString,
-               Form,
-               Cookies,
-               Files,
-               RawUrl,
-               Path,
-               PathInfo,
-               Headers
-       }
-}
index c300b3d90010ee658e1e822157ecd1a83a220402..254618c32adcf6c72e9c11f5068c6e4d80aeadf0 100644 (file)
@@ -74,7 +74,7 @@ System.Web.Compilation/BuildManagerRemoveEntryEventHandler.cs
 System.Web.Compilation/BuildManagerHostUnloadEventArgs.cs
 System.Web.Compilation/BuildManagerHostUnloadEventHandler.cs
 System.Web.Compilation/BuildProviderAppliesToAttribute.cs
-System.Web.Compilation/BuildProviderAppliesTo.cs
+../../../external/referencesource/System.Web/Compilation/BuildProviderAppliesTo.cs
 System.Web.Compilation/BuildProviderGroup.cs
 System.Web.Compilation/BuildProviderResultFlags.cs
 System.Web.Compilation/BuildProvider.cs
@@ -96,11 +96,10 @@ System.Web.Compilation/ExpressionPrefixAttribute.cs
 System.Web.Compilation/ForceCopyBuildProvider.cs
 System.Web.Compilation/GenericBuildProvider.cs
 System.Web.Compilation/GlobalAsaxCompiler.cs
-System.Web.Compilation/IAssemblyPostProcessor.cs
+../../../external/referencesource/System.Web/Compilation/IAssemblyPostProcessor.cs
 System.Web.Compilation/IgnoreFileBuildProvider.cs
-System.Web.Compilation/IImplicitResourceProvider.cs
+../../../external/referencesource/System.Web/Compilation/IImplicitResourceProvider.cs
 System.Web.Compilation/ILocation.cs
-System.Web.Compilation/ImplicitResourceKey.cs
 System.Web.Compilation/IResourceProvider.cs
 System.Web.Compilation/LinePragmaCodeInfo.cs
 System.Web.Compilation/Location.cs
@@ -140,14 +139,14 @@ System.Web.Configuration_2.0/nBrowser/File.cs
 System.Web.Configuration_2.0/nBrowser/Build.cs
 System.Web.Configuration_2.0/nBrowser/Node.cs
 System.Web.Configuration_2.0/nBrowser/Exception.cs
-System.Web.Configuration_2.0/AdapterDictionary.cs
+../../../external/referencesource/System.Web/Configuration/AdapterDictionary.cs
 System.Web.Configuration_2.0/AnonymousIdentificationSection.cs
 System.Web.Configuration_2.0/ApplicationSettingsConfigurationFileMap.cs
 System.Web.Configuration_2.0/AssemblyCollection.cs
 System.Web.Configuration_2.0/AssemblyInfo.cs
-System.Web.Configuration_2.0/AuthenticationMode.cs
+../../../external/referencesource/System.Web/Configuration/AuthenticationMode.cs
 System.Web.Configuration_2.0/AuthenticationSection.cs
-System.Web.Configuration_2.0/AuthorizationRuleAction.cs
+../../../external/referencesource/System.Web/Configuration/AuthorizationRuleAction.cs
 System.Web.Configuration_2.0/AuthorizationRule.cs
 System.Web.Configuration_2.0/AuthorizationRuleCollection.cs
 System.Web.Configuration_2.0/AuthorizationSection.cs
@@ -166,9 +165,9 @@ System.Web.Configuration_2.0/Compiler.cs
 System.Web.Configuration_2.0/CompilerCollection.cs
 System.Web.Configuration_2.0/CustomError.cs
 System.Web.Configuration_2.0/CustomErrorCollection.cs
-System.Web.Configuration_2.0/CustomErrorsMode.cs
+../../../external/referencesource/System.Web/Configuration/CustomErrorsMode.cs
 System.Web.Configuration_2.0/CustomErrorsSection.cs
-System.Web.Configuration_2.0/CustomErrorsRedirectMode.cs
+../../../external/referencesource/System.Web/Configuration/CustomErrorsRedirectMode.cs
 System.Web.Configuration_2.0/DeploymentSection.cs
 System.Web.Configuration_2.0/EventMappingSettings.cs
 System.Web.Configuration_2.0/EventMappingSettingsCollection.cs
@@ -178,8 +177,8 @@ System.Web.Configuration_2.0/FormsAuthenticationConfiguration.cs
 System.Web.Configuration_2.0/FormsAuthenticationCredentials.cs
 System.Web.Configuration_2.0/FormsAuthenticationUser.cs
 System.Web.Configuration_2.0/FormsAuthenticationUserCollection.cs
-System.Web.Configuration_2.0/FormsAuthPasswordFormat.cs
-System.Web.Configuration_2.0/FormsProtectionEnum.cs
+../../../external/referencesource/System.Web/Configuration/FormsAuthPasswordFormat.cs
+../../../external/referencesource/System.Web/Configuration/FormsProtectionEnum.cs
 System.Web.Configuration_2.0/GlobalizationSection.cs
 System.Web.Configuration_2.0/HandlersUtil.cs
 System.Web.Configuration_2.0/HealthMonitoringSection.cs
@@ -203,7 +202,7 @@ System.Web.Configuration_2.0/LowerCaseStringConverter.cs
 System.Web.Configuration_2.0/LruCache.cs
 System.Web.Configuration_2.0/MachineKeyRegistryStorage.cs
 System.Web.Configuration_2.0/MachineKeySection.cs
-System.Web.Configuration_2.0/MachineKeyValidation.cs
+../../../external/referencesource/System.Web/Configuration/MachineKeyValidation.cs
 System.Web.Configuration_2.0/MachineKeyValidationConverter.cs
 System.Web.Configuration_2.0/MembershipSection.cs
 System.Web.Configuration_2.0/MonoSettingsSection.cs
@@ -214,14 +213,14 @@ System.Web.Configuration_2.0/OutputCacheProfile.cs
 System.Web.Configuration_2.0/OutputCacheProfileCollection.cs
 System.Web.Configuration_2.0/OutputCacheSection.cs
 System.Web.Configuration_2.0/OutputCacheSettingsSection.cs
-System.Web.Configuration_2.0/PagesEnableSessionState.cs
+../../../external/referencesource/System.Web/Configuration/PagesEnableSessionState.cs
 System.Web.Configuration_2.0/PagesSection.cs
 System.Web.Configuration_2.0/PassportAuthentication.cs
 System.Web.Configuration_2.0/PositiveTimeSpanValidator.cs
 System.Web.Configuration_2.0/ProcessModelSection.cs
-System.Web.Configuration_2.0/ProcessModelComAuthenticationLevel.cs
-System.Web.Configuration_2.0/ProcessModelComImpersonationLevel.cs
-System.Web.Configuration_2.0/ProcessModelLogLevel.cs
+../../../external/referencesource/System.Web/Configuration/ProcessModelComAuthenticationLevel.cs
+../../../external/referencesource/System.Web/Configuration/ProcessModelComImpersonationLevel.cs
+../../../external/referencesource/System.Web/Configuration/ProcessModelLogLevel.cs
 System.Web.Configuration_2.0/ProfileGroupSettings.cs
 System.Web.Configuration_2.0/ProfileGroupSettingsCollection.cs
 System.Web.Configuration_2.0/ProfilePropertyNameValidator.cs
@@ -237,7 +236,7 @@ System.Web.Configuration_2.0/RoleManagerSection.cs
 System.Web.Configuration_2.0/RootProfilePropertySettingsCollection.cs
 System.Web.Configuration_2.0/RuleSettings.cs
 System.Web.Configuration_2.0/RuleSettingsCollection.cs
-System.Web.Configuration_2.0/SerializationMode.cs
+../../../external/referencesource/System.Web/Configuration/SerializationMode.cs
 System.Web.Configuration_2.0/SecurityPolicySection.cs
 System.Web.Configuration_2.0/SessionPageStateSection.cs
 System.Web.Configuration_2.0/SessionStateSection.cs
@@ -245,13 +244,13 @@ System.Web.Configuration_2.0/SiteMapSection.cs
 System.Web.Configuration_2.0/SqlCacheDependencyDatabase.cs
 System.Web.Configuration_2.0/SqlCacheDependencyDatabaseCollection.cs
 System.Web.Configuration_2.0/SqlCacheDependencySection.cs
-System.Web.Configuration_2.0/SystemWebCachingSectionGroup.cs
+../../../external/referencesource/System.Web/Configuration/SystemWebCachingSectionGroup.cs
 System.Web.Configuration_2.0/SystemWebSectionGroup.cs
 System.Web.Configuration_2.0/TagMapCollection.cs
 System.Web.Configuration_2.0/TagMapInfo.cs
 System.Web.Configuration_2.0/TagPrefixCollection.cs
 System.Web.Configuration_2.0/TagPrefixInfo.cs
-System.Web.Configuration_2.0/TraceDisplayMode.cs
+../../../external/referencesource/System.Web/Configuration/TraceDisplayMode.cs
 System.Web.Configuration_2.0/TraceSection.cs
 System.Web.Configuration_2.0/TransformerInfo.cs
 System.Web.Configuration_2.0/TransformerInfoCollection.cs
@@ -263,7 +262,7 @@ System.Web.Configuration_2.0/UrlMappingCollection.cs
 System.Web.Configuration_2.0/UrlMappingsSection.cs
 System.Web.Configuration_2.0/VirtualDirectoryMappingCollection.cs
 System.Web.Configuration_2.0/VirtualDirectoryMapping.cs
-System.Web.Configuration_2.0/WebApplicationLevel.cs
+../../../external/referencesource/System.Web/Configuration/WebApplicationLevel.cs
 System.Web.Configuration_2.0/WebConfigurationFileMap.cs
 System.Web.Configuration_2.0/WebConfigurationHost.cs
 System.Web.Configuration_2.0/WebConfigurationManager.cs
@@ -272,7 +271,7 @@ System.Web.Configuration_2.0/WebContext.cs
 System.Web.Configuration_2.0/WebPartsPersonalization.cs
 System.Web.Configuration_2.0/WebPartsPersonalizationAuthorization.cs
 System.Web.Configuration_2.0/WebPartsSection.cs
-System.Web.Configuration_2.0/XhtmlConformanceMode.cs
+../../../external/referencesource/System.Web/Configuration/XhtmlConformanceMode.cs
 System.Web.Configuration_2.0/XhtmlConformanceSection.cs
 System.Web.Configuration.Internal/IInternalConfigWebHost.cs
 System.Web/DefaultHttpHandler.cs
@@ -361,8 +360,8 @@ System.Web/IisTraceListener.cs
 System.Web/IPartitionResolver.cs
 System.Web/InputFilterStream.cs
 System.Web/OutputFilterStream.cs
-System.Web/RequestNotification.cs
-System.Web/RequestNotificationStatus.cs
+../../../external/referencesource/System.Web/RequestNotification.cs
+../../../external/referencesource/System.Web/RequestNotificationStatus.cs
 System.Web.Mail/Base64AttachmentEncoder.cs
 System.Web.Mail/IAttachmentEncoder.cs
 System.Web.Mail/MailAddressCollection.cs
@@ -408,7 +407,7 @@ System.Web.Profile/ProfileAutoSaveEventArgs.cs
 System.Web.Profile/ProfileAutoSaveEventHandler.cs
 System.Web.Profile/ProfileBase.cs
 System.Web.Profile/ProfileEventArgs.cs
-System.Web.Profile/ProfileEventHandler.cs
+../../../external/referencesource/System.Web/Profile/ProfileEventHandler.cs
 ../../../external/referencesource/System.Web/Profile/HttpProfileGroupBase.cs
 System.Web.Profile/ProfileInfoCollection.cs
 System.Web.Profile/ProfileInfo.cs
@@ -438,18 +437,18 @@ System.Web.Security/DefaultAuthenticationModule.cs
 System.Web.Security/FileAuthorizationModule.cs
 System.Web.Security/FormsAuthentication.cs
 System.Web.Security/FormsAuthenticationEventArgs.cs
-System.Web.Security/FormsAuthenticationEventHandler.cs
+../../../external/referencesource/System.Web/Security/FormsAuthenticationEventHandler.cs
 System.Web.Security/FormsAuthenticationModule.cs
 System.Web.Security/FormsAuthenticationTicket.cs
 System.Web.Security/FormsIdentity.cs
 System.Web.Security/Membership.cs
 System.Web.Security/MembershipHelper.cs
 System.Web.Security/PassportAuthenticationEventArgs.cs
-System.Web.Security/PassportAuthenticationEventHandler.cs
+../../../external/referencesource/System.Web/Security/PassportAuthenticationEventHandler.cs
 System.Web.Security/PassportAuthenticationModule.cs
 System.Web.Security/PassportIdentity.cs
 System.Web.Security/RoleManagerEventArgs.cs
-System.Web.Security/RoleManagerEventHandler.cs
+../../../external/referencesource/System.Web/Security/RoleManagerEventHandler.cs
 System.Web.Security/RoleManagerModule.cs
 System.Web.Security/RolePrincipal.cs
 System.Web.Security/RoleProviderCollection.cs
@@ -460,7 +459,7 @@ System.Web.Security/SqlMembershipProvider.cs
 System.Web.Security/SqlRoleProvider.cs
 System.Web.Security/UrlAuthorizationModule.cs
 System.Web.Security/WindowsAuthenticationEventArgs.cs
-System.Web.Security/WindowsAuthenticationEventHandler.cs
+../../../external/referencesource/System.Web/Security/WindowsAuthenticationEventHandler.cs
 System.Web.Security/WindowsAuthenticationModule.cs
 System.Web/ServerVariablesCollection.cs
 System.Web.SessionState_2.0/HttpSessionStateContainer.cs
@@ -497,15 +496,15 @@ System.Web/StaticFileHandler.cs
 System.Web/StaticSiteMapProvider.cs
 System.Web/TempFileStream.cs
 System.Web/TraceContext.cs
-System.Web/TraceContextEventArgs.cs
-System.Web/TraceContextEventHandler.cs
+../../../external/referencesource/System.Web/UI/TraceContextEventArgs.cs
+../../../external/referencesource/System.Web/UI/TraceContextEventHandler.cs
 System.Web/TraceContextRecord.cs
 System.Web/TraceData.cs
 System.Web/TraceManager.cs
 System.Web/TraceMode.cs
 System.Web.UI.Adapters/ControlAdapter.cs
 System.Web.UI.Adapters/PageAdapter.cs
-System.Web.UI.Adapters/WmlPostFieldType.cs
+../../../external/referencesource/System.Web/UI/WebControls/Adapters/WmlPostFieldType.cs
 System.Web.UI/ApplicationFileParser.cs
 System.Web.UI/AttributeCollection.cs
 System.Web.UI/BaseParser.cs
@@ -525,7 +524,7 @@ System.Web.UI/CompilationMode.cs
 System.Web.UI/CompiledBindableTemplateBuilder.cs
 System.Web.UI/CompiledTemplateBuilder.cs
 System.Web.UI/ComplexPropertyEntry.cs
-System.Web.UI/ConflictOptions.cs
+../../../external/referencesource/System.Web/UI/ConflictOptions.cs
 System.Web.UI/ConstructorNeedsTagAttribute.cs
 System.Web.UI/ControlBuilderAttribute.cs
 System.Web.UI/ControlBuilder.cs
@@ -544,11 +543,11 @@ System.Web.UI/DataBinding.cs
 System.Web.UI/DataBindingHandlerAttribute.cs
 System.Web.UI/DataBoundLiteralControl.cs
 System.Web.UI/DataSourceCacheDurationConverter.cs
-System.Web.UI/DataSourceCacheExpiry.cs
-System.Web.UI/DataSourceCapabilities.cs
+../../../external/referencesource/System.Web/UI/DataSourceCacheExpiry.cs
+../../../external/referencesource/System.Web/UI/DataSourceCapabilities.cs
 System.Web.UI/DataSourceControl.cs
 System.Web.UI/DataSourceControlBuilder.cs
-System.Web.UI/DataSourceOperation.cs
+../../../external/referencesource/System.Web/UI/DataSourceOperation.cs
 System.Web.UI/DataSourceSelectArguments.cs
 System.Web.UI/DataSourceView.cs
 System.Web.UI/DataSourceViewOperationCallback.cs
@@ -603,15 +602,15 @@ System.Web.UI.HtmlControls/HtmlTableRowCollection.cs
 System.Web.UI.HtmlControls/HtmlTableRow.cs
 System.Web.UI.HtmlControls/HtmlTextArea.cs
 System.Web.UI.HtmlControls/HtmlTitle.cs
-System.Web.UI/HtmlTextWriterAttribute.cs
+../../../external/referencesource/System.Web/UI/HtmlTextWriterAttribute.cs
 System.Web.UI/HtmlTextWriter.cs
-System.Web.UI/HtmlTextWriterStyle.cs
-System.Web.UI/HtmlTextWriterTag.cs
+../../../external/referencesource/System.Web/UI/HtmlTextWriterStyle.cs
+../../../external/referencesource/System.Web/UI/HtmlTextWriterTag.cs
 System.Web.UI/IAttributeAccessor.cs
 System.Web.UI/IAutoFieldGenerator.cs
 System.Web.UI/IBindableControl.cs
 System.Web.UI/IBindableTemplate.cs
-System.Web.UI/ICallbackEventHandler.cs
+../../../external/referencesource/System.Web/UI/ICallbackEventHandler.cs
 System.Web.UI/ICheckBoxControl.cs
 System.Web.UI/IControlBuilderAccessor.cs
 System.Web.UI/IControlDesignerAccessor.cs
@@ -628,14 +627,14 @@ System.Web.UI/IHierarchicalDataSource.cs
 System.Web.UI/IHierarchicalEnumerable.cs
 System.Web.UI/IHierarchyData.cs
 System.Web.UI/ImageClickEventArgs.cs
-System.Web.UI/ImageClickEventHandler.cs
+../../../external/referencesource/System.Web/UI/ImageClickEventHandler.cs
 System.Web.UI/IndexedString.cs
 System.Web.UI/INamingContainer.cs
 System.Web.UI/INonBindingContainer.cs
 System.Web.UI/INavigateUIData.cs
 System.Web.UI/IParserAccessor.cs
 System.Web.UI/IPostBackDataHandler.cs
-System.Web.UI/IPostBackEventHandler.cs
+../../../external/referencesource/System.Web/UI/IPostBackEventHandler.cs
 System.Web.UI/IResourceUrlGenerator.cs
 System.Web.UI/IStateFormatter.cs
 System.Web.UI/IStateManager.cs
@@ -644,7 +643,7 @@ System.Web.UI/IStyleSheet.cs
 System.Web.UI/ITagNameToTypeMapper.cs
 System.Web.UI/ITemplate.cs
 System.Web.UI/ITextControl.cs
-System.Web.UI/IThemeResolutionService.cs
+../../../external/referencesource/System.Web/UI/IThemeResolutionService.cs
 System.Web.UI/IUrlResolutionService.cs
 System.Web.UI/IUserControlDesignerAccessor.cs
 System.Web.UI/IUserControlTypeResolutionService.cs
@@ -682,7 +681,7 @@ System.Web.UI/PartialCachingAttribute.cs
 System.Web.UI/PartialCachingControl.cs
 System.Web.UI/PersistChildrenAttribute.cs
 System.Web.UI/PersistenceModeAttribute.cs
-System.Web.UI/PersistenceMode.cs
+../../../external/referencesource/System.Web/UI/PersistenceMode.cs
 System.Web.UI/PostBackOptions.cs
 System.Web.UI/PropertyConverter.cs
 System.Web.UI/PropertyEntry.cs
@@ -707,7 +706,7 @@ System.Web.UI/TemplateContainerAttribute.cs
 System.Web.UI/TemplateContentType.cs
 System.Web.UI/TemplateControl.cs
 System.Web.UI/TemplateControlParser.cs
-System.Web.UI/TemplateInstance.cs
+../../../external/referencesource/System.Web/UI/TemplateInstance.cs
 System.Web.UI/TemplateInstanceAttribute.cs
 System.Web.UI/TemplateParser.cs
 System.Web.UI/TemplatePropertyEntry.cs
@@ -727,7 +726,7 @@ System.Web.UI/VerificationAttribute.cs
 System.Web.UI/VerificationConditionalOperator.cs
 System.Web.UI/VerificationReportLevel.cs
 System.Web.UI/VerificationRule.cs
-System.Web.UI/ViewStateEncryptionMode.cs
+../../../external/referencesource/System.Web/UI/ViewStateEncryptionMode.cs
 System.Web.UI/ViewStateException.cs
 System.Web.UI/ViewStateModeByIdAttribute.cs
 System.Web.UI/VirtualReferenceType.cs
@@ -739,12 +738,12 @@ System.Web.UI.WebControls.Adapters/WebControlAdapter.cs
 System.Web.UI.WebControls/AccessDataSource.cs
 System.Web.UI.WebControls/AccessDataSourceView.cs
 System.Web.UI.WebControls/AdCreatedEventArgs.cs
-System.Web.UI.WebControls/AdCreatedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/AdCreatedEventHandler.cs
 System.Web.UI.WebControls/AdRotator.cs
 System.Web.UI.WebControls/AssociatedControlConverter.cs
-System.Web.UI.WebControls/AuthenticateEventArgs.cs
-System.Web.UI.WebControls/AuthenticateEventHandler.cs
-System.Web.UI.WebControls/AutoCompleteType.cs
+../../../external/referencesource/System.Web/UI/WebControls/AuthenticateEventArgs.cs
+../../../external/referencesource/System.Web/UI/WebControls/AuthenticateEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/AutoCompleteType.cs
 System.Web.UI.WebControls/AutoGeneratedField.cs
 System.Web.UI.WebControls/AutoGeneratedFieldProperties.cs
 System.Web.UI.WebControls/BaseCompareValidator.cs
@@ -752,23 +751,23 @@ System.Web.UI.WebControls/BaseDataBoundControl.cs
 System.Web.UI.WebControls/BaseDataList.cs
 System.Web.UI.WebControls/BaseMenuRenderer.cs
 System.Web.UI.WebControls/BaseValidator.cs
-System.Web.UI.WebControls/BorderStyle.cs
+../../../external/referencesource/System.Web/UI/WebControls/BorderStyle.cs
 System.Web.UI.WebControls/BoundColumn.cs
 System.Web.UI.WebControls/BoundField.cs
 System.Web.UI.WebControls/BulletedList.cs
 System.Web.UI.WebControls/BulletedListDisplayMode.cs
 System.Web.UI.WebControls/BulletedListEventArgs.cs
-System.Web.UI.WebControls/BulletedListEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/BulletedListEventHandler.cs
 System.Web.UI.WebControls/BulletStyle.cs
 System.Web.UI.WebControls/ButtonColumn.cs
-System.Web.UI.WebControls/ButtonColumnType.cs
+../../../external/referencesource/System.Web/UI/WebControls/ButtonColumnType.cs
 System.Web.UI.WebControls/Button.cs
 System.Web.UI.WebControls/ButtonFieldBase.cs
 System.Web.UI.WebControls/ButtonField.cs
-System.Web.UI.WebControls/ButtonType.cs
+../../../external/referencesource/System.Web/UI/WebControls/ButtonType.cs
 System.Web.UI.WebControls/Calendar.cs
 System.Web.UI.WebControls/CalendarDay.cs
-System.Web.UI.WebControls/CalendarSelectionMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/CalendarSelectionMode.cs
 System.Web.UI.WebControls/ChangePassword.cs
 System.Web.UI.WebControls/CheckBox.cs
 System.Web.UI.WebControls/CheckBoxField.cs
@@ -777,7 +776,7 @@ System.Web.UI.WebControls/ChildTable.cs
 System.Web.UI.WebControls/CircleHotSpot.cs
 System.Web.UI.WebControls/CollectionDataSource.cs
 System.Web.UI.WebControls/CommandEventArgs.cs
-System.Web.UI.WebControls/CommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/CommandEventHandler.cs
 System.Web.UI.WebControls/CommandField.cs
 System.Web.UI.WebControls/CompareValidator.cs
 System.Web.UI.WebControls/CompleteWizardStep.cs
@@ -786,147 +785,147 @@ System.Web.UI.WebControls/CompositeDataBoundControl.cs
 System.Web.UI.WebControls/ContainedTable.cs
 System.Web.UI.WebControls/ContentControlBuilderInternal.cs
 System.Web.UI.WebControls/Content.cs
-System.Web.UI.WebControls/ContentDirection.cs
+../../../external/referencesource/System.Web/UI/WebControls/ContentDirection.cs
 System.Web.UI.WebControls/ContentPlaceHolderBuilder.cs
 System.Web.UI.WebControls/ContentPlaceHolder.cs
 System.Web.UI.WebControls/ControlIDConverter.cs
 System.Web.UI.WebControls/ControlParameter.cs
 System.Web.UI.WebControls/ControlPropertyNameConverter.cs
 System.Web.UI.WebControls/CookieParameter.cs
-System.Web.UI.WebControls/CreateUserErrorEventArgs.cs
-System.Web.UI.WebControls/CreateUserErrorEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/CreateUserErrorEventArgs.cs
+../../../external/referencesource/System.Web/UI/WebControls/CreateUserErrorEventHandler.cs
 System.Web.UI.WebControls/CreateUserWizard.cs
 System.Web.UI.WebControls/CreateUserWizardStep.cs
 System.Web.UI.WebControls/CustomValidator.cs
 System.Web.UI.WebControls/DataBoundControl.cs
-System.Web.UI.WebControls/DataBoundControlMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataBoundControlMode.cs
 System.Web.UI.WebControls/DataControlButton.cs
-System.Web.UI.WebControls/DataControlCellType.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataControlCellType.cs
 System.Web.UI.WebControls/DataControlCommands.cs
 System.Web.UI.WebControls/DataControlFieldCell.cs
 System.Web.UI.WebControls/DataControlFieldCollection.cs
 System.Web.UI.WebControls/DataControlField.cs
 System.Web.UI.WebControls/DataControlFieldHeaderCell.cs
-System.Web.UI.WebControls/DataControlRowState.cs
-System.Web.UI.WebControls/DataControlRowType.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataControlRowState.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataControlRowType.cs
 System.Web.UI.WebControls/DataGridColumnCollection.cs
 System.Web.UI.WebControls/DataGridColumn.cs
 System.Web.UI.WebControls/DataGridCommandEventArgs.cs
-System.Web.UI.WebControls/DataGridCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataGridCommandEventHandler.cs
 System.Web.UI.WebControls/DataGrid.cs
 System.Web.UI.WebControls/DataGridItemCollection.cs
 System.Web.UI.WebControls/DataGridItem.cs
 System.Web.UI.WebControls/DataGridItemEventArgs.cs
-System.Web.UI.WebControls/DataGridItemEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataGridItemEventHandler.cs
 System.Web.UI.WebControls/DataGridPageChangedEventArgs.cs
-System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataGridPageChangedEventHandler.cs
 System.Web.UI.WebControls/DataGridPagerStyle.cs
 System.Web.UI.WebControls/DataGridSortCommandEventArgs.cs
-System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataGridSortCommandEventHandler.cs
 System.Web.UI.WebControls/DataKeyArray.cs
 System.Web.UI.WebControls/DataKeyCollection.cs
 System.Web.UI.WebControls/DataKey.cs
 System.Web.UI.WebControls/DataListCommandEventArgs.cs
-System.Web.UI.WebControls/DataListCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataListCommandEventHandler.cs
 System.Web.UI.WebControls/DataList.cs
 System.Web.UI.WebControls/DataListItemCollection.cs
 System.Web.UI.WebControls/DataListItem.cs
 System.Web.UI.WebControls/DataListItemEventArgs.cs
-System.Web.UI.WebControls/DataListItemEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DataListItemEventHandler.cs
 System.Web.UI.WebControls/DataSourceCacheManager.cs
-System.Web.UI.WebControls/DayNameFormat.cs
+../../../external/referencesource/System.Web/UI/WebControls/DayNameFormat.cs
 System.Web.UI.WebControls/DayRenderEventArgs.cs
-System.Web.UI.WebControls/DayRenderEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DayRenderEventHandler.cs
 System.Web.UI.WebControls/DetailsViewCommandEventArgs.cs
-System.Web.UI.WebControls/DetailsViewCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewCommandEventHandler.cs
 System.Web.UI.WebControls/DetailsView.cs
 System.Web.UI.WebControls/DetailsViewDeletedEventArgs.cs
-System.Web.UI.WebControls/DetailsViewDeletedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewDeletedEventHandler.cs
 System.Web.UI.WebControls/DetailsViewDeleteEventArgs.cs
-System.Web.UI.WebControls/DetailsViewDeleteEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewDeleteEventHandler.cs
 System.Web.UI.WebControls/DetailsViewInsertedEventArgs.cs
-System.Web.UI.WebControls/DetailsViewInsertedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewInsertedEventHandler.cs
 System.Web.UI.WebControls/DetailsViewInsertEventArgs.cs
-System.Web.UI.WebControls/DetailsViewInsertEventHandler.cs
-System.Web.UI.WebControls/DetailsViewMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewInsertEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewMode.cs
 System.Web.UI.WebControls/DetailsViewModeEventArgs.cs
-System.Web.UI.WebControls/DetailsViewModeEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewModeEventHandler.cs
 System.Web.UI.WebControls/DetailsViewPageEventArgs.cs
-System.Web.UI.WebControls/DetailsViewPageEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewPageEventHandler.cs
 System.Web.UI.WebControls/DetailsViewPagerRow.cs
 System.Web.UI.WebControls/DetailsViewRowCollection.cs
 System.Web.UI.WebControls/DetailsViewRow.cs
 System.Web.UI.WebControls/DetailsViewUpdatedEventArgs.cs
-System.Web.UI.WebControls/DetailsViewUpdatedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewUpdatedEventHandler.cs
 System.Web.UI.WebControls/DetailsViewUpdateEventArgs.cs
-System.Web.UI.WebControls/DetailsViewUpdateEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/DetailsViewUpdateEventHandler.cs
 System.Web.UI.WebControls/DropDownList.cs
 System.Web.UI.WebControls/EditCommandColumn.cs
 System.Web.UI.WebControls/EmbeddedMailObject.cs
 System.Web.UI.WebControls/EmbeddedMailObjectsCollection.cs
 System.Web.UI.WebControls/FileUpload.cs
-System.Web.UI.WebControls/FirstDayOfWeek.cs
+../../../external/referencesource/System.Web/UI/WebControls/FirstDayOfWeek.cs
 System.Web.UI.WebControls/FontInfo.cs
 System.Web.UI.WebControls/FontNamesConverter.cs
-System.Web.UI.WebControls/FontSize.cs
+../../../external/referencesource/System.Web/UI/WebControls/FontSize.cs
 System.Web.UI.WebControls/FontUnitConverter.cs
 System.Web.UI.WebControls/FontUnit.cs
 System.Web.UI.WebControls/FormParameter.cs
 System.Web.UI.WebControls/FormViewCommandEventArgs.cs
-System.Web.UI.WebControls/FormViewCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewCommandEventHandler.cs
 System.Web.UI.WebControls/FormView.cs
 System.Web.UI.WebControls/FormViewDeletedEventArgs.cs
-System.Web.UI.WebControls/FormViewDeletedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewDeletedEventHandler.cs
 System.Web.UI.WebControls/FormViewDeleteEventArgs.cs
-System.Web.UI.WebControls/FormViewDeleteEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewDeleteEventHandler.cs
 System.Web.UI.WebControls/FormViewInsertedEventArgs.cs
-System.Web.UI.WebControls/FormViewInsertedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewInsertedEventHandler.cs
 System.Web.UI.WebControls/FormViewInsertEventArgs.cs
-System.Web.UI.WebControls/FormViewInsertEventHandler.cs
-System.Web.UI.WebControls/FormViewMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewInsertEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewMode.cs
 System.Web.UI.WebControls/FormViewModeEventArgs.cs
-System.Web.UI.WebControls/FormViewModeEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewModeEventHandler.cs
 System.Web.UI.WebControls/FormViewPageEventArgs.cs
-System.Web.UI.WebControls/FormViewPageEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewPageEventHandler.cs
 System.Web.UI.WebControls/FormViewRow.cs
 System.Web.UI.WebControls/FormViewPagerRow.cs
 System.Web.UI.WebControls/FormViewUpdatedEventArgs.cs
-System.Web.UI.WebControls/FormViewUpdatedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewUpdatedEventHandler.cs
 System.Web.UI.WebControls/FormViewUpdateEventArgs.cs
-System.Web.UI.WebControls/FormViewUpdateEventHandler.cs
-System.Web.UI.WebControls/GridLines.cs
+../../../external/referencesource/System.Web/UI/WebControls/FormViewUpdateEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridLines.cs
 System.Web.UI.WebControls/GridViewCancelEditEventArgs.cs
-System.Web.UI.WebControls/GridViewCancelEditEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewCancelEditEventHandler.cs
 System.Web.UI.WebControls/GridViewCommandEventArgs.cs
-System.Web.UI.WebControls/GridViewCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewCommandEventHandler.cs
 System.Web.UI.WebControls/GridView.cs
 System.Web.UI.WebControls/GridViewDeletedEventArgs.cs
-System.Web.UI.WebControls/GridViewDeletedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewDeletedEventHandler.cs
 System.Web.UI.WebControls/GridViewDeleteEventArgs.cs
-System.Web.UI.WebControls/GridViewDeleteEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewDeleteEventHandler.cs
 System.Web.UI.WebControls/GridViewEditEventArgs.cs
-System.Web.UI.WebControls/GridViewEditEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewEditEventHandler.cs
 System.Web.UI.WebControls/GridViewPageEventArgs.cs
-System.Web.UI.WebControls/GridViewPageEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewPageEventHandler.cs
 System.Web.UI.WebControls/GridViewRowCollection.cs
 System.Web.UI.WebControls/GridViewRow.cs
 System.Web.UI.WebControls/GridViewRowEventArgs.cs
-System.Web.UI.WebControls/GridViewRowEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewRowEventHandler.cs
 System.Web.UI.WebControls/GridViewSelectEventArgs.cs
-System.Web.UI.WebControls/GridViewSelectEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewSelectEventHandler.cs
 System.Web.UI.WebControls/GridViewSortEventArgs.cs
-System.Web.UI.WebControls/GridViewSortEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewSortEventHandler.cs
 System.Web.UI.WebControls/GridViewUpdatedEventArgs.cs
-System.Web.UI.WebControls/GridViewUpdatedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewUpdatedEventHandler.cs
 System.Web.UI.WebControls/GridViewUpdateEventArgs.cs
-System.Web.UI.WebControls/GridViewUpdateEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/GridViewUpdateEventHandler.cs
 System.Web.UI.WebControls/HiddenField.cs
 System.Web.UI.WebControls/HierarchicalDataBoundControl.cs
 System.Web.UI.WebControls/HorizontalAlignConverter.cs
-System.Web.UI.WebControls/HorizontalAlign.cs
+../../../external/referencesource/System.Web/UI/WebControls/HorizontalAlign.cs
 System.Web.UI.WebControls/HotSpotCollection.cs
 System.Web.UI.WebControls/HotSpot.cs
-System.Web.UI.WebControls/HotSpotMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/HotSpotMode.cs
 System.Web.UI.WebControls/HyperLinkColumn.cs
 System.Web.UI.WebControls/HyperLinkControlBuilder.cs
 System.Web.UI.WebControls/HyperLink.cs
@@ -934,15 +933,15 @@ System.Web.UI.WebControls/HyperLinkField.cs
 System.Web.UI.WebControls/IButtonControl.cs
 System.Web.UI.WebControls/ICallbackContainer.cs
 System.Web.UI.WebControls/ICompositeControlDesignerAccessor.cs
-System.Web.UI.WebControls/ImageAlign.cs
+../../../external/referencesource/System.Web/UI/WebControls/ImageAlign.cs
 System.Web.UI.WebControls/ImageButton.cs
 System.Web.UI.WebControls/Image.cs
 System.Web.UI.WebControls/ImageField.cs
 System.Web.UI.WebControls/ImageMap.cs
 System.Web.UI.WebControls/ImageMapEventArgs.cs
-System.Web.UI.WebControls/ImageMapEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ImageMapEventHandler.cs
 System.Web.UI.WebControls/IMenuRenderer.cs
-System.Web.UI.WebControls/IPersistedSelector.cs
+../../../external/referencesource/System.Web/UI/WebControls/IPersistedSelector.cs
 System.Web.UI.WebControls/IPostBackContainer.cs
 System.Web.UI.WebControls/IRepeatInfoUser.cs
 System.Web.UI.WebControls/LabelControlBuilder.cs
@@ -954,27 +953,27 @@ System.Web.UI.WebControls/ListControl.cs
 System.Web.UI.WebControls/ListItemCollection.cs
 System.Web.UI.WebControls/ListItemControlBuilder.cs
 System.Web.UI.WebControls/ListItem.cs
-System.Web.UI.WebControls/ListItemType.cs
-System.Web.UI.WebControls/ListSelectionMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/ListItemType.cs
+../../../external/referencesource/System.Web/UI/WebControls/ListSelectionMode.cs
 System.Web.UI.WebControls/LiteralControlBuilder.cs
 System.Web.UI.WebControls/Literal.cs
-System.Web.UI.WebControls/LiteralMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/LiteralMode.cs
 System.Web.UI.WebControls/Localize.cs
 System.Web.UI.WebControls/Login.cs
-System.Web.UI.WebControls/LoginCancelEventArgs.cs
-System.Web.UI.WebControls/LoginCancelEventHandler.cs
-System.Web.UI.WebControls/LoginFailureAction.cs
+../../../external/referencesource/System.Web/UI/WebControls/LoginCancelEventArgs.cs
+../../../external/referencesource/System.Web/UI/WebControls/LoginCancelEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/LoginFailureAction.cs
 System.Web.UI.WebControls/LoginName.cs
 System.Web.UI.WebControls/LoginStatus.cs
 System.Web.UI.WebControls/LoginTextLayout.cs
 System.Web.UI.WebControls/LoginView.cs
-System.Web.UI.WebControls/LogoutAction.cs
+../../../external/referencesource/System.Web/UI/WebControls/LogoutAction.cs
 System.Web.UI.WebControls/MailDefinition.cs
 System.Web.UI.WebControls/MailMessageEventArgs.cs
-System.Web.UI.WebControls/MailMessageEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/MailMessageEventHandler.cs
 System.Web.UI.WebControls/Menu.cs
 System.Web.UI.WebControls/MenuEventArgs.cs
-System.Web.UI.WebControls/MenuEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/MenuEventHandler.cs
 System.Web.UI.WebControls/MenuItemBindingCollection.cs
 System.Web.UI.WebControls/MenuItemBinding.cs
 System.Web.UI.WebControls/MenuItemCollection.cs
@@ -984,36 +983,36 @@ System.Web.UI.WebControls/MenuItemStyle.cs
 System.Web.UI.WebControls/MenuItemTemplateContainer.cs
 System.Web.UI.WebControls/MenuTableRenderer.cs
 System.Web.UI.WebControls/MonthChangedEventArgs.cs
-System.Web.UI.WebControls/MonthChangedEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/MonthChangedEventHandler.cs
 System.Web.UI.WebControls/MultiView.cs
 System.Web.UI.WebControls/MultiViewControlBuilder.cs
-System.Web.UI.WebControls/NextPrevFormat.cs
+../../../external/referencesource/System.Web/UI/WebControls/NextPrevFormat.cs
 System.Web.UI.WebControls/ObjectDataSource.cs
 System.Web.UI.WebControls/ObjectDataSourceDisposingEventArgs.cs
-System.Web.UI.WebControls/ObjectDataSourceDisposingEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ObjectDataSourceDisposingEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceEventArgs.cs
 System.Web.UI.WebControls/ObjectDataSourceEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceFilteringEventArgs.cs
-System.Web.UI.WebControls/ObjectDataSourceFilteringEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ObjectDataSourceFilteringEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceMethodEventArgs.cs
-System.Web.UI.WebControls/ObjectDataSourceMethodEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ObjectDataSourceMethodEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceSelectingEventArgs.cs
-System.Web.UI.WebControls/ObjectDataSourceSelectingEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ObjectDataSourceSelectingEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceStatusEventArgs.cs
-System.Web.UI.WebControls/ObjectDataSourceStatusEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ObjectDataSourceStatusEventHandler.cs
 System.Web.UI.WebControls/ObjectDataSourceView.cs
-System.Web.UI.WebControls/Orientation.cs
+../../../external/referencesource/System.Web/UI/WebControls/Orientation.cs
 System.Web.UI.WebControls/PagedDataSource.cs
-System.Web.UI.WebControls/PagerButtons.cs
-System.Web.UI.WebControls/PagerMode.cs
-System.Web.UI.WebControls/PagerPosition.cs
+../../../external/referencesource/System.Web/UI/WebControls/PagerButtons.cs
+../../../external/referencesource/System.Web/UI/WebControls/PagerMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/PagerPosition.cs
 System.Web.UI.WebControls/PagerSettings.cs
 System.Web.UI.WebControls/Panel.cs
 System.Web.UI.WebControls/PanelStyle.cs
 System.Web.UI.WebControls/ParameterCollection.cs
 System.Web.UI.WebControls/Parameter.cs
 System.Web.UI.WebControls/PasswordRecovery.cs
-System.Web.UI.WebControls/PathDirection.cs
+../../../external/referencesource/System.Web/UI/WebControls/PathDirection.cs
 System.Web.UI.WebControls/PlaceHolderControlBuilder.cs
 System.Web.UI.WebControls/PlaceHolder.cs
 System.Web.UI.WebControls/PolygonHotSpot.cs
@@ -1024,55 +1023,55 @@ System.Web.UI.WebControls/RadioButtonList.cs
 System.Web.UI.WebControls/RangeValidator.cs
 System.Web.UI.WebControls/RectangleHotSpot.cs
 System.Web.UI.WebControls/RegularExpressionValidator.cs
-System.Web.UI.WebControls/RepeatDirection.cs
+../../../external/referencesource/System.Web/UI/WebControls/RepeatDirection.cs
 System.Web.UI.WebControls/RepeaterCommandEventArgs.cs
-System.Web.UI.WebControls/RepeaterCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/RepeaterCommandEventHandler.cs
 System.Web.UI.WebControls/Repeater.cs
 System.Web.UI.WebControls/RepeaterItemCollection.cs
 System.Web.UI.WebControls/RepeaterItem.cs
 System.Web.UI.WebControls/RepeaterItemEventArgs.cs
-System.Web.UI.WebControls/RepeaterItemEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/RepeaterItemEventHandler.cs
 System.Web.UI.WebControls/RepeatInfo.cs
-System.Web.UI.WebControls/RepeatLayout.cs
+../../../external/referencesource/System.Web/UI/WebControls/RepeatLayout.cs
 System.Web.UI.WebControls/RequiredFieldValidator.cs
 System.Web.UI.WebControls/RoleGroup.cs
 System.Web.UI.WebControls/RoleGroupCollection.cs
 System.Web.UI.WebControls/ScrollBars.cs
 System.Web.UI.WebControls/SelectedDatesCollection.cs
 System.Web.UI.WebControls/SendMailErrorEventArgs.cs
-System.Web.UI.WebControls/SendMailErrorEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SendMailErrorEventHandler.cs
 System.Web.UI.WebControls/ServerValidateEventArgs.cs
-System.Web.UI.WebControls/ServerValidateEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/ServerValidateEventHandler.cs
 System.Web.UI.WebControls/SessionParameter.cs
 System.Web.UI.WebControls/SiteMapDataSource.cs
 System.Web.UI.WebControls/SiteMapDataSourceView.cs
 System.Web.UI.WebControls/SiteMapHierarchicalDataSourceView.cs
 System.Web.UI.WebControls/SiteMapNodeItem.cs
 System.Web.UI.WebControls/SiteMapNodeItemEventArgs.cs
-System.Web.UI.WebControls/SiteMapNodeItemEventHandler.cs
-System.Web.UI.WebControls/SiteMapNodeItemType.cs
+../../../external/referencesource/System.Web/UI/WebControls/SiteMapNodeItemEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SiteMapNodeItemType.cs
 System.Web.UI.WebControls/SiteMapPath.cs
 System.Web.UI.WebControls/SiteMapViewType.cs
-System.Web.UI.WebControls/SortDirection.cs
+../../../external/referencesource/System.Web/UI/WebControls/SortDirection.cs
 System.Web.UI.WebControls/StyleCollection.cs
 System.Web.UI.WebControls/SqlDataSourceCommandEventArgs.cs
-System.Web.UI.WebControls/SqlDataSourceCommandEventHandler.cs
-System.Web.UI.WebControls/SqlDataSourceCommandType.cs
-System.Web.UI.WebControls/SqlDataSourceFilteringEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceCommandEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceCommandType.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceFilteringEventHandler.cs
 System.Web.UI.WebControls/SqlDataSourceFilteringEventArgs.cs
 System.Web.UI.WebControls/SqlDataSource.cs
-System.Web.UI.WebControls/SqlDataSourceMode.cs
-System.Web.UI.WebControls/SqlDataSourceSelectingEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceSelectingEventHandler.cs
 System.Web.UI.WebControls/SqlDataSourceSelectingEventArgs.cs
 System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs
-System.Web.UI.WebControls/SqlDataSourceStatusEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/SqlDataSourceStatusEventHandler.cs
 System.Web.UI.WebControls/SqlDataSourceView.cs
 System.Web.UI.WebControls/StringArrayConverter.cs
 System.Web.UI.WebControls/Style.cs
 System.Web.UI.WebControls/SubMenuStyleCollection.cs
 System.Web.UI.WebControls/SubMenuStyle.cs
 System.Web.UI.WebControls/Substitution.cs
-System.Web.UI.WebControls/TableCaptionAlign.cs
+../../../external/referencesource/System.Web/UI/WebControls/TableCaptionAlign.cs
 System.Web.UI.WebControls/TableCellCollection.cs
 System.Web.UI.WebControls/TableCellControlBuilder.cs
 System.Web.UI.WebControls/TableCell.cs
@@ -1080,45 +1079,45 @@ System.Web.UI.WebControls/Table.cs
 System.Web.UI.WebControls/TableFooterRow.cs
 System.Web.UI.WebControls/TableHeaderCell.cs
 System.Web.UI.WebControls/TableHeaderRow.cs
-System.Web.UI.WebControls/TableHeaderScope.cs
+../../../external/referencesource/System.Web/UI/WebControls/TableHeaderScope.cs
 System.Web.UI.WebControls/TableItemStyle.cs
 System.Web.UI.WebControls/TableRowCollection.cs
 System.Web.UI.WebControls/TableRow.cs
-System.Web.UI.WebControls/TableRowSection.cs
+../../../external/referencesource/System.Web/UI/WebControls/TableRowSection.cs
 System.Web.UI.WebControls/TableSectionStyle.cs
 System.Web.UI.WebControls/TableStyle.cs
 System.Web.UI.WebControls/TargetConverter.cs
 System.Web.UI.WebControls/TemplateColumn.cs
 System.Web.UI.WebControls/TemplatedWizardStep.cs
 System.Web.UI.WebControls/TemplateField.cs
-System.Web.UI.WebControls/TextAlign.cs
+../../../external/referencesource/System.Web/UI/WebControls/TextAlign.cs
 System.Web.UI.WebControls/TextBoxControlBuilder.cs
 System.Web.UI.WebControls/TextBox.cs
-System.Web.UI.WebControls/TextBoxMode.cs
-System.Web.UI.WebControls/TitleFormat.cs
+../../../external/referencesource/System.Web/UI/WebControls/TextBoxMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/TitleFormat.cs
 System.Web.UI.WebControls/TreeNodeBindingCollection.cs
 System.Web.UI.WebControls/TreeNodeBinding.cs
 System.Web.UI.WebControls/TreeNodeCollection.cs
 System.Web.UI.WebControls/TreeNode.cs
 System.Web.UI.WebControls/TreeNodeEventArgs.cs
-System.Web.UI.WebControls/TreeNodeEventHandler.cs
-System.Web.UI.WebControls/TreeNodeSelectAction.cs
+../../../external/referencesource/System.Web/UI/WebControls/TreeNodeEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/TreeNodeSelectAction.cs
 System.Web.UI.WebControls/TreeNodeStyleCollection.cs
 System.Web.UI.WebControls/TreeNodeStyle.cs
 System.Web.UI.WebControls/TreeNodeTypes.cs
 System.Web.UI.WebControls/TreeView.cs
-System.Web.UI.WebControls/TreeViewImageSet.cs
+../../../external/referencesource/System.Web/UI/WebControls/TreeViewImageSet.cs
 System.Web.UI.WebControls/UnitConverter.cs
 System.Web.UI.WebControls/Unit.cs
-System.Web.UI.WebControls/UnitType.cs
+../../../external/referencesource/System.Web/UI/WebControls/UnitType.cs
 System.Web.UI.WebControls/ValidatedControlConverter.cs
-System.Web.UI.WebControls/ValidationCompareOperator.cs
-System.Web.UI.WebControls/ValidationDataType.cs
+../../../external/referencesource/System.Web/UI/WebControls/ValidationCompareOperator.cs
+../../../external/referencesource/System.Web/UI/WebControls/ValidationDataType.cs
 System.Web.UI.WebControls/ValidationSummary.cs
-System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs
-System.Web.UI.WebControls/ValidatorDisplay.cs
+../../../external/referencesource/System.Web/UI/WebControls/ValidationSummaryDisplayMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/ValidatorDisplay.cs
 System.Web.UI.WebControls/VerticalAlignConverter.cs
-System.Web.UI.WebControls/VerticalAlign.cs
+../../../external/referencesource/System.Web/UI/WebControls/VerticalAlign.cs
 System.Web.UI.WebControls/ViewCollection.cs
 System.Web.UI.WebControls/View.cs
 System.Web.UI.WebControls/WebColorConverter.cs
@@ -1135,35 +1134,35 @@ System.Web.UI.WebControls.WebParts/IPersonalizable.cs
 System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs
 System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs
 System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs
-System.Web.UI.WebControls.WebParts/IWebActionable.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebActionable.cs
 System.Web.UI.WebControls.WebParts/IWebEditable.cs
 System.Web.UI.WebControls.WebParts/IWebPart.cs
 System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs
-System.Web.UI.WebControls.WebParts/IWebPartField.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPartField.cs
 System.Web.UI.WebControls.WebParts/IWebPartParameters.cs
-System.Web.UI.WebControls.WebParts/IWebPartRow.cs
-System.Web.UI.WebControls.WebParts/IWebPartTable.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPartRow.cs
+../../../external/referencesource/System.Web/UI/WebParts/IWebPartTable.cs
 System.Web.UI.WebControls.WebParts/Part.cs
-System.Web.UI.WebControls.WebParts/PartChromeState.cs
-System.Web.UI.WebControls.WebParts/PartChromeType.cs
+../../../external/referencesource/System.Web/UI/WebParts/PartChromeState.cs
+../../../external/referencesource/System.Web/UI/WebParts/PartChromeType.cs
 System.Web.UI.WebControls.WebParts/PersonalizableAttribute.cs
-System.Web.UI.WebControls.WebParts/PersonalizationScope.cs
+../../../external/referencesource/System.Web/UI/WebParts/PersonalizationScope.cs
 System.Web.UI.WebControls.WebParts/ProviderConnectionPoint.cs
 System.Web.UI.WebControls.WebParts/TypeCollection.cs
 System.Web.UI.WebControls.WebParts/WebPart.cs
 System.Web.UI.WebControls.WebParts/WebPartAuthorizationEventArgs.cs
-System.Web.UI.WebControls.WebParts/WebPartAuthorizationEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartAuthorizationEventHandler.cs
 System.Web.UI.WebControls.WebParts/WebPartCancelEventArgs.cs
-System.Web.UI.WebControls.WebParts/WebPartCancelEventHandler.cs
-System.Web.UI.WebControls.WebParts/WebPartEventArgs.cs
-System.Web.UI.WebControls.WebParts/WebPartEventHandler.cs
-System.Web.UI.WebControls.WebParts/WebPartExportMode.cs
-System.Web.UI.WebControls.WebParts/WebPartHelpMode.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartCancelEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartEventArgs.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartExportMode.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartHelpMode.cs
 System.Web.UI.WebControls.WebParts/WebPartPageMenuMode.cs
 System.Web.UI.WebControls.WebParts/WebPartVerbCollection.cs
 System.Web.UI.WebControls.WebParts/WebPartVerb.cs
 System.Web.UI.WebControls.WebParts/WebPartVerbsEventArgs.cs
-System.Web.UI.WebControls.WebParts/WebPartVerbsEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebParts/WebPartVerbsEventHandler.cs
 System.Web.UI.WebControls/Wizard.cs
 System.Web.UI.WebControls/WizardNavigationEventArgs.cs
 System.Web.UI.WebControls/WizardNavigationEventHandler.cs
@@ -1228,44 +1227,46 @@ System.Web.Caching/IOutputCacheEntry.cs
 System.Web.Caching/MemoryResponseElement.cs
 System.Web.Caching/OutputCache.cs
 System.Web.Caching/OutputCacheProviderCollection.cs
-System.Web.Caching/ResponseElement.cs
+../../../external/referencesource/System.Web/Cache/ResponseElement.cs
 System.Web.Caching/SubstitutionResponseElement.cs
 System.Web.Configuration_2.0/VersionConverter.cs
-System.Web.Configuration_2.0/MachineKeyCompatibilityMode.cs
+../../../external/referencesource/System.Web/Configuration/MachineKeyCompatibilityMode.cs
 System.Web.Configuration_2.0/HttpCapabilitiesProvider.cs
 System.Web.Configuration_2.0/HttpCapabilitiesDefaultProvider.cs
-System.Web.Compilation/FolderLevelBuildProviderAppliesTo.cs
+../../../external/referencesource/System.Web/Compilation/FolderLevelBuildProviderAppliesTo.cs
 System.Web.Compilation/FolderLevelBuildProviderAppliesToAttribute.cs
 System.Web.Compilation/RouteUrlExpressionBuilder.cs
 System.Web.Compilation/RouteValueExpressionBuilder.cs
 System.Web.Security/MachineKey.cs
 System.Web.Security/MachineKeyProtection.cs
-System.Web.SessionState_2.0/SessionStateBehavior.cs
+../../../external/referencesource/System.Web/State/SessionStateBehavior.cs
 System.Web.Routing/PageRouteHandler.cs
-System.Web.UI/ClientIDMode.cs
+../../../external/referencesource/System.Web/UI/ClientIDMode.cs
 System.Web.UI/DataKeyPropertyAttribute.cs
 System.Web.UI/FileLevelMasterPageControlBuilder.cs
 System.Web.UI/IDataKeysControl.cs
-System.Web.UI/ViewStateMode.cs
+../../../external/referencesource/System.Web/UI/ViewStateMode.cs
 System.Web.UI.WebControls/IDataBoundControl.cs
-System.Web.UI.WebControls/IDataBoundItemControl.cs
+../../../external/referencesource/System.Web/UI/WebControls/CallingDataMethodsEventHandler.cs
+../../../external/referencesource/System.Web/UI/WebControls/CallingDataMethodsEventArgs.cs
+../../../external/referencesource/System.Web/UI/WebControls/IDataBoundItemControl.cs
 System.Web.UI.WebControls/IDataBoundListControl.cs
-System.Web.UI.WebControls/IFieldControl.cs
+../../../external/referencesource/System.Web/UI/WebControls/IFieldControl.cs
 System.Web.UI.WebControls/IRenderOuterTable.cs
 System.Web.UI.WebControls/MenuListRenderer.cs
-System.Web.UI.WebControls/MenuRenderingMode.cs
+../../../external/referencesource/System.Web/UI/WebControls/MenuRenderingMode.cs
 System.Web.UI.WebControls/NamedCssStyleCollection.cs
 System.Web.UI.WebControls/RouteParameter.cs
 System.Web.UI.WebControls/StyleBlock.cs
 System.Web.UI.WebControls/WizardLayoutContainer.cs
 System.Web.UI.WebControls/WizardLayoutNavigationContainer.cs
 System.Web.Util/SimpleWebObjectFactory.cs
-System.Web.Util/RequestValidationSource.cs
+../../../external/referencesource/System.Web/Util/RequestValidationSource.cs
 System.Web.Util/RequestValidator.cs
 
 System.Web.Routing/HttpMethodConstraint.cs
-System.Web.Routing/IRouteConstraint.cs
-System.Web.Routing/IRouteHandler.cs
+../../../external/referencesource/System.Web/Routing/IRouteConstraint.cs
+../../../external/referencesource/System.Web/Routing/IRouteHandler.cs
 System.Web.Routing/PatternParser.cs
 System.Web.Routing/PatternToken.cs
 System.Web.Routing/PatternTokenType.cs
@@ -1274,7 +1275,7 @@ System.Web.Routing/Route.cs
 ../../../external/referencesource/System.Web/Routing/RouteBase.cs
 System.Web.Routing/RouteCollection.cs
 System.Web.Routing/RouteData.cs
-System.Web.Routing/RouteDirection.cs
+../../../external/referencesource/System.Web/Routing/RouteDirection.cs
 System.Web.Routing/RouteTable.cs
 System.Web.Routing/RouteValueDictionary.cs
 System.Web.Routing/RouteValueDictionaryExtensions.cs
@@ -1284,11 +1285,11 @@ System.Web.Routing/UrlRoutingModule.cs
 System.Web.Routing/VirtualPathData.cs
 
 ../../../external/referencesource/System.Web/Abstractions/HttpApplicationStateBase.cs
-System.Web/HttpApplicationStateWrapper.cs
+../../../external/referencesource/System.Web/Abstractions/HttpApplicationStateWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpBrowserCapabilitiesBase.cs
-System.Web/HttpBrowserCapabilitiesWrapper.cs
+../../../external/referencesource/System.Web/Abstractions/HttpBrowserCapabilitiesWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpCachePolicyBase.cs
-System.Web/HttpCachePolicyWrapper.cs
+../../../external/referencesource/System.Web/Abstractions/HttpCachePolicyWrapper.cs
 System.Web/HttpContextBase.cs
 System.Web/HttpContextWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpFileCollectionBase.cs
@@ -1302,7 +1303,7 @@ System.Web/HttpResponseWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpServerUtilityBase.cs
 System.Web/HttpServerUtilityWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpSessionStateBase.cs
-System.Web/HttpSessionStateWrapper.cs
+../../../external/referencesource/System.Web/Abstractions/HttpSessionStateWrapper.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpStaticObjectsCollectionBase.cs
 ../../../external/referencesource/System.Web/Abstractions/HttpStaticObjectsCollectionWrapper.cs
 
@@ -1311,7 +1312,7 @@ System.Collections.Concurrent/SplitOrderedList.cs
 System.Web/EventHandlerTaskAsyncHelper.cs
 System.Web/HttpTaskAsyncHandler.cs
 System.Web/MimeMapping.cs
-System.Web/ReadEntityBodyMode.cs
+../../../external/referencesource/System.Web/ReadEntityBodyMode.cs
 System.Web/UnvalidatedRequestValues.cs
 ../../../external/referencesource/System.Web/UnvalidatedRequestValuesWrapper.cs
 ../../../external/referencesource/System.Web/UnvalidatedRequestValuesBase.cs
@@ -1322,6 +1323,7 @@ System.Web/DynamicModuleManager.cs
 
 ../../../external/referencesource/System.Web/ISubscriptionToken.cs
 
+
 ../../../external/referencesource/System.Web/ModelBinding/IModelNameProvider.cs
 ../../../external/referencesource/System.Web/ModelBinding/BindingBehaviorAttribute.cs
 ../../../external/referencesource/System.Web/ModelBinding/BindingBehavior.cs
@@ -1329,12 +1331,36 @@ System.Web/DynamicModuleManager.cs
 ../../../external/referencesource/System.Web/ModelBinding/BindRequiredAttribute.cs
 ../../../external/referencesource/System.Web/ModelBinding/ExtensibleModelBinderAttribute.cs
 ../../../external/referencesource/System.Web/ModelBinding/ModelBinderProviderOptionsAttribute.cs
+../../../external/referencesource/System.Web/ModelBinding/ModelErrorCollection.cs
+../../../external/referencesource/System.Web/ModelBinding/ModelError.cs
+
 
 ../../../external/referencesource/System.Web/Security/AntiXss/CodeCharts.cs
 
 ../../../external/referencesource/System.Web/UI/WebParts/WebBrowsableAttribute.cs
 ../../../external/referencesource/System.Web/UI/WebParts/WebDescriptionAttribute.cs
 ../../../external/referencesource/System.Web/UI/WebParts/WebDisplayNameAttribute.cs
+../../../external/referencesource/System.Web/UI/WebParts/TableCallback.cs
+../../../external/referencesource/System.Web/UI/WebParts/RowCallback.cs
+../../../external/referencesource/System.Web/UI/WebParts/FieldCallback.cs
+
+../../../external/referencesource/System.Web/UI/UnobtrusiveValidationMode.cs
+../../../external/referencesource/System.Web/UI/ValidateRequestMode.cs
+
+../../../external/referencesource/System.Web/Configuration/AsyncPreloadModeFlags.cs
+../../../external/referencesource/System.Web/Configuration/BrowserCapsElementType.cs
+../../../external/referencesource/System.Web/Configuration/BrowserTree.cs
+../../../external/referencesource/System.Web/Configuration/CustomWebEventKey.cs
+../../../external/referencesource/System.Web/Configuration/DelayedRegex.cs
+../../../external/referencesource/System.Web/Configuration/ProfileGuidedOptimizationsFlags.cs
+
+../../../external/referencesource/System.Web/Configuration/RegexMatchTimeoutValidator.cs
+../../../external/referencesource/System.Web/Configuration/RegexMatchTimeoutValidatorAttribute.cs
+../../../external/referencesource/System.Web/Configuration/RpcAuthent.cs
+../../../external/referencesource/System.Web/Configuration/RpcImpers.cs
+../../../external/referencesource/System.Web/Configuration/RpcLevel.cs
+../../../external/referencesource/System.Web/Configuration/TicketCompatibilityMode.cs
+../../../external/referencesource/System.Web/Configuration/WebLevel.cs
 
 ../../../external/referencesource/System.Web/WebSockets/AspNetWebSocketOptions.cs
 ../../../external/referencesource/System.Web/WebSockets/SubprotocolUtil.cs
diff --git a/mcs/class/System.Web/System.Web/HttpApplicationStateWrapper.cs b/mcs/class/System.Web/System.Web/HttpApplicationStateWrapper.cs
deleted file mode 100644 (file)
index d0299ef..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// HttpApplicationStateWrapper.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.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public class HttpApplicationStateWrapper : HttpApplicationStateBase
-       {
-               HttpApplicationState w;
-
-               public HttpApplicationStateWrapper (HttpApplicationState httpApplicationState)
-               {
-                       if (httpApplicationState == null)
-                               throw new ArgumentNullException ("httpApplicationState");
-                       w = httpApplicationState;
-               }
-
-               public override string [] AllKeys {
-                       get { return w.AllKeys; }
-               }
-
-               public override HttpApplicationStateBase Contents {
-                       get { return new HttpApplicationStateWrapper (w.Contents); }
-               }
-
-               public override int Count {
-                       get { return w.Count; }
-               }
-
-               public override bool IsSynchronized {
-                       get { return ((ICollection) this).IsSynchronized; }
-               }
-
-               public override object this [int index] {
-                       get { return Get (index); }
-               }
-
-               public override object this [string name] {
-                       get { return Get (name); }
-                       set { Set (name, value); }
-               }
-
-               public override NameObjectCollectionBase.KeysCollection Keys {
-                       get { return w.Keys; }
-               }
-
-               public override HttpStaticObjectsCollectionBase StaticObjects {
-                       get { return new HttpStaticObjectsCollectionWrapper (w.StaticObjects); }
-               }
-
-               public override object SyncRoot {
-                       get { return ((ICollection) this).SyncRoot; }
-               }
-
-               public override void Add (string name, object value)
-               {
-                       w.Add (name, value);
-               }
-
-               public override void Clear ()
-               {
-                       w.Clear ();
-               }
-
-               public override void CopyTo (Array array, int index)
-               {
-                       ((ICollection) this).CopyTo (array, index);
-               }
-
-               public override object Get (int index)
-               {
-                       return w.Get (index);
-               }
-
-               public override object Get (string name)
-               {
-                       return w.Get (name);
-               }
-
-               public override IEnumerator GetEnumerator ()
-               {
-                       return w.GetEnumerator ();
-               }
-
-               public override string GetKey (int index)
-               {
-                       return w.GetKey (index);
-               }
-
-               [MonoTODO]
-               public override void GetObjectData (SerializationInfo info, StreamingContext context)
-               {
-                       w.GetObjectData (info, context);
-
-                       throw new NotImplementedException ();
-               }
-
-               public override void Lock ()
-               {
-                       w.Lock ();
-               }
-
-               public override void OnDeserialization (object sender)
-               {
-                       w.OnDeserialization (sender);
-               }
-
-               public override void Remove (string name)
-               {
-                       w.Remove (name);
-               }
-
-               public override void RemoveAll ()
-               {
-                       w.RemoveAll ();
-               }
-
-               public override void RemoveAt (int index)
-               {
-                       w.RemoveAt (index);
-               }
-
-               public override void Set (string name, object value)
-               {
-                       w.Set (name, value);
-               }
-
-               public override void UnLock ()
-               {
-                       w.UnLock ();
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/HttpBrowserCapabilitiesWrapper.cs b/mcs/class/System.Web/System.Web/HttpBrowserCapabilitiesWrapper.cs
deleted file mode 100644 (file)
index b5cc963..0000000
+++ /dev/null
@@ -1,548 +0,0 @@
-//
-// HttpBrowserCapabilitiesWrapper.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.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.UI;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public class HttpBrowserCapabilitiesWrapper : HttpBrowserCapabilitiesBase
-       {
-               HttpBrowserCapabilities w;
-
-               public HttpBrowserCapabilitiesWrapper (HttpBrowserCapabilities httpBrowserCapabilities)
-               {
-                       if (httpBrowserCapabilities == null)
-                               throw new ArgumentNullException ("httpBrowserCapabilities");
-                       w = httpBrowserCapabilities;
-               }
-
-
-               public override bool ActiveXControls {
-                       get { return w.ActiveXControls; }
-               }
-
-               public override IDictionary Adapters {
-                       get { return w.Adapters; }
-               }
-
-               public override bool AOL {
-                       get { return w.AOL; }
-               }
-
-               public override bool BackgroundSounds {
-                       get { return w.BackgroundSounds; }
-               }
-
-               public override bool Beta {
-                       get { return w.Beta; }
-               }
-
-               public override string Browser {
-                       get { return w.Browser; }
-               }
-
-               public override ArrayList Browsers {
-                       get { return w.Browsers; }
-               }
-
-               public override bool CanCombineFormsInDeck {
-                       get { return w.CanCombineFormsInDeck; }
-               }
-
-               public override bool CanInitiateVoiceCall {
-                       get { return w.CanInitiateVoiceCall; }
-               }
-
-               public override bool CanRenderAfterInputOrSelectElement {
-                       get { return w.CanRenderAfterInputOrSelectElement; }
-               }
-
-               public override bool CanRenderEmptySelects {
-                       get { return w.CanRenderEmptySelects; }
-               }
-
-               public override bool CanRenderInputAndSelectElementsTogether {
-                       get { return w.CanRenderInputAndSelectElementsTogether; }
-               }
-
-               public override bool CanRenderMixedSelects {
-                       get { return w.CanRenderMixedSelects; }
-               }
-
-               public override bool CanRenderOneventAndPrevElementsTogether {
-                       get { return w.CanRenderOneventAndPrevElementsTogether; }
-               }
-
-               public override bool CanRenderPostBackCards {
-                       get { return w.CanRenderPostBackCards; }
-               }
-
-               public override bool CanRenderSetvarZeroWithMultiSelectionList {
-                       get { return w.CanRenderSetvarZeroWithMultiSelectionList; }
-               }
-
-               public override bool CanSendMail {
-                       get { return w.CanSendMail; }
-               }
-
-               public override IDictionary Capabilities {
-                       get { return w.Capabilities; } set { w.Capabilities = value; }
-               }
-
-               public override bool CDF {
-                       get { return w.CDF; }
-               }
-
-               public override Version ClrVersion {
-                       get { return w.ClrVersion; }
-               }
-
-               public override bool Cookies {
-                       get { return w.Cookies; }
-               }
-
-               public override bool Crawler {
-                       get { return w.Crawler; }
-               }
-
-               public override int DefaultSubmitButtonLimit {
-                       get { return w.DefaultSubmitButtonLimit; }
-               }
-
-               public override Version EcmaScriptVersion {
-                       get { return w.EcmaScriptVersion; }
-               }
-
-               public override bool Frames {
-                       get { return w.Frames; }
-               }
-
-               public override int GatewayMajorVersion {
-                       get { return w.GatewayMajorVersion; }
-               }
-
-               public override double GatewayMinorVersion {
-                       get { return w.GatewayMinorVersion; }
-               }
-
-               public override string GatewayVersion {
-                       get { return w.GatewayVersion; }
-               }
-
-               public override bool HasBackButton {
-                       get { return w.HasBackButton; }
-               }
-
-               public override bool HidesRightAlignedMultiselectScrollbars {
-                       get { return w.HidesRightAlignedMultiselectScrollbars; }
-               }
-
-               public override string HtmlTextWriter {
-                       get { return w.HtmlTextWriter; } set { w.HtmlTextWriter = value; }
-               }
-
-               public override string Id {
-                       get { return w.Id; }
-               }
-
-               public override string InputType {
-                       get { return w.InputType; }
-               }
-
-               public override bool IsColor {
-                       get { return w.IsColor; }
-               }
-
-               public override bool IsMobileDevice {
-                       get { return w.IsMobileDevice; }
-               }
-
-               public override string this [string key] {
-                       get { throw new NotImplementedException (); }
-               }
-
-               public override bool JavaApplets {
-                       get { return w.JavaApplets; }
-               }
-
-               public override Version JScriptVersion {
-                       get { return w.JScriptVersion; }
-               }
-
-               public override int MajorVersion {
-                       get { return w.MajorVersion; }
-               }
-
-               public override int MaximumHrefLength {
-                       get { return w.MaximumHrefLength; }
-               }
-
-               public override int MaximumRenderedPageSize {
-                       get { return w.MaximumRenderedPageSize; }
-               }
-
-               public override int MaximumSoftkeyLabelLength {
-                       get { return w.MaximumSoftkeyLabelLength; }
-               }
-
-               public override double MinorVersion {
-                       get { return w.MinorVersion; }
-               }
-
-               public override string MinorVersionString {
-                       get { return w.MinorVersionString; }
-               }
-
-               public override string MobileDeviceManufacturer {
-                       get { return w.MobileDeviceManufacturer; }
-               }
-
-               public override string MobileDeviceModel {
-                       get { return w.MobileDeviceModel; }
-               }
-
-               public override Version MSDomVersion {
-                       get { return w.MSDomVersion; }
-               }
-
-               public override int NumberOfSoftkeys {
-                       get { return w.NumberOfSoftkeys; }
-               }
-
-               public override string Platform {
-                       get { return w.Platform; }
-               }
-
-               public override string PreferredImageMime {
-                       get { return w.PreferredImageMime; }
-               }
-
-               public override string PreferredRenderingMime {
-                       get { return w.PreferredRenderingMime; }
-               }
-
-               public override string PreferredRenderingType {
-                       get { return w.PreferredRenderingType; }
-               }
-
-               public override string PreferredRequestEncoding {
-                       get { return w.PreferredRequestEncoding; }
-               }
-
-               public override string PreferredResponseEncoding {
-                       get { return w.PreferredResponseEncoding; }
-               }
-
-               public override bool RendersBreakBeforeWmlSelectAndInput {
-                       get { return w.RendersBreakBeforeWmlSelectAndInput; }
-               }
-
-               public override bool RendersBreaksAfterHtmlLists {
-                       get { return w.RendersBreaksAfterHtmlLists; }
-               }
-
-               public override bool RendersBreaksAfterWmlAnchor {
-                       get { return w.RendersBreaksAfterWmlAnchor; }
-               }
-
-               public override bool RendersBreaksAfterWmlInput {
-                       get { return w.RendersBreaksAfterWmlInput; }
-               }
-
-               public override bool RendersWmlDoAcceptsInline {
-                       get { return w.RendersWmlDoAcceptsInline; }
-               }
-
-               public override bool RendersWmlSelectsAsMenuCards {
-                       get { return w.RendersWmlSelectsAsMenuCards; }
-               }
-
-               public override string RequiredMetaTagNameValue {
-                       get { return w.RequiredMetaTagNameValue; }
-               }
-
-               public override bool RequiresAttributeColonSubstitution {
-                       get { return w.RequiresAttributeColonSubstitution; }
-               }
-
-               public override bool RequiresContentTypeMetaTag {
-                       get { return w.RequiresContentTypeMetaTag; }
-               }
-
-               public override bool RequiresControlStateInSession {
-                       get { return w.RequiresControlStateInSession; }
-               }
-
-               public override bool RequiresDBCSCharacter {
-                       get { return w.RequiresDBCSCharacter; }
-               }
-
-               public override bool RequiresHtmlAdaptiveErrorReporting {
-                       get { return w.RequiresHtmlAdaptiveErrorReporting; }
-               }
-
-               public override bool RequiresLeadingPageBreak {
-                       get { return w.RequiresLeadingPageBreak; }
-               }
-
-               public override bool RequiresNoBreakInFormatting {
-                       get { return w.RequiresNoBreakInFormatting; }
-               }
-
-               public override bool RequiresOutputOptimization {
-                       get { return w.RequiresOutputOptimization; }
-               }
-
-               public override bool RequiresPhoneNumbersAsPlainText {
-                       get { return w.RequiresPhoneNumbersAsPlainText; }
-               }
-
-               public override bool RequiresSpecialViewStateEncoding {
-                       get { return w.RequiresSpecialViewStateEncoding; }
-               }
-
-               public override bool RequiresUniqueFilePathSuffix {
-                       get { return w.RequiresUniqueFilePathSuffix; }
-               }
-
-               public override bool RequiresUniqueHtmlCheckboxNames {
-                       get { return w.RequiresUniqueHtmlCheckboxNames; }
-               }
-
-               public override bool RequiresUniqueHtmlInputNames {
-                       get { return w.RequiresUniqueHtmlInputNames; }
-               }
-
-               public override bool RequiresUrlEncodedPostfieldValues {
-                       get { return w.RequiresUrlEncodedPostfieldValues; }
-               }
-
-               public override int ScreenBitDepth {
-                       get { return w.ScreenBitDepth; }
-               }
-
-               public override int ScreenCharactersHeight {
-                       get { return w.ScreenCharactersHeight; }
-               }
-
-               public override int ScreenCharactersWidth {
-                       get { return w.ScreenCharactersWidth; }
-               }
-
-               public override int ScreenPixelsHeight {
-                       get { return w.ScreenPixelsHeight; }
-               }
-
-               public override int ScreenPixelsWidth {
-                       get { return w.ScreenPixelsWidth; }
-               }
-
-               public override bool SupportsAccesskeyAttribute {
-                       get { return w.SupportsAccesskeyAttribute; }
-               }
-
-               public override bool SupportsBodyColor {
-                       get { return w.SupportsBodyColor; }
-               }
-
-               public override bool SupportsBold {
-                       get { return w.SupportsBold; }
-               }
-
-               public override bool SupportsCacheControlMetaTag {
-                       get { return w.SupportsCacheControlMetaTag; }
-               }
-
-               public override bool SupportsCallback {
-                       get { return w.SupportsCallback; }
-               }
-
-               public override bool SupportsCss {
-                       get { return w.SupportsCss; }
-               }
-
-               public override bool SupportsDivAlign {
-                       get { return w.SupportsDivAlign; }
-               }
-
-               public override bool SupportsDivNoWrap {
-                       get { return w.SupportsDivNoWrap; }
-               }
-
-               public override bool SupportsEmptyStringInCookieValue {
-                       get { return w.SupportsEmptyStringInCookieValue; }
-               }
-
-               public override bool SupportsFontColor {
-                       get { return w.SupportsFontColor; }
-               }
-
-               public override bool SupportsFontName {
-                       get { return w.SupportsFontName; }
-               }
-
-               public override bool SupportsFontSize {
-                       get { return w.SupportsFontSize; }
-               }
-
-               public override bool SupportsImageSubmit {
-                       get { return w.SupportsImageSubmit; }
-               }
-
-               public override bool SupportsIModeSymbols {
-                       get { return w.SupportsIModeSymbols; }
-               }
-
-               public override bool SupportsInputIStyle {
-                       get { return w.SupportsInputIStyle; }
-               }
-
-               public override bool SupportsInputMode {
-                       get { return w.SupportsInputMode; }
-               }
-
-               public override bool SupportsItalic {
-                       get { return w.SupportsItalic; }
-               }
-
-               public override bool SupportsJPhoneMultiMediaAttributes {
-                       get { return w.SupportsJPhoneMultiMediaAttributes; }
-               }
-
-               public override bool SupportsJPhoneSymbols {
-                       get { return w.SupportsJPhoneSymbols; }
-               }
-
-               public override bool SupportsQueryStringInFormAction {
-                       get { return w.SupportsQueryStringInFormAction; }
-               }
-
-               public override bool SupportsRedirectWithCookie {
-                       get { return w.SupportsRedirectWithCookie; }
-               }
-
-               public override bool SupportsSelectMultiple {
-                       get { return w.SupportsSelectMultiple; }
-               }
-
-               public override bool SupportsUncheck {
-                       get { return w.SupportsUncheck; }
-               }
-
-               public override bool SupportsXmlHttp {
-                       get { return w.SupportsXmlHttp; }
-               }
-
-               public override bool Tables {
-                       get { return w.Tables; }
-               }
-
-               public override Type TagWriter {
-                       get { return w.TagWriter; }
-               }
-
-               public override string Type {
-                       get { return w.Type; }
-               }
-
-               public override bool UseOptimizedCacheKey {
-                       get { return w.UseOptimizedCacheKey; }
-               }
-
-               public override bool VBScript {
-                       get { return w.VBScript; }
-               }
-
-               public override string Version {
-                       get { return w.Version; }
-               }
-
-               public override Version W3CDomVersion {
-                       get { return w.W3CDomVersion; }
-               }
-
-               public override bool Win16 {
-                       get { return w.Win16; }
-               }
-
-               public override bool Win32 {
-                       get { return w.Win32; }
-               }
-
-               public override void AddBrowser (string browserName)
-               {
-                       w.AddBrowser (browserName);
-               }
-
-               [MonoTODO]
-               public override int CompareFilters (string filter1, string filter2)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               [MonoTODO]
-               public override HtmlTextWriter CreateHtmlTextWriter (TextWriter w)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public override void DisableOptimizedCacheKey ()
-               {
-                       w.DisableOptimizedCacheKey ();
-               }
-
-               [MonoTODO]
-               public override bool EvaluateFilter (string filterName)
-               {
-                       throw new NotImplementedException ();
-               }
-
-               public override Version [] GetClrVersions ()
-               {
-                       return w.GetClrVersions ();
-               }
-
-               public override bool IsBrowser (string browserName)
-               {
-                       return w.IsBrowser (browserName);
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/HttpCachePolicyWrapper.cs b/mcs/class/System.Web/System.Web/HttpCachePolicyWrapper.cs
deleted file mode 100644 (file)
index c2fad9d..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-//
-// HttpCachePolicyWrapper.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.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public class HttpCachePolicyWrapper : HttpCachePolicyBase
-       {
-               HttpCachePolicy w;
-
-               public HttpCachePolicyWrapper (HttpCachePolicy httpCachePolicy)
-               {
-                       if (httpCachePolicy == null)
-                               throw new ArgumentNullException ("httpCachePolicy");
-                       w = httpCachePolicy;
-               }
-
-               public override HttpCacheVaryByContentEncodings VaryByContentEncodings {
-                       get { return w.VaryByContentEncodings; }
-               }
-
-               public override HttpCacheVaryByHeaders VaryByHeaders {
-                       get { return w.VaryByHeaders; }
-               }
-
-               public override HttpCacheVaryByParams VaryByParams {
-                       get { return w.VaryByParams; }
-               }
-
-               public override void AddValidationCallback (HttpCacheValidateHandler handler, object data)
-               {
-                       w.AddValidationCallback (handler, data);
-               }
-
-               public override void AppendCacheExtension (string extension)
-               {
-                       w.AppendCacheExtension (extension);
-               }
-
-               public override void SetAllowResponseInBrowserHistory (bool allow)
-               {
-                       w.SetAllowResponseInBrowserHistory (allow);
-               }
-
-               public override void SetCacheability (HttpCacheability cacheability)
-               {
-                       w.SetCacheability (cacheability);
-               }
-
-               public override void SetCacheability (HttpCacheability cacheability, string field)
-               {
-                       w.SetCacheability (cacheability, field);
-               }
-
-               public override void SetVaryByCustom (string custom)
-               {
-                       w.SetVaryByCustom (custom);
-               }
-
-               public override void SetETag (string etag)
-               {
-                       w.SetETag (etag);
-               }
-
-               public override void SetETagFromFileDependencies ()
-               {
-                       w.SetETagFromFileDependencies ();
-               }
-
-               public override void SetExpires (DateTime date)
-               {
-                       w.SetExpires (date);
-               }
-
-               public override void SetLastModified (DateTime date)
-               {
-                       w.SetLastModified (date);
-               }
-
-               public override void SetLastModifiedFromFileDependencies ()
-               {
-                       w.SetLastModifiedFromFileDependencies ();
-               }
-
-               public override void SetMaxAge (TimeSpan delta)
-               {
-                       w.SetMaxAge (delta);
-               }
-
-               public override void SetNoServerCaching ()
-               {
-                       w.SetNoServerCaching ();
-               }
-
-               public override void SetNoStore ()
-               {
-                       w.SetNoStore ();
-               }
-
-               public override void SetNoTransforms ()
-               {
-                       w.SetNoTransforms ();
-               }
-
-               public override void SetOmitVaryStar (bool omit)
-               {
-                       w.SetOmitVaryStar (omit);
-               }
-
-               public override void SetProxyMaxAge (TimeSpan delta)
-               {
-                       w.SetProxyMaxAge (delta);
-               }
-
-               public override void SetRevalidation (HttpCacheRevalidation revalidation)
-               {
-                       w.SetRevalidation (revalidation);
-               }
-
-               public override void SetSlidingExpiration (bool slide)
-               {
-                       w.SetSlidingExpiration (slide);
-               }
-
-               public override void SetValidUntilExpires (bool validUntilExpires)
-               {
-                       w.SetValidUntilExpires (validUntilExpires);
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/HttpSessionStateWrapper.cs b/mcs/class/System.Web/System.Web/HttpSessionStateWrapper.cs
deleted file mode 100644 (file)
index 563eb0b..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// HttpSessionStateWrapper.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.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security.Permissions;
-using System.Security.Principal;
-using System.Web.Caching;
-using System.Web.SessionState;
-
-namespace System.Web
-{
-        [TypeForwardedFrom ("System.Web.Abstractions, Version=3.5.0.0, Culture=Neutral, PublicKeyToken=31bf3856ad364e35")]
-       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public class HttpSessionStateWrapper : HttpSessionStateBase
-       {
-               HttpSessionState w;
-
-               public HttpSessionStateWrapper (HttpSessionState httpSessionState)
-               {
-                       if (httpSessionState == null)
-                               throw new ArgumentNullException ("httpSessionState");
-                       w = httpSessionState;
-               }
-
-               public override int CodePage {
-                       get { return w.CodePage; }
-                       set { w.CodePage = value; }
-               }
-
-               public override HttpSessionStateBase Contents {
-                       get { throw new NotImplementedException (); }
-               }
-
-               [MonoTODO]
-               public override HttpCookieMode CookieMode {
-                       //get { return w.CookieMode; }
-                       get { throw new NotImplementedException (); }
-               }
-
-               public override int Count {
-                       get { return w.Count; }
-               }
-
-               public override bool IsCookieless {
-                       get { return w.IsCookieless; }
-               }
-
-               public override bool IsNewSession {
-                       get { return w.IsNewSession; }
-               }
-
-               public override bool IsReadOnly {
-                       get { return w.IsReadOnly; }
-               }
-
-               public override bool IsSynchronized {
-                       get { return w.IsSynchronized; }
-               }
-
-               public override object this [int index] {
-                       get { return w [index]; }
-                       set { w [index] = value; }
-               }
-
-               public override object this [string name] {
-                       get { return w [name]; }
-                       set { w [name] = value; }
-               }
-
-               public override NameObjectCollectionBase.KeysCollection Keys {
-                       get { return w.Keys; }
-               }
-
-               public override int LCID {
-                       get { return w.LCID; }
-                       set { w.LCID = value; }
-               }
-
-               public override SessionStateMode Mode {
-                       get { return w.Mode; }
-               }
-
-               public override string SessionID {
-                       get { return w.SessionID; }
-               }
-
-               public override HttpStaticObjectsCollectionBase StaticObjects {
-                       get { throw new NotImplementedException (); }
-               }
-
-               public override object SyncRoot {
-                       get { return w.SyncRoot; }
-               }
-
-               public override int Timeout {
-                       get { return w.Timeout; }
-                       set { w.Timeout = value; }
-               }
-
-               public override void Abandon ()
-               {
-                       w.Abandon ();
-               }
-
-               public override void Add (string name, object value)
-               {
-                       w.Add (name, value);
-               }
-
-               public override void Clear ()
-               {
-                       w.Clear ();
-               }
-
-               public override void CopyTo (Array array, int index)
-               {
-                       w.CopyTo (array, index);
-               }
-
-               public override IEnumerator GetEnumerator ()
-               {
-                       return w.GetEnumerator ();
-               }
-
-               public override void Remove (string name)
-               {
-                       w.Remove (name);
-               }
-
-               public override void RemoveAll ()
-               {
-                       w.RemoveAll ();
-               }
-
-               public override void RemoveAt (int index)
-               {
-                       w.RemoveAt (index);
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/ReadEntityBodyMode.cs b/mcs/class/System.Web/System.Web/ReadEntityBodyMode.cs
deleted file mode 100644 (file)
index a97c3cf..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// ReadEntityBodyMode.cs
-//
-// Author: Martin Thwaites (github@my2cents.co.uk)
-//
-// Copyright (C) 2014 Martin Thwaites
-//
-// 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.Web {
-       public enum ReadEntityBodyMode {
-               None,
-               Classic,
-               Bufferless,
-               Buffered,
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/RequestNotification.cs b/mcs/class/System.Web/System.Web/RequestNotification.cs
deleted file mode 100644 (file)
index 793deb1..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// System.Web.RequestNotification
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2007-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.
-//
-namespace System.Web 
-{
-       [FlagsAttribute]
-       public enum RequestNotification
-       {
-               BeginRequest = 0x0001,
-               AuthenticateRequest = 0x0002,
-               AuthorizeRequest = 0x0004,
-               ResolveRequestCache = 0x0008,
-               MapRequestHandler = 0x0010,
-               AcquireRequestState = 0x0020,
-               PreExecuteRequestHandler = 0x0040,
-               ExecuteRequestHandler = 0x0080,
-               ReleaseRequestState = 0x0100,
-               UpdateRequestCache = 0x0200,
-               LogRequest = 0x0400,
-               EndRequest = 0x0800,
-               SendResponse = 0x20000000
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/RequestNotificationStatus.cs b/mcs/class/System.Web/System.Web/RequestNotificationStatus.cs
deleted file mode 100644 (file)
index 177f0c0..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// System.Web.RequestNotificationStatus
-//
-// Authors:
-//   Marek Habersack (mhabersack@novell.com)
-//
-// (C) 2007-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.
-//
-using System;
-using System.Collections.Generic;
-using System.Security.Permissions;
-
-namespace System.Web 
-{
-       public enum RequestNotificationStatus
-       {
-               Continue,
-               Pending,
-               FinishRequest
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/TraceContextEventArgs.cs b/mcs/class/System.Web/System.Web/TraceContextEventArgs.cs
deleted file mode 100644 (file)
index f236fd4..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-// 
-// System.Web.TraceContextEventArgs class
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005-2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Security.Permissions;
-
-namespace System.Web {
-
-       // CAS - no InheritanceDemand here as the class is sealed
-       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
-       public sealed class TraceContextEventArgs : EventArgs {
-
-               ICollection trace_records;
-
-               public TraceContextEventArgs (ICollection records)
-               {
-                       trace_records = records;
-               }
-
-               public ICollection TraceRecords {
-                       get { return trace_records; }
-               }
-       }
-}
diff --git a/mcs/class/System.Web/System.Web/TraceContextEventHandler.cs b/mcs/class/System.Web/System.Web/TraceContextEventHandler.cs
deleted file mode 100644 (file)
index 762aa94..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// 
-// System.Web.TraceContextEventHandler delegate
-//
-// Author:
-//     Sebastien Pouliot  <sebastien@ximian.com>
-//
-// Copyright (C) 2005-2009 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-namespace System.Web 
-{
-       public delegate void TraceContextEventHandler (object sender, TraceContextEventArgs e);
-}
index b0777b560268ec6dbb925063e650ee3dbb95d610..913fb8a57fb721c4148d43e6f575333e943842a6 100644 (file)
@@ -1271,7 +1271,7 @@ namespace System.Windows.Forms {
                        if ((long)nitems > 0) {
                                if (property == (IntPtr)Atom.XA_STRING) {
                                        // Xamarin-5116: PtrToStringAnsi expects to get UTF-8, but we might have
-                                       // Latin-1 instead.
+                                       // Latin-1 instead, in which case it will return null.
                                        var s = Marshal.PtrToStringAnsi (prop);
                                        if (string.IsNullOrEmpty (s)) {
                                                var sb = new StringBuilder ();
@@ -1338,7 +1338,7 @@ namespace System.Windows.Forms {
                                start = pos;
 
                                int length = 0;
-                               while (pos < value.Length) {
+                               while (pos < value.Length && length < 4) {
                                        if (!ValidHexDigit (value [pos]))
                                                break;
                                        length++;
index 71995cc9788b83afa7ebb8fe8b97f7c1eb3e40de..a68a986f9c96259cef2c8c7b8e4423a3fa1c06f5 100644 (file)
@@ -145,7 +145,7 @@ namespace MonoTests.System.Windows.Forms
                                myTrackBar.Height = 250;
                                myTrackBar.Orientation = Orientation.Vertical;
                                Assert.AreEqual(200, myTrackBar.Width, "#SIZE03");
-                               AreEqual(default_height, default_height2, myTrackBar.Height, "#SIZE04");
+                               Assert.AreEqual(250, myTrackBar.Height, "#SIZE04");
                        }
 
                        using (TrackBar myTrackBar = new TrackBar()) {
@@ -163,7 +163,7 @@ namespace MonoTests.System.Windows.Forms
                                myTrackBar.AutoSize = false;
                                myTrackBar.Orientation = Orientation.Vertical;
                                Assert.AreEqual(200, myTrackBar.Width, "#SIZE11");
-                               AreEqual(default_height, default_height2, myTrackBar.Height, "#SIZE12");
+                               Assert.AreEqual(250, myTrackBar.Height, "#SIZE12");
                        }
 
                        using (TrackBar myTrackBar = new TrackBar()) {
@@ -175,7 +175,7 @@ namespace MonoTests.System.Windows.Forms
                                        handle = myTrackBar.Handle;
                                        
                                        AreEqual(default_height, default_height2, myTrackBar.Width, "#SIZE17");
-                                       AreEqual(default_height, default_height2, myTrackBar.Height, "#SIZE18");
+                                       Assert.AreEqual(250, myTrackBar.Height, "#SIZE18");
                                }
                        }
 
@@ -188,7 +188,7 @@ namespace MonoTests.System.Windows.Forms
                                        handle = myTrackBar.Handle;
                                        
                                        AreEqual(default_height, default_height2, myTrackBar.Width, "#SIZE19");
-                                       AreEqual(default_height, default_height2, myTrackBar.Height, "#SIZE20");
+                                       Assert.AreEqual(250, myTrackBar.Height, "#SIZE20");
                                }
                        }
 
@@ -202,7 +202,7 @@ namespace MonoTests.System.Windows.Forms
                                        
                                        myTrackBar.Orientation = Orientation.Horizontal;
                                        
-                                       AreEqual(default_height, default_height2, myTrackBar.Width, "#SIZE23");
+                                       Assert.AreEqual(250, myTrackBar.Width, "#SIZE23");
                                        AreEqual(default_height, default_height2, myTrackBar.Height, "#SIZE24");
                                }
                        }
index 4fcd04293bd595a075e7b956ea5f47ac73e24a19..d66e2d4c3207385c4b9ad88a4c63ee5db50284a1 100644 (file)
@@ -113,6 +113,8 @@ namespace System.Diagnostics
                        if (!is_running)
                                return;
                        elapsed += GetTimestamp () - started;
+                       if (elapsed < 0)
+                               elapsed = 0;
                        is_running = false;
                }
 
index 278e6e3426f83c0cf5c3b9d57cb971aa7a458f9d..4b3f468b091e0a91445b6e5ee363c2df51e07c87 100644 (file)
@@ -58,6 +58,7 @@ using System.Security.Authentication;
 using System.Threading.Tasks;
 
 namespace System.Net.Mail {
+       [Obsolete ("SmtpClient and its network of types are poorly designed, we strongly recommend you use https://github.com/jstedfast/MailKit and https://github.com/jstedfast/MimeKit instead")]
        public class SmtpClient
        : IDisposable
        {
@@ -581,10 +582,13 @@ namespace System.Net.Mail {
                        
                        // FIXME: parse the list of extensions so we don't bother wasting
                        // our time trying commands if they aren't supported.
-                       status = SendCommand ("EHLO " + Dns.GetHostName ());
+                       
+                       // Get the FQDN of the local machine
+                       string fqdn = Dns.GetHostEntry (Dns.GetHostName ()).HostName;
+                       status = SendCommand ("EHLO " + fqdn);
                        
                        if (IsError (status)) {
-                               status = SendCommand ("HELO " + Dns.GetHostName ());
+                               status = SendCommand ("HELO " + fqdn);
                                
                                if (IsError (status))
                                        throw new SmtpException (status.StatusCode, status.Description);
@@ -601,10 +605,10 @@ namespace System.Net.Mail {
                                ResetExtensions();
                                writer = new StreamWriter (stream);
                                reader = new StreamReader (stream);
-                               status = SendCommand ("EHLO " + Dns.GetHostName ());
+                               status = SendCommand ("EHLO " + fqdn);
                        
                                if (IsError (status)) {
-                                       status = SendCommand ("HELO " + Dns.GetHostName ());
+                                       status = SendCommand ("HELO " + fqdn);
                                
                                        if (IsError (status))
                                                throw new SmtpException (status.StatusCode, status.Description);
@@ -742,7 +746,7 @@ namespace System.Net.Mail {
 
                static void SendMailAsyncCompletedHandler (TaskCompletionSource<object> source, AsyncCompletedEventArgs e, SendCompletedEventHandler handler, SmtpClient client)
                {
-                       if ((object) handler != e.UserState)
+                       if (source != e.UserState)
                                return;
 
                        client.SendCompleted -= handler;
index 89fb47563b59af70715583545fe050662c7fea2f..04bf42eb87ba4edc50fdde571452482fe4b81cad 100644 (file)
@@ -257,7 +257,7 @@ namespace System.Net {
                                        if (i == (ips.Length - 1)) {
                                                if (i != 0  && val >= (256 << ((3 - i) * 8)))
                                                        return null;
-                                               else if (val > 0x3fffffffe) // this is the last number that parses correctly with MS
+                                               else if (val > 0xffffffff)
                                                        return null;
                                                i = 3;
                                        } else if (val >= 0x100)
@@ -378,8 +378,47 @@ namespace System.Net {
                                return m_Family;
                        }
                }
-               
-               
+
+#if NET_4_5
+
+               public IPAddress MapToIPv4 ()
+               {
+                       if (AddressFamily == AddressFamily.InterNetwork)
+                               return this;
+                       if (AddressFamily != AddressFamily.InterNetworkV6)
+                               throw new Exception ("Only AddressFamily.InterNetworkV6 can be converted to IPv4");
+
+                       //Test for 0000 0000 0000 0000 0000 FFFF xxxx xxxx
+                       for (int i = 0; i < 5; i++) {
+                               if (m_Numbers [i] != 0x0000)
+                                       throw new Exception ("Address does not have the ::FFFF prefix");
+                       }
+                       if (m_Numbers [5] != 0xFFFF)
+                               throw new Exception ("Address does not have the ::FFFF prefix");
+
+                       //We've got an IPv4 address
+                       byte [] ipv4Bytes = new byte [4];
+                       Buffer.BlockCopy (m_Numbers, 12, ipv4Bytes, 0, 4);
+                       return new IPAddress (ipv4Bytes);
+               }
+
+               public IPAddress MapToIPv6 ()
+               {
+                       if (AddressFamily == AddressFamily.InterNetworkV6)
+                               return this;
+                       if (AddressFamily != AddressFamily.InterNetwork)
+                               throw new Exception ("Only AddressFamily.InterNetworkV4 can be converted to IPv6");
+
+                       byte [] ipv4Bytes = GetAddressBytes ();
+                       byte [] ipv6Bytes = new byte [16] {
+                               0,0, 0,0, 0,0, 0,0, 0,0, 0xFF,0xFF,
+                               ipv4Bytes [0], ipv4Bytes [1], ipv4Bytes [2], ipv4Bytes [3]
+                       };
+                       return new IPAddress (ipv6Bytes);
+               }
+
+#endif
+
                /// <summary>
                ///   Used to tell whether an address is a loopback.
                ///   All IP addresses of the form 127.X.Y.Z, where X, Y, and Z are in 
index 0d1d124835d0abb745e346751e34c6e8dd0b12d2..641b787988ea5e4894c2ee87db5739ea97813fd9 100644 (file)
@@ -389,5 +389,23 @@ namespace MonoTests.System.Net.Mail
                        Assert.AreEqual ("<bar@example.com>", server.rcpt_to);
                }
 
+               [Test]
+               public void Deliver_Async ()
+               {
+                       var server = new SmtpServer ();
+                       var client = new SmtpClient ("localhost", server.EndPoint.Port);
+                       var msg = new MailMessage ("foo@example.com", "bar@example.com", "hello", "howdydoo\r\n");
+
+                       Thread t = new Thread (server.Run);
+                       t.Start ();
+                       var task = client.SendMailAsync (msg);
+                       t.Join ();
+
+                       Assert.AreEqual ("<foo@example.com>", server.mail_from);
+                       Assert.AreEqual ("<bar@example.com>", server.rcpt_to);
+
+                       Assert.IsTrue (task.IsCompleted, "task");
+               }
+
        }
 }
index f8c2f4cb750d69cbda8d81e1312338786dae656f..4f01439cf194f9ac520c8d240c1f675179d6c1f3 100755 (executable)
@@ -9,8 +9,10 @@
 //
 
 using System;
+using System.Linq;
 using System.Collections;
 using System.Threading;
+using System.Text.RegularExpressions;
 using System.Net;
 using System.Net.Sockets;
 using NUnit.Framework;
@@ -3476,7 +3478,65 @@ namespace MonoTests.System.Net.Sockets
                        ss.Close ();
                        s.Close ();
                }
-               
+
+               static bool supportsTcpReuse = false;
+               static bool supportsTcpReuseSet = false;
+
+               static bool SupportsTcpReuse ()
+               {
+                       if (supportsTcpReuseSet)
+                               return supportsTcpReuse;
+
+                       if (Path.DirectorySeparatorChar == '/') {
+                               /*
+                                * On UNIX OS
+                                * Multiple threads listening to the same address and port are not possible
+                                * before linux 3.9 kernel, where the socket option SO_REUSEPORT was introduced.
+                                */
+                               Regex reg = new Regex(@"^#define\s*SO_REUSEPORT");
+                               foreach (string directory in Directory.GetDirectories ("/usr/include")) {
+                                       var f = Directory.GetFiles (directory, "socket.h").SingleOrDefault ();
+                                       if (f != null && File.ReadLines (f).Any (l => reg.Match (l).Success)) {
+                                               supportsTcpReuse = true;
+                                               break;
+                                       }
+                               }
+                       } else {
+                               supportsTcpReuse = true;
+                       }
+
+                       supportsTcpReuseSet = true;
+
+                       return supportsTcpReuse;
+               }
+
+               // Test case for bug #31557
+               [Test]
+               public void TcpDoubleBind ()
+               {
+                       using (Socket s = new Socket (AddressFamily.InterNetwork,
+                                               SocketType.Stream, ProtocolType.Tcp))
+                       using (Socket ss = new Socket (AddressFamily.InterNetwork,
+                                               SocketType.Stream, ProtocolType.Tcp)) {
+                               s.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+
+                               s.Bind (new IPEndPoint (IPAddress.Any, 12345));
+                               s.Listen(1);
+
+                               ss.SetSocketOption (SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+
+                               Exception ex = null;
+                               try {
+                                       ss.Bind (new IPEndPoint (IPAddress.Any, 12345));
+                                       ss.Listen(1);
+                               } catch (SocketException e) {
+                                       ex = e;
+                               }
+
+                               Assert.AreEqual (SupportsTcpReuse (), ex == null);
+                       }
+               }
+
                [Test]
                [Category ("NotOnMac")]
                 public void ConnectedProperty ()
@@ -4267,7 +4327,7 @@ namespace MonoTests.System.Net.Sockets
 
                        Socket listenSocket = new Socket (AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
                        
-                       listenSocket.Bind (new IPEndPoint (IPAddress.Loopback, 8001));
+                       listenSocket.Bind (new IPEndPoint (IPAddress.Loopback, 0));
                        listenSocket.Listen (1);
 
                        listenSocket.BeginAccept (new AsyncCallback (ReceiveCallback), listenSocket);
index 39866f384b6993f4f824505b373a9980f32936c5..db5d86eef2e765c21bb923d81842d834f2ec128c 100644 (file)
@@ -160,7 +160,6 @@ public class IPAddressTest
                "20.65535", "20.0.255.255",
                "0313.027035210", "203.92.58.136", // bug #411920
                "0313.0134.035210", "203.92.58.136", // too
-               "7848198702", "211.202.2.46", // too
                "1434328179", "85.126.28.115", // too
                "3397943208", "202.136.127.168", // too
        };
@@ -186,9 +185,12 @@ public class IPAddressTest
                "12.",
                "12.1.2.",
                "12...",
-               "  "
+               "  ",
+               "7848198702",
        };
 
+       static byte [] ipv4MappedIPv6Prefix = new byte [] { 0,0, 0,0, 0,0, 0,0, 0,0, 0xFF,0xFF };
+
        [Test]
        public void PublicFields ()
        {
@@ -639,6 +641,56 @@ public class IPAddressTest
                        }
                }
        }
+
+#if NET_4_5
+
+       [Test]
+       public void MapToIPv6 ()
+       {
+               for (int i = 0; i < ipv4ParseOk.Length / 2; i++) {
+                       IPAddress v4 = IPAddress.Parse (ipv4ParseOk [i * 2]);
+                       byte [] v4bytes = v4.GetAddressBytes ();
+                       IPAddress v6 = v4.MapToIPv6 ();
+                       byte [] v6bytes = v6.GetAddressBytes ();
+                       IPAddress v4back = v6.MapToIPv4 ();
+
+                       Assert.IsTrue (StartsWith (v6bytes, ipv4MappedIPv6Prefix), "MapToIPv6 #" + i + ".1");
+                       Assert.IsTrue (v6bytes [12] == v4bytes [0], "MapToIPv6 #" + i + ".2");
+                       Assert.IsTrue (v6bytes [13] == v4bytes [1], "MapToIPv6 #" + i + ".3");
+                       Assert.IsTrue (v6bytes [14] == v4bytes [2], "MapToIPv6 #" + i + ".4");
+                       Assert.IsTrue (v6bytes [15] == v4bytes [3], "MapToIPv6 #" + i + ".5");
+                       Assert.IsTrue (v4.Equals (v4back), "MapToIPv4 #" + i);
+               }
+
+               //TODO: Test using MapToIPv4/6 with anything other than IPv4/6 addresses.
+               //Currently it is not possible to do with the IPAddress implementation.
+       }
+
+       static bool StartsWith (byte [] a, byte [] b)
+       {
+               if (a.Length < b.Length)
+                       return false;
+               for (int i = 0; i < b.Length; i++)
+               {
+                       if (a [i] != b [i])
+                               return false;
+               }
+               return true;
+       }
+
+#endif
+
+       [Test]
+       public void EqualsFromBytes ()
+       {
+               for (int i = 0; i < ipv4ParseOk.Length / 2; i++) {
+                       IPAddress ip = IPAddress.Parse (ipv4ParseOk [i * 2]);
+                       IPAddress ipFromBytes = new IPAddress (ip.GetAddressBytes ());
+                       Assert.IsTrue (ip.Equals (ipFromBytes), "EqualsFromBytes #" + i);
+               }
+
+       }
+
 }
 }
 
index 1e027b79f9343dc4f76fddb1e5ea1749c87573f5..023782aa39cc0adc0d96c1147562f4a074c1224a 100644 (file)
@@ -98,6 +98,9 @@ namespace MonoTests.System.Net
                                if (tcpListener != null) {
                                        tcpListener.Stop ();
                                        tcpListener = null;
+                                       listenThread.Abort ();
+                                       listenThread.Join ();
+                                       listenThread = null;
                                        Thread.Sleep (50);
                                }
                        }
index 5a8f5ce05fda7356dc79ee4831ea5847e6069329..9beb48183e2af025c8e408a7509ce20348c336b8 100644 (file)
@@ -146,19 +146,15 @@ namespace System.Runtime.InteropServices
                {
                        if (!_fullyInitialized)
                                throw new InvalidOperationException ();
-                       DisposeInternal ();
+
+                       DangerousReleaseInternal (true);
+                       GC.SuppressFinalize (this);
                }
 
                void InternalFinalize ()
                {
                        if (_fullyInitialized)
-                               DisposeInternal ();
-               }
-
-               void DisposeInternal ()
-               {
-                       DangerousReleaseInternal (true);
-                       GC.SuppressFinalize (this);
+                               DangerousReleaseInternal (true);
                }
 
                void DangerousReleaseInternal (bool dispose)
@@ -192,23 +188,27 @@ namespace System.Runtime.InteropServices
                                if ((old_state & RefCount_Mask) == 0)
                                        throw new ObjectDisposedException ("handle");
 
-                               perform_release =
-                                       (old_state & RefCount_Mask) == RefCount_One
-                                        && (old_state & (int) State.Closed) == 0
-                                        && _ownsHandle;
-
-                               if (perform_release && IsInvalid)
+                               if ((old_state & RefCount_Mask) != RefCount_One)
+                                       perform_release = false;
+                               else if ((old_state & (int) State.Closed) != 0)
+                                       perform_release = false;
+                               else if (!_ownsHandle)
+                                       perform_release = false;
+                               else if (IsInvalid)
                                        perform_release = false;
+                               else
+                                       perform_release = true;
 
                                /* Attempt the update to the new state, fail and retry if the initial
                                 * state has been modified in the meantime. Decrement the ref count by
                                 * substracting SH_RefCountOne from the state then OR in the bits for
                                 * Dispose (if that's the reason for the Release) and closed (if the
                                 * initial ref count was 1). */
-                               new_state =
-                                       (old_state - RefCount_One)
-                                        | ((old_state & RefCount_Mask) == RefCount_One ? (int) State.Closed : 0)
-                                        | (dispose ? (int) State.Disposed : 0);
+                               new_state = (old_state & RefCount_Mask) - RefCount_One;
+                               if ((old_state & RefCount_Mask) == RefCount_One)
+                                       new_state |= (int) State.Closed;
+                               if (dispose)
+                                       new_state |= (int) State.Disposed;
                        } while (Interlocked.CompareExchange (ref _state, new_state, old_state) != old_state);
 
                        if (perform_release)
index 76869d6d4301b54c92916f89acba228ee9d1294b..91eecdccb93919fae0197c20c93d12783945347d 100644 (file)
@@ -60,6 +60,7 @@ namespace System
                private object m_target;
                private IntPtr method;
                private IntPtr delegate_trampoline;
+               private IntPtr rgctx;
                private IntPtr method_code;
                private MethodInfo method_info;
 
@@ -504,7 +505,8 @@ namespace System
 
                public override int GetHashCode ()
                {
-                       return Method.GetHashCode () ^ (m_target != null ? m_target.GetHashCode () : 0);
+                       /* same implementation as CoreCLR */
+                       return GetType ().GetHashCode ();
                }
 
                protected virtual MethodInfo GetMethodImpl ()
index ee00b14c338ee7979ace1c2aab0acbf60a75f565..d9267ac32307239d9910c71cc43de3a91bc5f1d6 100644 (file)
@@ -57,7 +57,7 @@ namespace System {
                 * of icalls, do not require an increment.
                 */
 #pragma warning disable 169
-               private const int mono_corlib_version = 137;
+               private const int mono_corlib_version = 138;
 #pragma warning restore 169
 
                [ComVisible (true)]
index 405894b4a5dd07f20acb689e19a4d6e6a11fda05..795593d28ceb603aa1854a90247b1442db68c3ca 100644 (file)
@@ -83,7 +83,9 @@ namespace System
                // https://gist.github.com/migueldeicaza/cd99938c2a4372e7e5d5
                //
                // Do not remove this API
-               internal bool HasSingleTarget => delegates == null;
+               internal bool HasSingleTarget {
+                       get { return delegates == null; }
+               }
 
                // <remarks>
                //   Equals: two multicast delegates are equal if their base is equal
index 3650cadc47f3124e3e96f6489ea309d5d16b24ec..3c6e3da2ffb6f74955c01a9e2cca04d2fdeaf55b 100644 (file)
@@ -361,14 +361,20 @@ namespace MonoTests.System.Reflection
 
                        IList<LocalVariableInfo> locals = mb.LocalVariables;
 
-                       // This might break with different compilers etc.
-                       Assert.AreEqual (2, locals.Count, "#3");
-
-                       Assert.IsTrue ((locals [0].LocalType == typeof (byte[])) || (locals [1].LocalType == typeof (byte[])), "#4");
-                       if (locals [0].LocalType == typeof (byte[]))
-                               Assert.AreEqual (false, locals [0].IsPinned, "#5");
-                       else
-                               Assert.AreEqual (false, locals [1].IsPinned, "#6");
+                       bool foundPinnedBytePointer = false;
+                       unsafe {
+                               foreach (LocalVariableInfo lvi in locals) {
+                                       if (lvi.LocalType == typeof (byte[]))
+                                               // This is optimized out by CSC in .NET 4.6
+                                               Assert.IsFalse (lvi.IsPinned, "#3-1");
+
+                                       if (/* mcs */ lvi.LocalType == typeof (byte*) || /* csc */ lvi.LocalType == typeof (byte).MakeByRefType ()) {
+                                               foundPinnedBytePointer = true;
+                                               Assert.IsTrue (lvi.IsPinned, "#3-2");
+                                       }
+                               }
+                       }
+                       Assert.IsTrue (foundPinnedBytePointer, "#4");
                }
 
                public int return_parameter_test ()
@@ -802,21 +808,44 @@ namespace MonoTests.System.Reflection
                        var type = typeof (GenericClass<>).GetMethod("Method").GetMethodBody().LocalVariables[0].LocalType;
                        Assert.AreEqual (typeofT, type);
                        Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
+               
+                       bool foundTypeOfK = false;
+                       bool foundExpectedType = false;
+           
+                       MethodBody mb = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody();
+                       foreach (LocalVariableInfo lvi in mb.LocalVariables) {
+                               if (lvi.LocalType == typeofK) {
+                                       foundTypeOfK = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#1-1");
+                               } else if (lvi.LocalType == typeofT) {
+                                       foundExpectedType = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#1-2");
+                               }
+                       }
 
-                       type = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody().LocalVariables[0].LocalType;
-                       Assert.AreEqual (typeofT, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
-
-                       type = typeof (GenericClass<>).GetMethod("Method2").GetMethodBody().LocalVariables[1].LocalType;
-                       Assert.AreEqual (typeofK, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
-
-                       type = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody().LocalVariables[0].LocalType;
-                       Assert.AreEqual (typeof (int), type);
-
-                       type = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody().LocalVariables[1].LocalType;
-                       Assert.AreEqual (typeofK, type);
-                       Assert.AreEqual (typeof (GenericClass<>), type.DeclaringType);
+                       Assert.IsTrue (foundTypeOfK, "#1-3");
+                       if (mb.LocalVariables.Count < 2)
+                               Assert.Ignore ("Code built in release mode - 'T var0' optmized out");
+                       else
+                               Assert.IsTrue (foundExpectedType, "#1-4");
+           
+                       foundTypeOfK = false;
+                       foundExpectedType = false;
+                       mb = typeof (GenericClass<int>).GetMethod("Method2").GetMethodBody();
+                       foreach (LocalVariableInfo lvi in mb.LocalVariables) {
+                               if (lvi.LocalType == typeofK) {
+                                       foundTypeOfK = true;
+                                       Assert.AreEqual (typeof (GenericClass<>), lvi.LocalType.DeclaringType, "#2-1");
+                               } else if (lvi.LocalType == typeof (int)) {
+                                       foundExpectedType = true;
+                               }
+                       }
+           
+                       Assert.IsTrue (foundTypeOfK, "#2-3");
+                       if (mb.LocalVariables.Count < 2)
+                               Assert.Ignore ("Code built in release mode - 'int var0' optmized out");
+                       else
+                               Assert.IsTrue (foundExpectedType, "#2-4");
                }
 #endif
        }
index 999a2397587d49de931ee1f6abc932b63069fd17..770ab17dffc7e0907e6c4ebd770fb4bf1f0b87bd 100644 (file)
@@ -39,6 +39,31 @@ namespace MonoTests.System
 {
        public class TimeZoneInfoTest
        {
+               static FieldInfo localField;
+               static FieldInfo cachedDataField;
+               static object localFieldObj;
+
+               public static void SetLocal (TimeZoneInfo val)
+               {
+                       if (localField == null) {
+                               if (Type.GetType ("Mono.Runtime") != null) {
+                                       localField = typeof (TimeZoneInfo).GetField ("local",
+                                                       BindingFlags.Static | BindingFlags.GetField | BindingFlags.NonPublic);
+                               } else {
+                                       cachedDataField = typeof (TimeZoneInfo).GetField ("s_cachedData",
+                                                       BindingFlags.Static | BindingFlags.GetField | BindingFlags.NonPublic);
+
+                                       localField = cachedDataField.FieldType.GetField ("m_localTimeZone",
+                                               BindingFlags.Instance | BindingFlags.GetField | BindingFlags.NonPublic);
+                               }
+                       }
+
+                       if (cachedDataField != null)
+                               localFieldObj = cachedDataField.GetValue (null);
+
+                       localField.SetValue (localFieldObj, val);
+               }
+
                [TestFixture]
                public class PropertiesTests
                {
@@ -334,6 +359,27 @@ namespace MonoTests.System
                        }
                }
                
+               [TestFixture]
+               public class ConvertTimeTests_LocalUtc : ConvertTimeTests
+               {
+                       static TimeZoneInfo oldLocal;
+
+                       [SetUp]
+                       public void SetLocal ()
+                       {
+                               base.CreateTimeZones ();
+
+                               oldLocal = TimeZoneInfo.Local;
+                               TimeZoneInfoTest.SetLocal (TimeZoneInfo.Utc);
+                       }
+
+                       [TearDown]
+                       public void RestoreLocal ()
+                       {
+                               TimeZoneInfoTest.SetLocal (oldLocal);
+                       }
+               }
+
                [TestFixture]
                public class ConvertTimeTests
                {
@@ -466,16 +512,29 @@ namespace MonoTests.System
                                Assert.AreEqual (res.Kind, DateTimeKind.Utc, "#2");
                        }
 
+                       [Test]
+                       public void ConvertFromToUtc_Utc ()
+                       {
+                               DateTime utc = DateTime.UtcNow;
+                               Assert.AreEqual (utc.Kind, DateTimeKind.Utc);
+                               DateTime converted = TimeZoneInfo.ConvertTimeFromUtc (utc, TimeZoneInfo.Utc);
+                               Assert.AreEqual (DateTimeKind.Utc, converted.Kind);
+                               DateTime back = TimeZoneInfo.ConvertTimeToUtc (converted, TimeZoneInfo.Utc);
+                               Assert.AreEqual (back.Kind, DateTimeKind.Utc);
+                               Assert.AreEqual (utc, back);
+                       }
+
                        [Test]
                        public void ConvertFromToLocal ()
                        {
                                DateTime utc = DateTime.UtcNow;
-                               Assert.AreEqual(utc.Kind, DateTimeKind.Utc);
-                               DateTime converted = TimeZoneInfo.ConvertTimeFromUtc(utc, TimeZoneInfo.Local);
-                               Assert.AreEqual(DateTimeKind.Local, converted.Kind);
-                               DateTime back = TimeZoneInfo.ConvertTimeToUtc(converted, TimeZoneInfo.Local);
-                               Assert.AreEqual(back.Kind, DateTimeKind.Utc);
-                               Assert.AreEqual(utc, back);
+                               Assert.AreEqual (utc.Kind, DateTimeKind.Utc);
+                               DateTime converted = TimeZoneInfo.ConvertTimeFromUtc (utc, TimeZoneInfo.Local);
+                               var expectedKind = (TimeZoneInfo.Local == TimeZoneInfo.Utc)? DateTimeKind.Utc : DateTimeKind.Local;
+                               Assert.AreEqual (expectedKind, converted.Kind);
+                               DateTime back = TimeZoneInfo.ConvertTimeToUtc (converted, TimeZoneInfo.Local);
+                               Assert.AreEqual (back.Kind, DateTimeKind.Utc);
+                               Assert.AreEqual (utc, back);
                        }
 
                        [Test]
@@ -509,8 +568,9 @@ namespace MonoTests.System
 
                                sdt = new DateTime (2014, 1, 9, 23, 0, 0);
                                ddt = TimeZoneInfo.ConvertTime (sdt, TimeZoneInfo.Local);
-                               Assert.AreEqual (ddt.Kind, sdt.Kind, "#3.1");
-                               Assert.AreEqual (ddt.Kind, DateTimeKind.Unspecified, "#3.2");
+                               var expectedKind = (TimeZoneInfo.Local == TimeZoneInfo.Utc)? DateTimeKind.Utc : sdt.Kind;
+                               Assert.AreEqual (expectedKind,  ddt.Kind, "#3.1");
+                               Assert.AreEqual (DateTimeKind.Unspecified, sdt.Kind, "#3.2");
                        }
 
                        [Test]
index fb41c761c47027c13e63dbcfe4bd21f9732ab011..bb5f715b03f8025ccb1af0a2f6a27825dd5b3c28 100644 (file)
@@ -45,7 +45,8 @@ net_4_5_dirs := \
        security        \
        mdbrebase       \
        ikdasm          \
-       mono-symbolicate
+       mono-symbolicate        \
+       linker-analyzer
 
 build_SUBDIRS = gacutil security culevel
 net_4_5_SUBDIRS = gacutil
diff --git a/mcs/tools/linker-analyzer/ConsoleDependencyGraph.cs b/mcs/tools/linker-analyzer/ConsoleDependencyGraph.cs
new file mode 100644 (file)
index 0000000..a778ffd
--- /dev/null
@@ -0,0 +1,146 @@
+//
+// ConsoleDependencyGraph.cs: text output related code for dependency graph
+//
+// Author:
+//   Radek Doulik (rodo@xamarin.com)
+//
+// Copyright 2015 Xamarin Inc (http://www.xamarin.com).
+//
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using LinkerAnalyzer.Core;
+
+namespace LinkerAnalyzer
+{
+       public class ConsoleDependencyGraph : DependencyGraph
+       {
+               public bool Tree = false;
+
+               public void ShowDependencies (string raw, List<VertexData> verticesList, string searchString)
+               {
+                       VertexData vertex = Vertex (raw);
+                       if (vertex == null) {
+                               Regex regex = new Regex (searchString);
+                               int count = 0;
+
+                               foreach (var v in verticesList) {
+                                       if (regex.Match (v.value) != Match.Empty) {
+                                               ShowDependencies (v);
+                                               count++;
+                                       }
+                               }
+
+                               if (count == 0)
+                                       Console.WriteLine ("\nUnable to find vertex: {0}", raw);
+                               else
+                                       Console.WriteLine ("\nFound {0} matches", count);
+                       } else
+                               ShowDependencies (vertex);
+               }
+
+               public void ShowDependencies (VertexData vertex)
+               {
+                       Header ("{0} dependencies", vertex.value);
+                       if (vertex.parentIndexes == null) {
+                               Console.WriteLine ("Root dependency");
+                       } else {
+                               int i = 0;
+                               foreach (int index in vertex.parentIndexes) {
+                                       Console.WriteLine ("Dependency #{0}", ++i);
+                                       Console.WriteLine ("\t{0}", vertex.value);
+                                       var childVertex = Vertex (index);
+                                       Console.WriteLine ("\t| {0}{1}", childVertex.value, childVertex.DepsCount);
+                                       while (childVertex.parentIndexes != null) {
+                                               childVertex = Vertex (childVertex.parentIndexes [0]);
+                                               Console.WriteLine ("\t| {0}{1}", childVertex.value, childVertex.DepsCount);
+                                       }
+                                       if (Tree)
+                                               break;
+                               }
+                       }
+               }
+
+               public void ShowAllDependencies ()
+               {
+                       Header ("All dependencies");
+                       Console.WriteLine ("Types count: {0}", vertices.Count);
+                       foreach (var vertex in vertices)
+                               ShowDependencies (vertex);
+               }
+
+               public void ShowTypesDependencies ()
+               {
+                       Header ("All types dependencies");
+                       Console.WriteLine ("Deps count: {0}", Types.Count);
+                       foreach (var type in Types)
+                               ShowDependencies (type);
+               }
+
+               string Tabs (string key)
+               {
+                       int count = Math.Max (1, 2 - key.Length / 8);
+
+                       if (count == 1)
+                               return "\t";
+                       else
+                               return "\t\t";
+               }
+
+               public void ShowStat (bool verbose = false)
+               {
+                       Header ("Statistics");
+                       if (verbose) {
+                               foreach (var key in counts.Keys)
+                                       Console.WriteLine ("Vertex type:\t{0}{1}count:{2}", key, Tabs (key), counts [key]);
+                       } else {
+                               Console.WriteLine ("Assemblies:\t{0}", counts ["Assembly"]);
+                               Console.WriteLine ("Modules:\t{0}", counts ["Module"]);
+                               Console.WriteLine ("Types:\t\t{0}", counts ["TypeDef"]);
+                               Console.WriteLine ("Fields:\t\t{0}", counts ["Field"]);
+                               Console.WriteLine ("Methods:\t{0}", counts ["Method"]);
+                       }
+
+                       Console.WriteLine ();
+                       Console.WriteLine ("Total vertices: {0}", vertices.Count);
+               }
+
+               public void ShowRoots ()
+               {
+                       Header ("Root vertices");
+
+                       int count = 0;
+                       foreach (var vertex in vertices) {
+                               if (vertex.parentIndexes == null) {
+                                       Console.WriteLine ("{0}", vertex.value);
+                                       count++;
+                               }
+                       }
+
+                       Console.WriteLine ();
+                       Console.WriteLine ("Total root vertices: {0}", count);
+               }
+
+               public void ShowRawDependencies (string raw)
+               {
+                       Header ("Raw dependencies: '{0}'", raw);
+                       ShowDependencies (raw, vertices, raw);
+               }
+
+               public void ShowTypeDependencies (string raw)
+               {
+                       Header ("Type dependencies: '{0}'", raw);
+                       ShowDependencies ("TypeDef:" + raw, Types, raw);
+               }
+
+               void Header (string header, params object[] values)
+               {
+                       string formatted = string.Format (header, values);
+                       Console.WriteLine ();
+                       Console.Write ("--- {0} ", formatted);
+                       for (int i=0; i< Math.Max (3, 64 - formatted.Length); i++)
+                               Console.Write ('-');
+                       Console.WriteLine ();
+               }
+       }
+}
diff --git a/mcs/tools/linker-analyzer/Info.plist b/mcs/tools/linker-analyzer/Info.plist
new file mode 100644 (file)
index 0000000..19517b1
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>CFBundleDisplayName</key>
+       <string>LinkerAnalyzer</string>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>en</string>
+       <key>CFBundleIconFile</key>
+       <string></string>
+       <key>CFBundleIdentifier</key>
+       <string>com.your-company.LinkerAnalyzer</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>LinkerAnalyzer</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>1.0</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>1</string>
+       <key>LSMinimumSystemVersion</key>
+       <string>10.8</string>
+       <key>NSHumanReadableCopyright</key>
+       <string>rodo</string>
+       <key>NSMainNibFile</key>
+       <string>MainMenu</string>
+       <key>NSPrincipalClass</key>
+       <string>NSApplication</string>
+</dict>
+</plist>
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzer.csproj b/mcs/tools/linker-analyzer/LinkerAnalyzer.csproj
new file mode 100644 (file)
index 0000000..bf0c453
--- /dev/null
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{B64F51B1-2D82-479C-B8F5-8875CDF06D95}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>LinkerAnalyzer</RootNamespace>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+    <AssemblyName>LinkerAnalyzer</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <UseRefCounting>true</UseRefCounting>
+    <UseSGen>true</UseSGen>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <CodeSigningKey>Mac Developer</CodeSigningKey>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CreatePackage>false</CreatePackage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <LinkMode>SdkOnly</LinkMode>
+    <UseRefCounting>true</UseRefCounting>
+    <UseSGen>true</UseSGen>
+    <IncludeMonoRuntime>true</IncludeMonoRuntime>
+    <CreatePackage>true</CreatePackage>
+    <CodeSigningKey>Developer ID Application</CodeSigningKey>
+    <EnableCodeSigning>true</EnableCodeSigning>
+    <EnablePackageSigning>false</EnablePackageSigning>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+    <Folder Include="Mono.Options\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="ConsoleDependencyGraph.cs" />
+    <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs">
+      <Link>Mono.Options\Options.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+  <ItemGroup>
+    <ProjectReference Include="LinkerAnalyzerCore\LinkerAnalyzerCore.csproj">
+      <Project>{E1B8F203-5251-470E-A573-C9E79B60781B}</Project>
+      <Name>LinkerAnalyzerCore</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzer.sln b/mcs/tools/linker-analyzer/LinkerAnalyzer.sln
new file mode 100644 (file)
index 0000000..1debe4c
--- /dev/null
@@ -0,0 +1,23 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 2012\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinkerAnalyzer", "LinkerAnalyzer.csproj", "{B64F51B1-2D82-479C-B8F5-8875CDF06D95}"\r
+EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinkerAnalyzerCore", "LinkerAnalyzerCore\LinkerAnalyzerCore.csproj", "{E1B8F203-5251-470E-A573-C9E79B60781B}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Any CPU = Debug|Any CPU\r
+               Release|Any CPU = Release|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {B64F51B1-2D82-479C-B8F5-8875CDF06D95}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {E1B8F203-5251-470E-A573-C9E79B60781B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {E1B8F203-5251-470E-A573-C9E79B60781B}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {E1B8F203-5251-470E-A573-C9E79B60781B}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {E1B8F203-5251-470E-A573-C9E79B60781B}.Release|Any CPU.Build.0 = Release|Any CPU\r
+       EndGlobalSection\r
+EndGlobal\r
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzerCore/DependencyGraph.cs b/mcs/tools/linker-analyzer/LinkerAnalyzerCore/DependencyGraph.cs
new file mode 100644 (file)
index 0000000..e488209
--- /dev/null
@@ -0,0 +1,118 @@
+//
+// DependencyGraph.cs: linker dependencies graph
+//
+// Author:
+//   Radek Doulik (rodo@xamarin.com)
+//
+// Copyright 2015 Xamarin Inc (http://www.xamarin.com).
+//
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Xml;
+
+namespace LinkerAnalyzer.Core
+{
+       public class VertexData {
+               public string value;
+               public List<int> parentIndexes;
+               public int index;
+
+               public string DepsCount {
+                       get {
+                               if (parentIndexes == null || parentIndexes.Count < 1)
+                                       return "";
+                               return string.Format (" [{0} deps]", parentIndexes.Count);
+                       }
+               }
+       };
+
+       public class DependencyGraph
+       {
+               protected List<VertexData> vertices = new List<VertexData> ();
+               public List<VertexData> Types = new List<VertexData> ();
+               Dictionary<string, int> indexes = new Dictionary<string, int> ();
+               protected Dictionary<string, int> counts = new Dictionary<string, int> ();
+
+               public void Load (string filename)
+               {
+                       Console.WriteLine ("Loading dependency tree from: {0}", filename);
+
+                       using (var fileStream = File.OpenRead (filename))
+                       using (var zipStream = new GZipStream (fileStream, CompressionMode.Decompress)) {
+                               try {
+                                       Load (zipStream);
+                               } catch (Exception) {
+                                       Console.WriteLine ("Unable to open and read the dependecies.");
+                                       Environment.Exit (1);
+                               }
+                       }
+               }
+
+               void Load (GZipStream zipStream) {
+                       using (XmlReader reader = XmlReader.Create (zipStream)) {
+                               while (reader.Read ()) {
+                                       switch (reader.NodeType) {
+                                       case XmlNodeType.Element:
+                                               //Console.WriteLine (reader.Name);
+                                               if (reader.Name == "edge" && reader.IsStartElement ()) {
+                                                       string b = reader.GetAttribute ("b");
+                                                       string e = reader.GetAttribute ("e");
+                                                       //Console.WriteLine ("edge value " + b + "  -->  " + e);
+
+                                                       if (e != b) {
+                                                               VertexData begin = Vertex (b, true);
+                                                               VertexData end = Vertex (e, true);
+
+                                                               if (end.parentIndexes == null)
+                                                                       end.parentIndexes = new List<int> ();
+                                                               if (!end.parentIndexes.Contains (begin.index)) {
+                                                                       end.parentIndexes.Add (begin.index);
+                                                                       //Console.WriteLine (" end parent index: {0}", end.parentIndexes);
+                                                               }
+                                                       }
+                                               }
+                                               break;
+                                       default:
+                                               //Console.WriteLine ("node: " + reader.NodeType);
+                                               break;
+                                       }
+                               }
+                       }
+               }
+
+               public VertexData Vertex (string vertexName, bool create = false)
+               {
+                       VertexData vertex;
+
+                       try {
+                               vertex = vertices [indexes [vertexName]];
+                       } catch (KeyNotFoundException) {
+                               if (create) {
+                                       int index = vertices.Count;
+                                       vertex = new VertexData () { value = vertexName, index = index };
+                                       vertices.Add (vertex);
+                                       indexes.Add (vertexName, index);
+                                       string prefix = vertexName.Substring (0, vertexName.IndexOf (':'));
+                                       if (counts.ContainsKey (prefix))
+                                               counts [prefix]++;
+                                       else
+                                               counts [prefix] = 1;
+                                       //Console.WriteLine ("prefix " + prefix + " count " + counts[prefix]);
+                                       if (prefix == "TypeDef") {
+                                               Types.Add (vertex);
+                                       }
+                               } else
+                                       return null;
+                       }
+
+                       return vertex;
+               }
+
+               public VertexData Vertex (int index)
+               {
+                       return vertices [index];
+               }
+       }
+}
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj b/mcs/tools/linker-analyzer/LinkerAnalyzerCore/LinkerAnalyzerCore.csproj
new file mode 100644 (file)
index 0000000..6427516
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{E1B8F203-5251-470E-A573-C9E79B60781B}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>LinkerAnalyzer.Core</RootNamespace>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+    <AssemblyName>LinkerAnalyzerCore</AssemblyName>
+    <UseXamMacFullFramework>true</UseXamMacFullFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <UseRefCounting>false</UseRefCounting>
+    <UseSGen>false</UseSGen>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <CreatePackage>false</CreatePackage>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <EnablePackageSigning>false</EnablePackageSigning>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>full</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <UseRefCounting>false</UseRefCounting>
+    <UseSGen>false</UseSGen>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <CreatePackage>false</CreatePackage>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <EnablePackageSigning>false</EnablePackageSigning>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Mono.Cecil">
+      <HintPath>..\..\..\git\upstream\cecil\bin\net_4_0_Debug\Mono.Cecil.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="DependencyGraph.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/mcs/tools/linker-analyzer/LinkerAnalyzerCore/Properties/AssemblyInfo.cs b/mcs/tools/linker-analyzer/LinkerAnalyzerCore/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..b78aef5
--- /dev/null
@@ -0,0 +1,27 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle ("LinkerAnalyzerCore")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("")]
+[assembly: AssemblyCopyright ("rodo")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion ("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
diff --git a/mcs/tools/linker-analyzer/Main.cs b/mcs/tools/linker-analyzer/Main.cs
new file mode 100644 (file)
index 0000000..5c75ba5
--- /dev/null
@@ -0,0 +1,86 @@
+//
+// Main.cs: Main program file of command line utility.
+//
+// Author:
+//   Radek Doulik (rodo@xamarin.com)
+//
+// Copyright 2015 Xamarin Inc (http://www.xamarin.com).
+//
+using System;
+using Mono.Options;
+using LinkerAnalyzer.Core;
+
+namespace LinkerAnalyzer
+{
+       static class MainClass
+       {
+               static void Main (string[] args)
+               {
+                       bool showUsage = true;
+                       bool showAllDeps = false;
+                       bool showTypeDeps = false;
+                       string typeName = null;
+                       bool showRawDeps = false;
+                       string rawName = null;
+                       bool showRoots = false;
+                       bool showSpaceUsage = false;
+                       bool showStat = false;
+                       bool showTypes = false;
+                       bool reduceToTree = false;
+                       bool verbose = false;
+
+                       var optionsParser = new OptionSet () {
+                               { "a|alldeps", "show all dependencies", v => { showAllDeps = v != null; } },
+                               { "h|help", "show this message and exit.", v => showUsage = v != null },
+                               { "r|rawdeps=", "show raw vertex dependencies. Raw vertex VALUE is in the raw format written by linker to the dependency XML file. VALUE can be regular expression", v => { showRawDeps = v != null; rawName = v; } },
+                               { "roots", "show root dependencies.", v => showRoots = v != null },
+                               { "stat", "show statistic of loaded dependencies.", v => showStat = v != null },
+                               { "tree", "reduce the dependency graph to the tree.", v => reduceToTree = v != null },
+                               { "types", "show all types dependencies.", v => showTypes = v != null },
+                               { "t|typedeps=", "show type dependencies. The VALUE can be regular expression", v => { showTypeDeps = v != null; typeName = v; } },
+                               //{ "u|spaceusage", "show space analysis.", v => showSpaceUsage = v != null },
+                               { "v|verbose", "be more verbose. Enables stat and roots options.", v => verbose = v != null },
+                       };
+
+                       if (args.Length > 0) {
+                               showUsage = false;
+                               optionsParser.Parse (args);
+                       }
+
+                       if (showUsage) {
+                               Console.WriteLine ("Usage:\n\n\tlinkeranalyzer [Options] <linker-dependency-file.xml.gz>\n\nOptions:\n");
+                               optionsParser.WriteOptionDescriptions (Console.Out);
+                               Console.WriteLine ();
+                               return;
+                       }
+
+                       string dependencyFile = args [args.Length - 1];
+
+                       ConsoleDependencyGraph deps = new ConsoleDependencyGraph () { Tree = reduceToTree };
+                       deps.Load (dependencyFile);
+
+                       if (showSpaceUsage) {
+//                             SpaceAnalyzer sa = new SpaceAnalyzer (System.IO.Path.GetDirectoryName (dependencyFile));
+//                             sa.LoadAssemblies (verbose);
+                       }
+
+                       if (verbose) {
+                               showStat = true;
+                               showRoots = true;
+                       }
+
+                       if (showStat)
+                               deps.ShowStat (verbose);
+                       if (showRoots)
+                               deps.ShowRoots ();
+                       if (showRawDeps)
+                               deps.ShowRawDependencies (rawName);
+                       if (showTypeDeps)
+                               deps.ShowTypeDependencies (typeName);
+                       if (showAllDeps)
+                               deps.ShowAllDependencies ();
+                       else if (showTypes)
+                               deps.ShowTypesDependencies ();
+               }
+       }
+}
diff --git a/mcs/tools/linker-analyzer/Makefile b/mcs/tools/linker-analyzer/Makefile
new file mode 100644 (file)
index 0000000..c8fd5ff
--- /dev/null
@@ -0,0 +1,7 @@
+thisdir = tools/linker-analyzer
+SUBDIRS =
+include ../../build/rules.make
+
+PROGRAM = linkeranalyzer.exe
+
+include ../../build/executable.make
diff --git a/mcs/tools/linker-analyzer/linkeranalyzer.exe.sources b/mcs/tools/linker-analyzer/linkeranalyzer.exe.sources
new file mode 100644 (file)
index 0000000..1da8185
--- /dev/null
@@ -0,0 +1,5 @@
+ConsoleDependencyGraph.cs
+Main.cs
+
+LinkerAnalyzerCore/DependencyGraph.cs
+../../class/Mono.Options/Mono.Options/Options.cs
index c9b66af44ab1d6d16bed8dae33b598a1c3be3da0..04dabf45625ad29be82f46385bb1d1be27548bec 100644 (file)
@@ -123,7 +123,9 @@ namespace Mono.Linker.Steps {
                {
                        while (!QueueIsEmpty ()) {
                                MethodDefinition method = (MethodDefinition) _methods.Dequeue ();
+                               Annotations.Push (method);
                                ProcessMethod (method);
+                               Annotations.Pop ();
                        }
                }
 
@@ -483,6 +485,8 @@ namespace Mono.Linker.Steps {
                        if (CheckProcessed (type))
                                return null;
 
+                       Annotations.Push (type);
+
                        MarkScope (type.Scope);
                        MarkType (type.BaseType);
                        MarkType (type.DeclaringType);
@@ -516,6 +520,8 @@ namespace Mono.Linker.Steps {
 
                        DoAdditionalTypeProcessing (type);
 
+                       Annotations.Pop ();
+
                        Annotations.Mark (type);
 
                        ApplyPreserveInfo (type);
@@ -878,6 +884,7 @@ namespace Mono.Linker.Steps {
                        if (reference.DeclaringType is ArrayType)
                                return null;
 
+                       Annotations.Push (reference);
                        if (reference.DeclaringType is GenericInstanceType)
                                MarkType (reference.DeclaringType);
 
@@ -886,13 +893,18 @@ namespace Mono.Linker.Steps {
 
                        MethodDefinition method = ResolveMethodDefinition (reference);
 
-                       if (method == null)
+                       if (method == null) {
+                               Annotations.Pop ();
                                throw new ResolutionException (reference);
+                       }
 
                        if (Annotations.GetAction (method) == MethodAction.Nothing)
                                Annotations.SetAction (method, MethodAction.Parse);
 
                        EnqueueMethod (method);
+
+                       Annotations.Pop ();
+
                        return method;
                }
 
index 5dfa488d6251b22d5c556edcc0a2ea3bea074909..0260c892e99b74494f18250b4979bf3c20fbff4c 100644 (file)
@@ -39,6 +39,7 @@ namespace Mono.Linker.Steps {
                protected override void Process ()
                {
                        CheckOutputDirectory ();
+                       Annotations.SaveDependencies ();
                }
 
                void CheckOutputDirectory ()
@@ -63,9 +64,11 @@ namespace Mono.Linker.Steps {
                        switch (Annotations.GetAction (assembly)) {
                        case AssemblyAction.Save:
                        case AssemblyAction.Link:
+                               Context.Annotations.AddDependency (assembly);
                                assembly.Write (GetAssemblyFileName (assembly, directory), SaveSymbols (assembly));
                                break;
                        case AssemblyAction.Copy:
+                               Context.Annotations.AddDependency (assembly);
                                CloseSymbols (assembly);
                                CopyAssembly (GetOriginalAssemblyFileInfo (assembly), directory, Context.LinkSymbols);
                                break;
index e3ad96b410bf8cf324874466307965919e3ba050..6219bc92ffc27d21e83361e511e2dce69db5508e 100644 (file)
@@ -56,10 +56,10 @@ namespace Mono.Linker.Steps {
                        switch (assembly.MainModule.Kind) {
                        case ModuleKind.Dll:
                                ProcessLibrary (Context, assembly);
-                               return;
+                               break;
                        default:
                                ProcessExecutable (assembly);
-                               return;
+                               break;
                        }
                }
 
@@ -79,14 +79,20 @@ namespace Mono.Linker.Steps {
                {
                        SetAction (context, assembly, AssemblyAction.Copy);
 
+                       context.Annotations.Push (assembly);
+
                        foreach (TypeDefinition type in assembly.MainModule.Types)
                                MarkType (context, type);
+
+                       context.Annotations.Pop ();
                }
 
                static void MarkType (LinkContext context, TypeDefinition type)
                {
                        context.Annotations.Mark (type);
 
+                       context.Annotations.Push (type);
+
                        if (type.HasFields)
                                MarkFields (context, type.Fields);
                        if (type.HasMethods)
@@ -94,14 +100,20 @@ namespace Mono.Linker.Steps {
                        if (type.HasNestedTypes)
                                foreach (var nested in type.NestedTypes)
                                        MarkType (context, nested);
+
+                       context.Annotations.Pop ();
                }
 
                void ProcessExecutable (AssemblyDefinition assembly)
                {
                        SetAction (Context, assembly, AssemblyAction.Link);
 
+                       Annotations.Push (assembly);
+
                        Annotations.Mark (assembly.EntryPoint.DeclaringType);
                        MarkMethod (Context, assembly.EntryPoint, MethodAction.Parse);
+
+                       Annotations.Pop ();
                }
 
                static void MarkFields (LinkContext context, ICollection fields)
index 41fb042c7e549b05db221f8bc9001be70249c1dd..c0386936d570a8ea74aafb22d2473c62a7c2b586 100644 (file)
@@ -29,6 +29,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
 
 using Mono.Cecil;
 using Mono.Cecil.Cil;
@@ -50,6 +52,26 @@ namespace Mono.Linker {
 
                readonly Dictionary<object, Dictionary<IMetadataTokenProvider, object>> custom_annotations = new Dictionary<object, Dictionary<IMetadataTokenProvider, object>> ();
 
+               readonly Stack<object> dependency_stack = new Stack<object> ();
+               System.Xml.XmlWriter writer;
+               GZipStream zipStream;
+
+               public void PrepareDependenciesDump ()
+               {
+                       System.Xml.XmlWriterSettings settings = new System.Xml.XmlWriterSettings();
+                       settings.Indent = true;
+                       settings.IndentChars = "\t";
+                       var depsFile = File.OpenWrite ("linker-dependencies.xml.gz");
+                       zipStream = new GZipStream (depsFile, CompressionMode.Compress);
+
+                       writer = System.Xml.XmlWriter.Create (zipStream, settings);
+                       writer.WriteStartDocument ();
+                       writer.WriteStartElement ("dependencies");
+                       writer.WriteStartAttribute ("version");
+                       writer.WriteString ("1.0");
+                       writer.WriteEndAttribute ();
+               }
+
                public AssemblyAction GetAction (AssemblyDefinition assembly)
                {
                        AssemblyAction action;
@@ -86,6 +108,7 @@ namespace Mono.Linker {
                public void Mark (IMetadataTokenProvider provider)
                {
                        marked.Add (provider);
+                       AddDependency (provider);
                }
 
                public bool IsMarked (IMetadataTokenProvider provider)
@@ -237,5 +260,63 @@ namespace Mono.Linker {
                        custom_annotations.Add (key, slots);
                        return slots;
                }
+
+               public void AddDependency (object o)
+               {
+                       if (writer == null)
+                               return;
+
+                       KeyValuePair<object, object> pair = new KeyValuePair<object, object> (dependency_stack.Count > 0 ? dependency_stack.Peek () : null, o);
+                       writer.WriteStartElement ("edge");
+                       writer.WriteAttributeString ("b", TokenString (pair.Key));
+                       writer.WriteAttributeString ("e", TokenString (pair.Value));
+                       writer.WriteEndElement ();
+               }
+
+               public void Push (object o)
+               {
+                       if (writer == null)
+                               return;
+
+                       if (dependency_stack.Count > 0)
+                               AddDependency (o);
+                       dependency_stack.Push (o);
+               }
+
+               public void Pop ()
+               {
+                       if (writer == null)
+                               return;
+
+                       dependency_stack.Pop ();
+               }
+
+               string TokenString (object o)
+               {
+                       if (o == null)
+                               return "N:null";
+
+                       if (o is IMetadataTokenProvider)
+                               return (o as IMetadataTokenProvider).MetadataToken.TokenType + ":" + o;
+
+                       return "Other:" + o;
+               }
+
+               public void SaveDependencies ()
+               {
+                       if (writer == null)
+                               return;
+
+                       writer.WriteEndElement ();
+                       writer.WriteEndDocument ();
+                       writer.Flush ();
+                       writer.Close ();
+                       zipStream.Close ();
+
+                       writer.Dispose ();
+                       zipStream.Dispose ();
+                       writer = null;
+                       zipStream = null;
+               }
        }
 }
index 437a938fa2e11c8e0418eac127c86b560e8f34c9..7ae07d24f1e4a2bd9d0d6c07e3972b2dd500d58c 100644 (file)
@@ -114,7 +114,9 @@ namespace Mono.Linker {
                {
                        while (_steps.Count > 0) {
                                IStep step = (IStep) _steps [0];
+                               context.Annotations.Push (step);
                                step.Process (context);
+                               context.Annotations.Pop ();
                                _steps.Remove (step);
                        }
                }
index f87026bbfa9367592d9bdccac6fffc1d1c388f5d..d37ec8604daecd6e2deaff901e3084d940c5bdd8 100644 (file)
@@ -13,6 +13,7 @@ using System.Globalization;
 using System.Text;
 using System.IO;
 using System.Collections;
+using System.Collections.Generic;
 using System.Resources;
 using System.Reflection;
 using System.Xml;
@@ -22,6 +23,7 @@ class ResGen {
        static Assembly swf;
        static Type resxr;
        static Type resxw;
+       static HashSet<string> symbols = new HashSet<string> ();
 
        /*
         * We load the ResX format stuff on demand, since the classes are in 
@@ -61,7 +63,18 @@ Options:
        output file name (if not set).
 -usesourcepath, /useSourcePath
        to resolve relative file paths, use the directory of the resource 
-       file as current directory.";
+       file as current directory.
+-define, /define:SYMBOL1,SYMBOL2
+       takes a comma-separated list of symbols that control conditional
+       inclusion of resources file. The source file needs to be in 
+       the '.txt' format.
+
+       Resources enclosed with #ifdef SYMBOL1 ... #endif directives
+       will be included in the destination file when SYMBOL1 has
+       been specified using /define option.
+
+       Resources enclosed with #if ! SYMBOL2 ... #endif directives
+       will be included only if SYMBOL2 has NOT been specified.";
                Usage += @"
 ";
                Console.WriteLine( Usage );
@@ -74,7 +87,7 @@ Options:
                        return new PoResourceReader (stream);
                case ".txt":
                case ".text":
-                       return new TxtResourceReader (stream);
+                       return new TxtResourceReader (stream, symbols);
                case ".resources":
                        return new ResourceReader (stream);
                case ".resx":
@@ -215,6 +228,22 @@ Options:
                                break;
 
                        default:
+                               if (args [i].StartsWith ("/d:")       ||
+                                   args [i].StartsWith ("-d:")       ||
+                                   args [i].StartsWith ("/define:")  ||
+                                   args [i].StartsWith ("-define:")  ||
+                                   args [i].StartsWith ("/D:")       ||
+                                   args [i].StartsWith ("-D:")       ||
+                                   args [i].StartsWith ("/DEFINE:")  ||
+                                   args [i].StartsWith ("-DEFINE:")) {
+
+                                       string defines = args [i].Substring (args [i].IndexOf (':') + 1);
+                                       foreach (string s in defines.Split (',') ) {
+                                               symbols.Add(s);
+                                       }
+                                       break;
+                               }
+
                                if (!IsFileArgument (args [i])) {
                                        Usage ();
                                        return 1;
@@ -358,10 +387,13 @@ class TxtResourceWriter : IResourceWriter {
 class TxtResourceReader : IResourceReader {
        Hashtable data;
        Stream s;
+       HashSet <String> defines;
        
-       public TxtResourceReader (Stream stream) {
+       public TxtResourceReader (Stream stream, IEnumerable<string> symbols) {
                data = new Hashtable ();
                s = stream;
+
+               defines = new HashSet<String> (symbols);
                Load ();
        }
        
@@ -371,17 +403,84 @@ class TxtResourceReader : IResourceReader {
        public IDictionaryEnumerator GetEnumerator() {
                return data.GetEnumerator ();
        }
-       
+
+       static string NextWord(ref string line) {
+               int i, j;
+               string keywd;
+               line = line.TrimStart ();
+               for (i = 0; i < line.Length && !Char.IsWhiteSpace (line [i]) && line [i] != ';'; i++ );
+
+               if (i < line.Length) {
+                       for (j = i; j < line.Length && Char.IsWhiteSpace (line [j]) && line [j] != ';'; j++ );
+
+                       keywd = line.Substring (0, i);
+                       line = line.Substring (j).TrimStart ();
+               } else {
+                       keywd = line;
+                       line = "";
+               }
+               return keywd;
+       }
+
        void Load () {
                StreamReader reader = new StreamReader (s);
                string line, key, val;
+               Stack<bool> conditional = new Stack<bool> (5);
                int epos, line_num = 0;
+
+               conditional.Push(true);
                while ((line = reader.ReadLine ()) != null) {
                        line_num++;
                        line = line.Trim ();
-                       if (line.Length == 0 || line [0] == '#' ||
-                           line [0] == ';')
+
+                       if (line.Length == 0 || line [0] == ';')
                                continue;
+
+                       if (line [0] == '#') {
+                               bool stat;
+                               bool neg = false;
+                               string keywd, symbol;
+
+                               line = line.Substring (1);
+                               keywd = NextWord (ref line).ToLower ();
+                               symbol = "";
+
+                               if (line.Length > 0) {
+                                       if (line[0] == '!') {
+                                               line = line.Substring (1);
+                                               neg = true;
+                                       }
+                                       symbol = NextWord (ref line);
+                               }
+
+                               switch (keywd) {
+                               case "endif":
+                               case "else":
+                                       stat = conditional.Pop ();
+                                       if (conditional.Count < 1)
+                                               throw new Exception (String.Format ("Found an #{0} without matching #ifdef", keywd));
+
+                                       if (keywd == "else")
+                                               conditional.Push (conditional.Peek () && !stat);
+                                       break;
+
+                               case "ifdef":
+                               case "if":
+                                       if (symbol.Length == 0)
+                                               throw new Exception (String.Format ("Missing symbol after {0}", keywd));
+                                       stat = defines.Contains (symbol);
+                                       if (neg)
+                                               stat = !stat;
+
+                                       conditional.Push (conditional.Peek () && stat);
+                                       break;
+
+                }
+                               continue;
+                       }
+                       if (conditional.Peek () == false)
+                               continue;
+
                        epos = line.IndexOf ('=');
                        if (epos < 0) 
                                throw new Exception ("Invalid format at line " + line_num);
@@ -399,6 +498,8 @@ class TxtResourceReader : IResourceReader {
 
                        data.Add (key, val);
                }
+               if (conditional.Count > 1)
+                       throw new Exception ("Found an #ifdef but not a matching #endif before reaching the end of the file.");
        }
 
        // \\n -> \n ...
index 99baefdd8b75df074ceaff4f1170f692230f1283..05d662c03981c979db50a7345cf556c49dc040e5 100644 (file)
@@ -105,7 +105,7 @@ namespace Mono.Tools {
                        RSA subjectKey = (RSA)RSA.Create ();
 
                        bool selfSigned = false;
-                       string hashName = "SHA1";
+                       string hashName = "SHA512";
 
                        CspParameters subjectParams = new CspParameters ();
                        CspParameters issuerParams = new CspParameters ();
@@ -150,11 +150,18 @@ namespace Mono.Tools {
                                                case "-a":
                                                        // hash algorithm
                                                        switch (args [i++].ToLower ()) {
+                                                               case "sha512":
+                                                                       hashName = "SHA512";
+                                                                       break;
+                                                               case "sha256":
+                                                                       hashName = "SHA256";
+                                                                       break;
                                                                case "sha1":
+                                                                       Console.WriteLine ("WARNING: SHA1 is not safe for this usage.");
                                                                        hashName = "SHA1";
                                                                        break;
                                                                case "md5":
-                                                                       Console.WriteLine ("WARNING: MD5 is no more safe for this usage.");
+                                                                       Console.WriteLine ("WARNING: MD5 is no safe for this usage.");
                                                                        hashName = "MD5";
                                                                        break;
                                                                default:
index 439afd50e35f2afc5f9fe50dd3d8865494954fd1..9dcf5ee05afc4e9bc4a51658a00738dff404443d 100644 (file)
@@ -181,14 +181,26 @@ namespace Mono.Tuner {
 
                void DispatchAssembly (AssemblyDefinition assembly)
                {
-                       foreach (var substep in on_assemblies)
+                       foreach (var substep in on_assemblies) {
+                               var bs = substep as BaseSubStep;
+                               if (bs != null)
+                                       bs.Annotations.Push (substep);
                                substep.ProcessAssembly (assembly);
+                               if (bs != null)
+                                       bs.Annotations.Pop ();
+                       }
                }
 
                void DispatchType (TypeDefinition type)
                {
-                       foreach (var substep in on_types)
+                       foreach (var substep in on_types) {
+                               var bs = substep as BaseSubStep;
+                               if (bs != null)
+                                       bs.Annotations.Push (substep);
                                substep.ProcessType (type);
+                               if (bs != null)
+                                       bs.Annotations.Pop ();
+                       }
                }
 
                void DispatchField (FieldDefinition field)
index fdf43ccd488b2b7019eda123ea3625c93ae92179..3c27732bf4f26f682aeedbbe4394285df23edb76 100644 (file)
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true'">
+                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 
index d420c093660edff104b5f8e0fc5f22dee810c642..36f1255986367683a50963fd20ef08531d383fc8 100644 (file)
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true'">
+                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 
index 31fd0bc580a611201908f7868b38314c7f51f0eb..079b8e092a2e4154871b7bfec7e714eb7dce598d 100644 (file)
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true'">
+                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 
index 5e5a5679ebaca17d4619e5b3cdd5546953be90ee..c3f560a5f0e6191049df0eddd3bcdab4e1dcd6af 100644 (file)
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true'">
+                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 
index 832b54fbefc1598284a5bffcc8fee189913787da..47b6b7f36e068e0631f374b4545c9853de7d9e93 100644 (file)
                <AssignProjectConfiguration
                        ProjectReferences = "@(ProjectReference)"
                        SolutionConfigurationContents = "$(CurrentSolutionConfigurationContents)"
-                       Condition="'$(BuildingSolutionFile)' == 'true'">
+                       Condition="'$(BuildingSolutionFile)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">
 
                        <Output TaskParameter = "AssignedProjects" ItemName = "ProjectReferenceWithConfiguration"/>
                </AssignProjectConfiguration>
 
                <!-- Else, just -->
-               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true'">
+               <CreateItem Include="@(ProjectReference)" Condition="'$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true'">
                        <Output TaskParameter="Include" ItemName="ProjectReferenceWithConfiguration"/>
                </CreateItem>
 
index 9121f86731c3923586f7824b4f1b8c18bad09217..c5279448570c77be44ca5c6f15b97ede95151c8e 100644 (file)
@@ -700,8 +700,9 @@ int _wapi_setsockopt(guint32 fd, int level, int optname,
                tv.tv_usec = (ms % 1000) * 1000;        // micro from milli
                tmp_val = &tv;
                optlen = sizeof (tv);
+       }
 #if defined (__linux__)
-       else if (level == SOL_SOCKET &&
+       else if (level == SOL_SOCKET &&
                   (optname == SO_SNDBUF || optname == SO_RCVBUF)) {
                /* According to socket(7) the Linux kernel doubles the
                 * buffer sizes "to allow space for bookkeeping
@@ -711,8 +712,8 @@ int _wapi_setsockopt(guint32 fd, int level, int optname,
 
                bufsize /= 2;
                tmp_val = &bufsize;
-#endif
        }
+#endif
                
        ret = setsockopt (fd, level, optname, tmp_val, optlen);
        if (ret == -1) {
@@ -733,7 +734,7 @@ int _wapi_setsockopt(guint32 fd, int level, int optname,
                socklen_t type_len = sizeof (type);
 
                if (!getsockopt (fd, level, SO_TYPE, &type, &type_len)) {
-                       if (type == SOCK_DGRAM)
+                       if (type == SOCK_DGRAM || type == SOCK_STREAM)
                                setsockopt (fd, level, SO_REUSEPORT, tmp_val, optlen);
                }
        }
index 910cb9af35920e3edf5933eb1939a13ea0bc4a09..781e3318f276ec37fd24cc39e700f13c10c746ee 100644 (file)
@@ -30,6 +30,8 @@
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/atomic.h>
 #include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-lazy-init.h>
+#include <mono/utils/mono-time.h>
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>
@@ -217,6 +219,70 @@ GetCurrentThreadId (void)
        return MONO_NATIVE_THREAD_ID_TO_UINT (id);
 }
 
+static mono_lazy_init_t sleepex_init = MONO_LAZY_INIT_STATUS_NOT_INITIALIZED;
+static mono_mutex_t sleepex_mutex;
+static mono_cond_t sleepex_cond;
+
+static void
+sleepex_initialize (void)
+{
+       mono_mutex_init (&sleepex_mutex);
+       mono_cond_init (&sleepex_cond, NULL);
+}
+
+static void
+sleepex_interrupt (gpointer data)
+{
+       mono_mutex_lock (&sleepex_mutex);
+       mono_cond_broadcast (&sleepex_cond);
+       mono_mutex_unlock (&sleepex_mutex);
+}
+
+static inline guint32
+sleepex_interruptable (guint32 ms)
+{
+       gboolean interrupted;
+       guint32 start, now, end;
+
+       g_assert (INFINITE == G_MAXUINT32);
+
+       start = mono_msec_ticks ();
+
+       if (start < G_MAXUINT32 - ms) {
+               end = start + ms;
+       } else {
+               /* start + ms would overflow guint32 */
+               end = G_MAXUINT32;
+       }
+
+       mono_lazy_initialize (&sleepex_init, sleepex_initialize);
+
+       mono_mutex_lock (&sleepex_mutex);
+
+       for (now = mono_msec_ticks (); ms == INFINITE || now - start < ms; now = mono_msec_ticks ()) {
+               mono_thread_info_install_interrupt (sleepex_interrupt, NULL, &interrupted);
+               if (interrupted) {
+                       mono_mutex_unlock (&sleepex_mutex);
+                       return WAIT_IO_COMPLETION;
+               }
+
+               if (ms < INFINITE)
+                       mono_cond_timedwait_ms (&sleepex_cond, &sleepex_mutex, end - now);
+               else
+                       mono_cond_wait (&sleepex_cond, &sleepex_mutex);
+
+               mono_thread_info_uninstall_interrupt (&interrupted);
+               if (interrupted) {
+                       mono_mutex_unlock (&sleepex_mutex);
+                       return WAIT_IO_COMPLETION;
+               }
+       }
+
+       mono_mutex_unlock (&sleepex_mutex);
+
+       return 0;
+}
+
 /**
  * SleepEx:
  * @ms: The time in milliseconds to suspend for
@@ -229,80 +295,59 @@ GetCurrentThreadId (void)
 guint32
 SleepEx (guint32 ms, gboolean alertable)
 {
-       int ms_quot, ms_rem;
-       int ret;
-       gpointer current_thread = NULL;
-#if defined (__linux__) && !defined(PLATFORM_ANDROID)
-       struct timespec start, target;
-#else
-       struct timespec rem;
-#endif
-       
-       DEBUG("%s: Sleeping for %d ms", __func__, ms);
-
-       if (alertable) {
-               current_thread = get_current_thread_handle ();
-               
-               if (_wapi_thread_cur_apc_pending ())
-                       return WAIT_IO_COMPLETION;
-       }
-       
-       if(ms==0) {
-               sched_yield();
-               return 0;
-       }
-       
-       /* FIXME: check for INFINITE and sleep forever */
-       ms_quot = ms / 1000;
-       ms_rem = ms % 1000;
-       
-#if defined (__linux__) && !defined(PLATFORM_ANDROID)
-       /* Use clock_nanosleep () to prevent time drifting problems when nanosleep () is interrupted by signals */
-       ret = clock_gettime (CLOCK_MONOTONIC, &start);
-       g_assert (ret == 0);
-       target = start;
-       target.tv_sec += ms_quot;
-       target.tv_nsec += ms_rem * 1000000;
-       if (target.tv_nsec > 999999999) {
-               target.tv_nsec -= 999999999;
-               target.tv_sec ++;
-       }
+       if (ms == 0) {
+               MonoThreadInfo *info;
 
-       while (TRUE) {
-               ret = clock_nanosleep (CLOCK_MONOTONIC, TIMER_ABSTIME, &target, NULL);
+               mono_thread_info_yield ();
 
-               if (alertable && _wapi_thread_cur_apc_pending ())
+               info = mono_thread_info_current ();
+               if (info && mono_thread_info_is_interrupt_state (info))
                        return WAIT_IO_COMPLETION;
 
-               if (ret == 0)
-                       break;
+               return 0;
        }
 
-#else
-       struct timespec req;
+       if (alertable)
+               return sleepex_interruptable (ms);
 
-       req.tv_sec=ms_quot;
-       req.tv_nsec=ms_rem*1000000;
+       DEBUG("%s: Sleeping for %d ms", __func__, ms);
 
-again:
-       memset (&rem, 0, sizeof (rem));
-       ret=nanosleep(&req, &rem);
+       if (ms == INFINITE) {
+               do {
+                       sleep (G_MAXUINT32);
+               } while (1);
+       } else {
+               int ret;
+#if defined (__linux__) && !defined(PLATFORM_ANDROID)
+               struct timespec start, target;
+
+               /* Use clock_nanosleep () to prevent time drifting problems when nanosleep () is interrupted by signals */
+               ret = clock_gettime (CLOCK_MONOTONIC, &start);
+               g_assert (ret == 0);
+
+               target = start;
+               target.tv_sec += ms / 1000;
+               target.tv_nsec += (ms % 1000) * 1000000;
+               if (target.tv_nsec > 999999999) {
+                       target.tv_nsec -= 999999999;
+                       target.tv_sec ++;
+               }
+
+               do {
+                       ret = clock_nanosleep (CLOCK_MONOTONIC, TIMER_ABSTIME, &target, NULL);
+               } while (ret != 0);
+#else
+               struct timespec req, rem;
 
-       if (alertable && _wapi_thread_cur_apc_pending ())
-               return WAIT_IO_COMPLETION;
-       
-       if(ret==-1) {
-               /* Sleep interrupted with rem time remaining */
-#ifdef DEBUG_ENABLED
-               guint32 rems=rem.tv_sec*1000 + rem.tv_nsec/1000000;
-               
-               g_message("%s: Still got %d ms to go", __func__, rems);
-#endif
-               req=rem;
-               goto again;
-       }
+               req.tv_sec = ms / 1000;
+               req.tv_nsec = (ms % 1000) * 1000000;
 
+               do {
+                       memset (&rem, 0, sizeof (rem));
+                       ret = nanosleep (&req, &rem);
+               } while (ret != 0);
 #endif /* __linux__ */
+       }
 
        return 0;
 }
index 8b5816090650388dc2656c734b4faa0becd51a34..b015e748b0a9310c6499ad7177071d1edf20f99e 100644 (file)
@@ -79,7 +79,7 @@
  * Changes which are already detected at runtime, like the addition
  * of icalls, do not require an increment.
  */
-#define MONO_CORLIB_VERSION 137
+#define MONO_CORLIB_VERSION 138
 
 typedef struct
 {
index 7d7b7588e7dae77ee43323197a1e31c9ad6c5adb..20306b572ddc8e866c948eb5b022acbe9c68f920 100644 (file)
@@ -304,7 +304,7 @@ static const NumberFormatEntry number_format_entries [] = {
        {37416, 691, 37416, 691, 37497, 37485, 37487, 37491, 37552, 37563, 2566, 37495, 8, 3, 0, 0, 1, 2, 2, {3, -1}, {3, -1}},
        {37416, 691, 37416, 691, 37497, 37485, 37487, 37491, 37574, 37588, 2566, 37495, 8, 3, 1, 1, 1, 2, 2, {3, -1}, {3, -1}},
        {691, 37416, 691, 37416, 37601, 37485, 37487, 37491, 37452, 37462, 2566, 37495, 0, 0, 0, 0, 1, 2, 2, {3, -1}, {3, -1}},
-       {37416, 691, 37416, 37476, 37497, 37485, 37487, 37491, 37603, 37613, 2566, 37495, 8, 3, 0, 0, 1, 0, 2, {3, -1}, {3, -1}},
+       {37416, 691, 37416, 691, 37497, 37485, 37487, 37491, 37603, 37613, 2566, 37495, 8, 3, 0, 0, 1, 0, 2, {3, -1}, {3, -1}},
        {37416, 37476, 37416, 37476, 37497, 37485, 37622, 37491, 37452, 37462, 2566, 37495, 8, 3, 0, 0, 1, 2, 2, {3, -1}, {3, -1}},
        {37416, 37476, 37416, 37476, 37497, 37485, 37487, 37491, 37631, 37639, 2566, 37495, 8, 3, 0, 0, 1, 2, 2, {3, -1}, {3, -1}},
        {691, 37416, 691, 37416, 37647, 37485, 37487, 37491, 37651, 37462, 37664, 37669, 2, 2, 1, 1, 1, 2, 2, {3, -1}, {3, -1}},
index 7e7d4e0953e77b7a9fabadefe2cdaa8f54a9476c..e47f958817170c1c735f20615cdd3d391d5a78a4 100644 (file)
@@ -6168,7 +6168,7 @@ ves_icall_System_Text_EncodingHelper_InternalCodePage (gint32 *int_code_page)
        p = encodings [0];
        code = 0;
        for (i = 0; p != 0; ){
-               if ((gssize) p < 7){
+               if ((gsize) p < 7){
                        code = (gssize) p;
                        p = encodings [++i];
                        continue;
index 9f826151d2e79ccdf413f370aa0d1035aa92e0f4..d141e0d1e250571e8a31fd9bee5ad17bcc1fc69e 100644 (file)
@@ -780,6 +780,7 @@ struct _MonoDelegate {
        MonoObject *target;
        MonoMethod *method;
        gpointer delegate_trampoline;
+       gpointer rgctx;
        /* 
         * If non-NULL, this points to a memory location which stores the address of 
         * the compiled code of the method, or NULL if it is not yet compiled.
index 475d8321378203b1ef83c3482f998149b2b6efba..f3f712fe81e5cc7e9c2a9cb45f578c4a5fb94dde 100644 (file)
 #define LOGDEBUG(...)  
 /* define LOGDEBUG(...) g_message(__VA_ARGS__)  */
 
-static gint32 convert_family(MonoAddressFamily mono_family)
+static gint32
+convert_family (MonoAddressFamily mono_family)
 {
-       gint32 family=-1;
-       
-       switch(mono_family) {
+       switch (mono_family) {
        case AddressFamily_Unknown:
        case AddressFamily_ImpLink:
        case AddressFamily_Pup:
@@ -121,156 +120,114 @@ static gint32 convert_family(MonoAddressFamily mono_family)
        case AddressFamily_Ieee12844:
        case AddressFamily_NetworkDesigners:
                g_warning("System.Net.Sockets.AddressFamily has unsupported value 0x%x", mono_family);
-               break;
-               
+               return -1;
        case AddressFamily_Unspecified:
-               family=AF_UNSPEC;
-               break;
-               
+               return AF_UNSPEC;
        case AddressFamily_Unix:
-               family=AF_UNIX;
-               break;
-               
+               return AF_UNIX;
        case AddressFamily_InterNetwork:
-               family=AF_INET;
-               break;
-               
+               return AF_INET;
+       case AddressFamily_AppleTalk:
+               return AF_APPLETALK;
+       case AddressFamily_InterNetworkV6:
+               return AF_INET6;
+       case AddressFamily_DecNet:
+#ifdef AF_DECnet
+               return AF_DECnet;
+#else
+               return -1;
+#endif
        case AddressFamily_Ipx:
 #ifdef AF_IPX
-               family=AF_IPX;
+               return AF_IPX;
+#else
+               return -1;
 #endif
-               break;
-               
        case AddressFamily_Sna:
 #ifdef AF_SNA
-               family=AF_SNA;
-#endif
-               break;
-               
-       case AddressFamily_DecNet:
-#ifdef AF_DECnet
-               family=AF_DECnet;
+               return AF_SNA;
+#else
+               return -1;
 #endif
-               break;
-               
-       case AddressFamily_AppleTalk:
-               family=AF_APPLETALK;
-               break;
-               
-       case AddressFamily_InterNetworkV6:
-               family=AF_INET6;
-               break;
-
        case AddressFamily_Irda:
-#ifdef AF_IRDA 
-               family=AF_IRDA;
+#ifdef AF_IRDA
+               return AF_IRDA;
+#else
+               return -1;
 #endif
-               break;
        default:
-               g_warning("System.Net.Sockets.AddressFamily has unknown value 0x%x", mono_family);
+               g_warning ("System.Net.Sockets.AddressFamily has unknown value 0x%x", mono_family);
+               return -1;
        }
-
-       return(family);
 }
 
-static MonoAddressFamily convert_to_mono_family(guint16 af_family)
+static MonoAddressFamily
+convert_to_mono_family (guint16 af_family)
 {
-       MonoAddressFamily family=AddressFamily_Unknown;
-       
-       switch(af_family) {
+       switch (af_family) {
        case AF_UNSPEC:
-               family=AddressFamily_Unspecified;
-               break;
-               
+               return AddressFamily_Unspecified;
        case AF_UNIX:
-               family=AddressFamily_Unix;
-               break;
-               
+               return AddressFamily_Unix;
        case AF_INET:
-               family=AddressFamily_InterNetwork;
-               break;
-               
+               return AddressFamily_InterNetwork;
 #ifdef AF_IPX
        case AF_IPX:
-               family=AddressFamily_Ipx;
-               break;
+               return AddressFamily_Ipx;
 #endif
-               
 #ifdef AF_SNA
        case AF_SNA:
-               family=AddressFamily_Sna;
-               break;
+               return AddressFamily_Sna;
 #endif
-               
 #ifdef AF_DECnet
        case AF_DECnet:
-               family=AddressFamily_DecNet;
-               break;
+               return AddressFamily_DecNet;
 #endif
-               
        case AF_APPLETALK:
-               family=AddressFamily_AppleTalk;
-               break;
-               
+               return AddressFamily_AppleTalk;
        case AF_INET6:
-               family=AddressFamily_InterNetworkV6;
-               break;
-               
-#ifdef AF_IRDA 
+               return AddressFamily_InterNetworkV6;
+#ifdef AF_IRDA
        case AF_IRDA:
-               family=AddressFamily_Irda;
-               break;
+               return AddressFamily_Irda;
 #endif
        default:
                g_warning("unknown address family 0x%x", af_family);
+               return AddressFamily_Unknown;
        }
-
-       return(family);
 }
 
-static gint32 convert_type(MonoSocketType mono_type)
+static gint32
+convert_type (MonoSocketType mono_type)
 {
-       gint32 type=-1;
-       
-       switch(mono_type) {
+       switch (mono_type) {
        case SocketType_Stream:
-               type=SOCK_STREAM;
-               break;
-
+               return SOCK_STREAM;
        case SocketType_Dgram:
-               type=SOCK_DGRAM;
-               break;
-               
+               return SOCK_DGRAM;
        case SocketType_Raw:
-               type=SOCK_RAW;
-               break;
-
+               return SOCK_RAW;
        case SocketType_Rdm:
 #ifdef SOCK_RDM
-               type=SOCK_RDM;
+               return SOCK_RDM;
+#else
+               return -1;
 #endif
-               break;
-
        case SocketType_Seqpacket:
-               type=SOCK_SEQPACKET;
-               break;
-
+               return SOCK_SEQPACKET;
        case SocketType_Unknown:
-               g_warning("System.Net.Sockets.SocketType has unsupported value 0x%x", mono_type);
-               break;
-
+               g_warning ("System.Net.Sockets.SocketType has unsupported value 0x%x", mono_type);
+               return -1;
        default:
-               g_warning("System.Net.Sockets.SocketType has unknown value 0x%x", mono_type);
+               g_warning ("System.Net.Sockets.SocketType has unknown value 0x%x", mono_type);
+               return -1;
        }
-
-       return(type);
 }
 
-static gint32 convert_proto(MonoProtocolType mono_proto)
+static gint32
+convert_proto (MonoProtocolType mono_proto)
 {
-       gint32 proto=-1;
-       
-       switch(mono_proto) {
+       switch (mono_proto) {
        case ProtocolType_IP:
        case ProtocolType_IPv6:
        case ProtocolType_Icmp:
@@ -281,9 +238,7 @@ static gint32 convert_proto(MonoProtocolType mono_proto)
        case ProtocolType_Udp:
        case ProtocolType_Idp:
                /* These protocols are known (on my system at least) */
-               proto=mono_proto;
-               break;
-               
+               return mono_proto;
        case ProtocolType_ND:
        case ProtocolType_Raw:
        case ProtocolType_Ipx:
@@ -292,17 +247,15 @@ static gint32 convert_proto(MonoProtocolType mono_proto)
        case ProtocolType_Unknown:
                /* These protocols arent */
                g_warning("System.Net.Sockets.ProtocolType has unsupported value 0x%x", mono_proto);
-               break;
-               
+               return -1;
        default:
-               break;
+               return -1;
        }
-
-       return(proto);
 }
 
 /* Convert MonoSocketFlags */
-static gint32 convert_socketflags (gint32 sflags)
+static gint32
+convert_socketflags (gint32 sflags)
 {
        gint32 flags = 0;
 
@@ -345,10 +298,8 @@ static gint32 convert_socketflags (gint32 sflags)
  *   -1 on error
  *   -2 on non-fatal error (ie, must ignore)
  */
-static gint32 convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level,
-                                            MonoSocketOptionName mono_name,
-                                            int *system_level,
-                                            int *system_name)
+static gint32
+convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level, MonoSocketOptionName mono_name, int *system_level, int *system_name)
 {
        switch (mono_level) {
        case SocketOptionLevel_Socket:
@@ -563,7 +514,7 @@ static gint32 convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level,
                break;  /* SocketOptionLevel_IPv6 */
                
        case SocketOptionLevel_Tcp:
-       *system_level = mono_networking_get_tcp_protocol ();
+               *system_level = mono_networking_get_tcp_protocol ();
                
                switch(mono_name) {
                case SocketOptionName_NoDelay:
@@ -606,7 +557,8 @@ static gint32 convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level,
        return(0);
 }
 
-static MonoImage *get_socket_assembly (void)
+static MonoImage*
+get_socket_assembly (void)
 {
        MonoDomain *domain = mono_domain_get ();
        
@@ -629,21 +581,33 @@ static MonoImage *get_socket_assembly (void)
        return domain->socket_assembly;
 }
 
-static gint32 get_family_hint(void)
+static gint32
+get_family_hint (void)
 {
        MonoDomain *domain = mono_domain_get ();
 
        if (!domain->inet_family_hint) {
+               MonoImage *socket_assembly;
                MonoClass *socket_class;
                MonoClassField *ipv6_field, *ipv4_field;
                gint32 ipv6_enabled = -1, ipv4_enabled = -1;
                MonoVTable *vtable;
 
-               socket_class = mono_class_from_name (get_socket_assembly (), "System.Net.Sockets", "Socket");
+               socket_assembly = get_socket_assembly ();
+               g_assert (socket_assembly);
+
+               socket_class = mono_class_from_name (socket_assembly, "System.Net.Sockets", "Socket");
+               g_assert (socket_class);
+
                ipv4_field = mono_class_get_field_from_name (socket_class, "ipv4_supported");
+               g_assert (ipv4_field);
+
                ipv6_field = mono_class_get_field_from_name (socket_class, "ipv6_supported");
+               g_assert (ipv6_field);
+
                vtable = mono_class_vtable (mono_domain_get (), socket_class);
                g_assert (vtable);
+
                mono_runtime_class_init (vtable);
 
                mono_field_static_get_value (vtable, ipv4_field, &ipv4_enabled);
@@ -668,7 +632,8 @@ static gint32 get_family_hint(void)
        }
 }
 
-gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this_obj, gint32 family, gint32 type, gint32 proto, gint32 *error)
+gpointer
+ves_icall_System_Net_Sockets_Socket_Socket_internal (MonoObject *this_obj, gint32 family, gint32 type, gint32 proto, gint32 *error)
 {
        SOCKET sock;
        gint32 sock_family;
@@ -709,8 +674,8 @@ gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this_ob
 /* FIXME: the SOCKET parameter (here and in other functions in this
  * file) is really an IntPtr which needs to be converted to a guint32.
  */
-void ves_icall_System_Net_Sockets_Socket_Close_internal(SOCKET sock,
-                                                       gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Close_internal (SOCKET sock, gint32 *error)
 {
        LOGDEBUG (g_message ("%s: closing 0x%x", __func__, sock));
 
@@ -722,15 +687,16 @@ void ves_icall_System_Net_Sockets_Socket_Close_internal(SOCKET sock,
        closesocket(sock);
 }
 
-gint32 ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal(void)
+gint32
+ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal(void)
 {
        LOGDEBUG (g_message("%s: returning %d", __func__, WSAGetLastError()));
 
        return(WSAGetLastError());
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock,
-                                                             gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock, gint32 *error)
 {
        int ret;
        int amount;
@@ -747,9 +713,8 @@ gint32 ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock,
        return(amount);
 }
 
-void ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock,
-                                                          gboolean block,
-                                                          gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock, gboolean block, gint32 *error)
 {
        int ret;
        
@@ -767,17 +732,18 @@ void ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock,
        }
 }
 
-gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock,
-                                                            gint32 *error,
-                                                            gboolean blocking)
+gpointer
+ves_icall_System_Net_Sockets_Socket_Accept_internal (SOCKET sock, gint32 *error, gboolean blocking)
 {
        SOCKET newsock;
-       MonoInternalThread* curthread G_GNUC_UNUSED = mono_thread_internal_current ();
-       MONO_PREPARE_BLOCKING;
-       
+
        *error = 0;
+
+       MONO_PREPARE_BLOCKING;
+
 #ifdef HOST_WIN32
        {
+               MonoInternalThread *curthread = mono_thread_internal_current ();
                curthread->interrupt_on_stop = (gpointer)TRUE;
                newsock = _wapi_accept (sock, NULL, 0);
                curthread->interrupt_on_stop = (gpointer)FALSE;
@@ -785,6 +751,7 @@ gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock,
 #else
        newsock = _wapi_accept (sock, NULL, 0);
 #endif
+
        MONO_FINISH_BLOCKING;
 
        if(newsock==INVALID_SOCKET) {
@@ -795,15 +762,19 @@ gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock,
        return(GUINT_TO_POINTER (newsock));
 }
 
-void ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock,
-                                                        guint32 backlog,
-                                                        gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock, guint32 backlog, gint32 *error)
 {
        int ret;
        
        *error = 0;
-       
+
+       MONO_PREPARE_BLOCKING;
+
        ret = _wapi_listen (sock, backlog);
+
+       MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
        }
@@ -828,8 +799,8 @@ is_ipv4_mapped_any (const struct in6_addr *addr)
        return TRUE;
 }
 
-static MonoObject *create_object_from_sockaddr(struct sockaddr *saddr,
-                                              int sa_size, gint32 *error)
+static MonoObject*
+create_object_from_sockaddr(struct sockaddr *saddr, int sa_size, gint32 *error)
 {
        MonoDomain *domain = mono_domain_get ();
        MonoObject *sockaddr_obj;
@@ -925,8 +896,9 @@ static MonoObject *create_object_from_sockaddr(struct sockaddr *saddr,
                mono_field_set_value (sockaddr_obj, domain->sockaddr_data_field, data);
 
                return(sockaddr_obj);
+       }
 #ifdef HAVE_SYS_UN_H
-       else if (saddr->sa_family == AF_UNIX) {
+       else if (saddr->sa_family == AF_UNIX) {
                int i;
 
                for (i = 0; i < sa_size; i++) {
@@ -936,8 +908,9 @@ static MonoObject *create_object_from_sockaddr(struct sockaddr *saddr,
                mono_field_set_value (sockaddr_obj, domain->sockaddr_data_field, data);
 
                return sockaddr_obj;
+       }
 #endif
-       else {
+       else {
                *error = WSAEAFNOSUPPORT;
                return(NULL);
        }
@@ -953,15 +926,17 @@ get_sockaddr_size (int family)
                size = sizeof (struct sockaddr_in);
        } else if (family == AF_INET6) {
                size = sizeof (struct sockaddr_in6);
+       }
 #ifdef HAVE_SYS_UN_H
-       else if (family == AF_UNIX) {
+       else if (family == AF_UNIX) {
                size = sizeof (struct sockaddr_un);
-#endif
        }
+#endif
        return size;
 }
 
-extern MonoObject *ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal(SOCKET sock, gint32 af, gint32 *error)
+MonoObject*
+ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal (SOCKET sock, gint32 af, gint32 *error)
 {
        gchar *sa;
        socklen_t salen;
@@ -976,8 +951,11 @@ extern MonoObject *ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal(SO
                return NULL;
        }
        sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
+
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_getsockname (sock, (struct sockaddr *)sa, &salen);
+
        MONO_FINISH_BLOCKING;
        
        if(ret==SOCKET_ERROR) {
@@ -995,7 +973,8 @@ extern MonoObject *ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal(SO
        return result;
 }
 
-extern MonoObject *ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal(SOCKET sock, gint32 af, gint32 *error)
+MonoObject*
+ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal (SOCKET sock, gint32 af, gint32 *error)
 {
        gchar *sa;
        socklen_t salen;
@@ -1011,9 +990,13 @@ extern MonoObject *ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal(S
        }
        sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
        /* Note: linux returns just 2 for AF_UNIX. Always. */
+
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_getpeername (sock, (struct sockaddr *)sa, &salen);
+
        MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
                if (salen > 128)
@@ -1029,9 +1012,8 @@ extern MonoObject *ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal(S
        return result;
 }
 
-static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
-                                                   socklen_t *sa_size,
-                                                   gint32 *error)
+static struct sockaddr*
+create_sockaddr_from_object(MonoObject *saddr_obj, socklen_t *sa_size, gint32 *error)
 {
        MonoClassField *field;
        MonoArray *data;
@@ -1108,8 +1090,9 @@ static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
 
                *sa_size = sizeof(struct sockaddr_in6);
                return((struct sockaddr *)sa);
+       }
 #ifdef HAVE_SYS_UN_H
-       else if (family == AF_UNIX) {
+       else if (family == AF_UNIX) {
                struct sockaddr_un *sock_un;
                int i;
 
@@ -1131,14 +1114,16 @@ static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
                *sa_size = len;
 
                return (struct sockaddr *)sock_un;
+       }
 #endif
-       else {
+       else {
                *error = WSAEAFNOSUPPORT;
                return(0);
        }
 }
 
-extern void ves_icall_System_Net_Sockets_Socket_Bind_internal(SOCKET sock, MonoObject *sockaddr, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Bind_internal (SOCKET sock, MonoObject *sockaddr, gint32 *error)
 {
        struct sockaddr *sa;
        socklen_t sa_size;
@@ -1154,6 +1139,7 @@ extern void ves_icall_System_Net_Sockets_Socket_Bind_internal(SOCKET sock, MonoO
        LOGDEBUG (g_message("%s: binding to %s port %d", __func__, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), ntohs (((struct sockaddr_in *)sa)->sin_port)));
 
        ret = _wapi_bind (sock, sa, sa_size);
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
        }
@@ -1171,23 +1157,32 @@ MonoBoolean
 ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,
                                                   gint timeout, gint32 *error)
 {
-       MonoInternalThread *thread = NULL;
+       MonoInternalThread *thread = mono_thread_internal_current ();
        mono_pollfd *pfds;
        int ret;
        time_t start;
-       
+
+       *error = 0;
+
        pfds = g_new0 (mono_pollfd, 1);
-       pfds[0].fd = GPOINTER_TO_INT (sock);
-       pfds[0].events = (mode == SelectModeRead) ? MONO_POLLIN :
-               (mode == SelectModeWrite) ? MONO_POLLOUT :
-               (MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL);
+       pfds->fd = GPOINTER_TO_INT (sock);
+
+       switch (mode) {
+       case SelectModeRead:  pfds->events = MONO_POLLIN; break;
+       case SelectModeWrite: pfds->events = MONO_POLLOUT; break;
+       default:              pfds->events = MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL; break;
+       }
 
        timeout = (timeout >= 0) ? (timeout / 1000) : -1;
        start = time (NULL);
+
        do {
-               *error = 0;
-               
+               MONO_PREPARE_BLOCKING;
+
                ret = mono_poll (pfds, 1, timeout);
+
+               MONO_FINISH_BLOCKING;
+
                if (timeout > 0 && ret < 0) {
                        int err = errno;
                        int sec = time (NULL) - start;
@@ -1199,23 +1194,16 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,
                        
                        errno = err;
                }
-               
-               if (ret == -1 && errno == EINTR) {
-                       int leave = 0;
 
-                       if (thread == NULL) {
-                               thread = mono_thread_internal_current ();
-                       }
-                       
-                       leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
-                       
-                       if (leave != 0) {
+               if (ret == -1 && errno == EINTR) {
+                       if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
                                g_free (pfds);
-                               return(FALSE);
-                       } else {
-                               /* Suspend requested? */
-                               mono_thread_interruption_checkpoint ();
+                               return FALSE;
                        }
+
+                       /* Suspend requested? */
+                       mono_thread_interruption_checkpoint ();
+
                        errno = EINTR;
                }
        } while (ret == -1 && errno == EINTR);
@@ -1227,40 +1215,36 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,
                *error = errno_to_WSA (errno, __func__);
 #endif
                g_free (pfds);
-               return(FALSE);
+               return FALSE;
        }
-       
-       g_free (pfds);
 
-       if (ret == 0) {
-               return(FALSE);
-       } else {
-               return (TRUE);
-       }
+       g_free (pfds);
+       return ret != 0;
 }
 
-extern void ves_icall_System_Net_Sockets_Socket_Connect_internal(SOCKET sock, MonoObject *sockaddr, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Connect_internal (SOCKET sock, MonoObject *sockaddr, gint32 *error)
 {
        struct sockaddr *sa;
        socklen_t sa_size;
        int ret;
        
        *error = 0;
-       
-       sa=create_sockaddr_from_object(sockaddr, &sa_size, error);
-       if (*error != 0) {
+
+       sa = create_sockaddr_from_object(sockaddr, &sa_size, error);
+       if (*error != 0)
                return;
-       }
-       
+
        LOGDEBUG (g_message("%s: connecting to %s port %d", __func__, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), ntohs (((struct sockaddr_in *)sa)->sin_port)));
 
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_connect (sock, sa, sa_size);
+
        MONO_FINISH_BLOCKING;
 
-       if(ret==SOCKET_ERROR) {
+       if (ret == SOCKET_ERROR)
                *error = WSAGetLastError ();
-       }
 
        g_free(sa);
 }
@@ -1279,7 +1263,8 @@ typedef BOOL (WINAPI *LPFN_DISCONNECTEX)(SOCKET, LPOVERLAPPED, DWORD, DWORD);
 typedef BOOL (WINAPI *LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD);
 #endif
 
-extern void ves_icall_System_Net_Sockets_Socket_Disconnect_internal(SOCKET sock, MonoBoolean reuse, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Disconnect_internal (SOCKET sock, MonoBoolean reuse, gint32 *error)
 {
        int ret;
        glong output_bytes = 0;
@@ -1287,28 +1272,31 @@ extern void ves_icall_System_Net_Sockets_Socket_Disconnect_internal(SOCKET sock,
        GUID trans_guid = WSAID_TRANSMITFILE;
        LPFN_DISCONNECTEX _wapi_disconnectex = NULL;
        LPFN_TRANSMITFILE _wapi_transmitfile = NULL;
-       gboolean bret;
-       MONO_PREPARE_BLOCKING;
-       
+
        *error = 0;
-       
+
        LOGDEBUG (g_message("%s: disconnecting from socket %p (reuse %d)", __func__, sock, reuse));
 
+       MONO_PREPARE_BLOCKING;
+
        /* I _think_ the extension function pointers need to be looked
         * up for each socket.  FIXME: check the best way to store
         * pointers to functions in managed objects that still works
         * on 64bit platforms.
         */
-       ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                       (void *)&disco_guid, sizeof(GUID),
-                       (void *)&_wapi_disconnectex, sizeof(void *),
-                       &output_bytes, NULL, NULL);
+       ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&disco_guid, sizeof(GUID),
+                       (void *)&_wapi_disconnectex, sizeof(void *), &output_bytes, NULL, NULL);
+
+       MONO_FINISH_BLOCKING;
+
        if (ret != 0) {
                /* make sure that WSAIoctl didn't put crap in the
                 * output pointer
                 */
                _wapi_disconnectex = NULL;
 
+               MONO_PREPARE_BLOCKING;
+
                /*
                 * Use the SIO_GET_EXTENSION_FUNCTION_POINTER to
                 * determine the address of the disconnect method without
@@ -1317,33 +1305,32 @@ extern void ves_icall_System_Net_Sockets_Socket_Disconnect_internal(SOCKET sock,
                 * For an explanation of why this is done, you can read
                 * the article at http://www.codeproject.com/internet/jbsocketserver3.asp
                 */
-               ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                               (void *)&trans_guid, sizeof(GUID),
-                               (void *)&_wapi_transmitfile, sizeof(void *),
-                               &output_bytes, NULL, NULL);
-               if (ret != 0) {
+               ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&trans_guid, sizeof(GUID),
+                               (void *)&_wapi_transmitfile, sizeof(void *), &output_bytes, NULL, NULL);
+
+               MONO_FINISH_BLOCKING;
+
+               if (ret != 0)
                        _wapi_transmitfile = NULL;
-               }
        }
 
+       MONO_PREPARE_BLOCKING;
+
        if (_wapi_disconnectex != NULL) {
-               bret = _wapi_disconnectex (sock, NULL, TF_REUSE_SOCKET, 0);
+               if (!_wapi_disconnectex (sock, NULL, TF_REUSE_SOCKET, 0))
+                       *error = WSAGetLastError ();
        } else if (_wapi_transmitfile != NULL) {
-               bret = _wapi_transmitfile (sock, NULL, 0, 0, NULL, NULL,
-                                          TF_DISCONNECT | TF_REUSE_SOCKET);
+               if (!_wapi_transmitfile (sock, NULL, 0, 0, NULL, NULL, TF_DISCONNECT | TF_REUSE_SOCKET))
+                       *error = WSAGetLastError ();
        } else {
                *error = ERROR_NOT_SUPPORTED;
-               bret = TRUE; //we don't want the following bret check to change *error
-       }
-
-       if (bret == FALSE) {
-               *error = WSAGetLastError ();
        }
 
        MONO_FINISH_BLOCKING;
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_Receive_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Receive_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
 {
        int ret;
        guchar *buf;
@@ -1367,6 +1354,7 @@ gint32 ves_icall_System_Net_Sockets_Socket_Receive_internal(SOCKET sock, MonoArr
        }
 
        MONO_PREPARE_BLOCKING;
+
 #ifdef HOST_WIN32
        {
                curthread->interrupt_on_stop = (gpointer)TRUE;
@@ -1376,6 +1364,7 @@ gint32 ves_icall_System_Net_Sockets_Socket_Receive_internal(SOCKET sock, MonoArr
 #else
        ret = _wapi_recv (sock, buf, count, recvflags);
 #endif
+
        MONO_FINISH_BLOCKING;
 
        if(ret==SOCKET_ERROR) {
@@ -1386,7 +1375,8 @@ gint32 ves_icall_System_Net_Sockets_Socket_Receive_internal(SOCKET sock, MonoArr
        return(ret);
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_Receive_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Receive_array_internal (SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
 {
        int ret, count;
        DWORD recv;
@@ -1403,17 +1393,23 @@ gint32 ves_icall_System_Net_Sockets_Socket_Receive_array_internal(SOCKET sock, M
                *error = WSAEOPNOTSUPP;
                return(0);
        }
-       
+
+       MONO_PREPARE_BLOCKING;
+
        ret = WSARecv (sock, wsabufs, count, &recv, &recvflags, NULL, NULL);
+
+       MONO_FINISH_BLOCKING;
+
        if (ret == SOCKET_ERROR) {
                *error = WSAGetLastError ();
-               return(0);
+               return 0;
        }
-       
-       return(recv);
+
+       return recv;
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_ReceiveFrom_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject **sockaddr, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_ReceiveFrom_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject **sockaddr, gint32 *error)
 {
        int ret;
        guchar *buf;
@@ -1443,7 +1439,9 @@ gint32 ves_icall_System_Net_Sockets_Socket_ReceiveFrom_internal(SOCKET sock, Mon
        }
 
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_recvfrom (sock, buf, count, recvflags, sa, &sa_size);
+
        MONO_FINISH_BLOCKING;
 
        if(ret==SOCKET_ERROR) {
@@ -1466,7 +1464,8 @@ gint32 ves_icall_System_Net_Sockets_Socket_ReceiveFrom_internal(SOCKET sock, Mon
        return(ret);
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_Send_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Send_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
 {
        int ret;
        guchar *buf;
@@ -1493,8 +1492,11 @@ gint32 ves_icall_System_Net_Sockets_Socket_Send_internal(SOCKET sock, MonoArray
        }
 
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_send (sock, buf, count, sendflags);
+
        MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
                return(0);
@@ -1503,7 +1505,8 @@ gint32 ves_icall_System_Net_Sockets_Socket_Send_internal(SOCKET sock, MonoArray
        return(ret);
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
 {
        int ret, count;
        DWORD sent;
@@ -1520,8 +1523,13 @@ gint32 ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, Mono
                *error = WSAEOPNOTSUPP;
                return(0);
        }
-       
+
+       MONO_PREPARE_BLOCKING;
+
        ret = WSASend (sock, wsabufs, count, &sent, sendflags, NULL, NULL);
+
+       MONO_FINISH_BLOCKING;
+
        if (ret == SOCKET_ERROR) {
                *error = WSAGetLastError ();
                return(0);
@@ -1530,7 +1538,8 @@ gint32 ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, Mono
        return(sent);
 }
 
-gint32 ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject *sockaddr, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject *sockaddr, gint32 *error)
 {
        int ret;
        guchar *buf;
@@ -1559,13 +1568,17 @@ gint32 ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArra
 
        sendflags = convert_socketflags (flags);
        if (sendflags == -1) {
+               g_free (sa);
                *error = WSAEOPNOTSUPP;
                return (0);
        }
 
        MONO_PREPARE_BLOCKING;
+
        ret = _wapi_sendto (sock, buf, count, sendflags, sa, sa_size);
+
        MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
        }
@@ -1590,9 +1603,10 @@ static SOCKET Socket_to_SOCKET(MonoObject *sockobj)
 }
 
 #define POLL_ERRORS (MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL)
-void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gint32 timeout, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32 timeout, gint32 *error)
 {
-       MonoInternalThread *thread = NULL;
+       MonoInternalThread *thread = mono_thread_internal_current ();
        MonoObject *obj;
        mono_pollfd *pfds;
        int nfds, idx;
@@ -1603,6 +1617,8 @@ void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gi
        MonoArray *socks;
        time_t start;
        uintptr_t socks_size;
+
+       *error = 0;
        
        /* *sockets -> READ, null, WRITE, null, ERROR, null */
        count = mono_array_length (*sockets);
@@ -1631,8 +1647,12 @@ void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gi
        timeout = (timeout >= 0) ? (timeout / 1000) : -1;
        start = time (NULL);
        do {
-               *error = 0;
+               MONO_PREPARE_BLOCKING;
+
                ret = mono_poll (pfds, nfds, timeout);
+
+               MONO_FINISH_BLOCKING;
+
                if (timeout > 0 && ret < 0) {
                        int err = errno;
                        int sec = time (NULL) - start;
@@ -1644,20 +1664,15 @@ void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gi
                }
 
                if (ret == -1 && errno == EINTR) {
-                       int leave = 0;
-                       if (thread == NULL)
-                               thread = mono_thread_internal_current ();
-
-                       leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
-                       
-                       if (leave != 0) {
+                       if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
                                g_free (pfds);
                                *sockets = NULL;
                                return;
-                       } else {
-                               /* Suspend requested? */
-                               mono_thread_interruption_checkpoint ();
                        }
+
+                       /* Suspend requested? */
+                       mono_thread_interruption_checkpoint ();
+
                        errno = EINTR;
                }
        } while (ret == -1 && errno == EINTR);
@@ -1717,7 +1732,8 @@ static MonoObject* int_to_object (MonoDomain *domain, int val)
 }
 
 
-void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET sock, gint32 level, gint32 name, MonoObject **obj_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal (SOCKET sock, gint32 level, gint32 name, MonoObject **obj_val, gint32 *error)
 {
        int system_level = 0;
        int system_name = 0;
@@ -1763,7 +1779,9 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET soc
                *obj_val = int_to_object (domain, 0);
                return;
        }
-       
+
+       MONO_PREPARE_BLOCKING;
+
        /* No need to deal with MulticastOption names here, because
         * you cant getsockopt AddMembership or DropMembership (the
         * int getsockopt will error, causing an exception)
@@ -1771,8 +1789,7 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET soc
        switch(name) {
        case SocketOptionName_Linger:
        case SocketOptionName_DontLinger:
-               ret = _wapi_getsockopt(sock, system_level, system_name, &linger,
-                              &lingersize);
+               ret = _wapi_getsockopt(sock, system_level, system_name, &linger, &lingersize);
                break;
                
        case SocketOptionName_SendTimeout:
@@ -1782,16 +1799,16 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET soc
 
 #ifdef SO_PEERCRED
        case SocketOptionName_PeerCred: 
-               ret = _wapi_getsockopt (sock, system_level, system_name, &cred,
-                                       &credsize);
+               ret = _wapi_getsockopt (sock, system_level, system_name, &cred, &credsize);
                break;
 #endif
 
        default:
-               ret = _wapi_getsockopt (sock, system_level, system_name, &val,
-                              &valsize);
+               ret = _wapi_getsockopt (sock, system_level, system_name, &val, &valsize);
        }
-       
+
+       MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
                return;
@@ -1870,7 +1887,8 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET soc
        *obj_val=obj;
 }
 
-void ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal(SOCKET sock, gint32 level, gint32 name, MonoArray **byte_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal (SOCKET sock, gint32 level, gint32 name, MonoArray **byte_val, gint32 *error)
 {
        int system_level = 0;
        int system_name = 0;
@@ -1891,8 +1909,13 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal(SOCKET soc
 
        valsize=mono_array_length(*byte_val);
        buf=mono_array_addr(*byte_val, guchar, 0);
-       
+
+       MONO_PREPARE_BLOCKING;
+
        ret = _wapi_getsockopt (sock, system_level, system_name, buf, &valsize);
+
+       MONO_FINISH_BLOCKING;
+
        if(ret==SOCKET_ERROR) {
                *error = WSAGetLastError ();
        }
@@ -1942,10 +1965,12 @@ static struct in6_addr ipaddress_to_struct_in6_addr(MonoObject *ipaddr)
 
 #if defined(__APPLE__) || defined(__FreeBSD__)
 
-#if defined(HAVE_GETIFADDRS) && defined(HAVE_IF_NAMETOINDEX)
 static int
 get_local_interface_id (int family)
 {
+#if !defined(HAVE_GETIFADDRS) || !defined(HAVE_IF_NAMETOINDEX)
+       return 0;
+#else
        struct ifaddrs *ifap = NULL, *ptr;
        int idx = 0;
        
@@ -1969,18 +1994,13 @@ get_local_interface_id (int family)
        
        freeifaddrs (ifap);
        return idx;
-}
-#else
-static int
-get_local_interface_id (int family)
-{
-       return 0;
-}
 #endif
+}
 
 #endif /* defined(__APPLE__) || defined(__FreeBSD__) */
 
-void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, gint32 level, gint32 name, MonoObject *obj_val, MonoArray *byte_val, gint32 int_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint32 level, gint32 name, MonoObject *obj_val, MonoArray *byte_val, gint32 int_val, gint32 *error)
 {
        struct linger linger;
        int system_level = 0;
@@ -2184,29 +2204,26 @@ void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, g
        }
 }
 
-void ves_icall_System_Net_Sockets_Socket_Shutdown_internal(SOCKET sock,
-                                                          gint32 how,
-                                                          gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Shutdown_internal(SOCKET sock, gint32 how, gint32 *error)
 {
        int ret;
 
        *error = 0;
-       
-       /* Currently, the values for how (recv=0, send=1, both=2) match
-        * the BSD API
-        */
+
        MONO_PREPARE_BLOCKING;
+
+       /* Currently, the values for how (recv=0, send=1, both=2) match the BSD API */
        ret = _wapi_shutdown (sock, how);
+
        MONO_FINISH_BLOCKING;
-       if(ret==SOCKET_ERROR) {
+
+       if (ret == SOCKET_ERROR)
                *error = WSAGetLastError ();
-       }
 }
 
 gint
-ves_icall_System_Net_Sockets_Socket_IOControl_internal (SOCKET sock, gint32 code,
-                                             MonoArray *input,
-                                             MonoArray *output, gint32 *error)
+ves_icall_System_Net_Sockets_Socket_IOControl_internal (SOCKET sock, gint32 code, MonoArray *input, MonoArray *output, gint32 *error)
 {
        glong output_bytes = 0;
        gchar *i_buffer, *o_buffer;
@@ -2236,7 +2253,12 @@ ves_icall_System_Net_Sockets_Socket_IOControl_internal (SOCKET sock, gint32 code
                o_len = mono_array_length (output);
        }
 
+       MONO_PREPARE_BLOCKING;
+
        ret = WSAIoctl (sock, code, i_buffer, i_len, o_buffer, o_len, &output_bytes, NULL, NULL);
+
+       MONO_FINISH_BLOCKING;
+
        if (ret == SOCKET_ERROR) {
                *error = WSAGetLastError ();
                return(-1);
@@ -2246,10 +2268,7 @@ ves_icall_System_Net_Sockets_Socket_IOControl_internal (SOCKET sock, gint32 code
 }
 
 static gboolean 
-addrinfo_to_IPHostEntry(MonoAddressInfo *info, MonoString **h_name,
-                                               MonoArray **h_aliases,
-                                               MonoArray **h_addr_list,
-                                               gboolean add_local_ips)
+addrinfo_to_IPHostEntry(MonoAddressInfo *info, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list, gboolean add_local_ips)
 {
        gint32 count, i;
        MonoAddressEntry *ai = NULL;
@@ -2372,7 +2391,8 @@ get_addrinfo_family_hint (void)
        }
 }
 
-MonoBoolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostByName_internal (MonoString *host, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
 {
        gboolean add_local_ips = FALSE, add_info_ok = TRUE;
        gchar this_hostname [256];
@@ -2384,7 +2404,7 @@ MonoBoolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host, Mo
                add_local_ips = TRUE;
                *h_name = host;
        }
-       MONO_PREPARE_BLOCKING;
+
        if (!add_local_ips && gethostname (this_hostname, sizeof (this_hostname)) != -1) {
                if (!strcmp (hostname, this_hostname)) {
                        add_local_ips = TRUE;
@@ -2396,88 +2416,83 @@ MonoBoolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host, Mo
                add_info_ok = FALSE;
 
        g_free(hostname);
-       MONO_FINISH_BLOCKING;
 
        if (add_info_ok)
                return addrinfo_to_IPHostEntry(info, h_name, h_aliases, h_addr_list, add_local_ips);
        return FALSE;
 }
 
-extern MonoBoolean ves_icall_System_Net_Dns_GetHostByAddr_internal(MonoString *addr, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostByAddr_internal (MonoString *addr, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
 {
        char *address;
        struct sockaddr_in saddr;
        struct sockaddr_in6 saddr6;
        MonoAddressInfo *info = NULL;
        gint32 family;
-       char hostname[NI_MAXHOST] = {0};
-       int flags = 0;
-       int hint = get_addrinfo_family_hint ();
-       gboolean add_info_ok;
+       gchar hostname[NI_MAXHOST] = { 0 };
+       gboolean ret;
 
        address = mono_string_to_utf8 (addr);
 
-       if (inet_pton (AF_INET, address, &saddr.sin_addr ) <= 0) {
-               /* Maybe an ipv6 address */
-               if (inet_pton (AF_INET6, address, &saddr6.sin6_addr) <= 0) {
-                       g_free (address);
-                       return FALSE;
-               }
-               else {
-                       family = AF_INET6;
-                       saddr6.sin6_family = AF_INET6;
-               }
-       }
-       else {
+       if (inet_pton (AF_INET, address, &saddr.sin_addr ) == 1) {
                family = AF_INET;
                saddr.sin_family = AF_INET;
+       } else if (inet_pton (AF_INET6, address, &saddr6.sin6_addr) == 1) {
+               family = AF_INET6;
+               saddr6.sin6_family = AF_INET6;
+       } else {
+               g_free (address);
+               return FALSE;
        }
-       g_free(address);
+
+       g_free (address);
 
        MONO_PREPARE_BLOCKING;
 
-       if(family == AF_INET) {
+       switch (family) {
+       case AF_INET: {
 #if HAVE_SOCKADDR_IN_SIN_LEN
                saddr.sin_len = sizeof (saddr);
 #endif
-               if(getnameinfo ((struct sockaddr*)&saddr, sizeof(saddr),
-                               hostname, sizeof(hostname), NULL, 0,
-                               flags) != 0) {
-                       return(FALSE);
-               }
-       } else if(family == AF_INET6) {
+               ret = getnameinfo ((struct sockaddr*)&saddr, sizeof(saddr), hostname, sizeof(hostname), NULL, 0, 0) == 0;
+               break;
+       }
+       case AF_INET6: {
 #if HAVE_SOCKADDR_IN6_SIN_LEN
                saddr6.sin6_len = sizeof (saddr6);
 #endif
-               if(getnameinfo ((struct sockaddr*)&saddr6, sizeof(saddr6),
-                               hostname, sizeof(hostname), NULL, 0,
-                               flags) != 0) {
-                       return(FALSE);
-               }
+               ret = getnameinfo ((struct sockaddr*)&saddr6, sizeof(saddr6), hostname, sizeof(hostname), NULL, 0, 0) == 0;
+               break;
+       }
+       default:
+               g_assert_not_reached ();
        }
 
-       add_info_ok = !mono_get_address_info (hostname, 0, hint | MONO_HINT_CANONICAL_NAME | MONO_HINT_CONFIGURED_ONLY, &info);
        MONO_FINISH_BLOCKING;
 
-       if (add_info_ok)
-               return addrinfo_to_IPHostEntry (info, h_name, h_aliases, h_addr_list, FALSE);
+       if (!ret)
+               return FALSE;
 
-       return FALSE;
+       if (mono_get_address_info (hostname, 0, get_addrinfo_family_hint () | MONO_HINT_CANONICAL_NAME | MONO_HINT_CONFIGURED_ONLY, &info) != 0)
+               return FALSE;
+
+       return addrinfo_to_IPHostEntry (info, h_name, h_aliases, h_addr_list, FALSE);
 }
 
-extern MonoBoolean ves_icall_System_Net_Dns_GetHostName_internal(MonoString **h_name)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostName_internal (MonoString **h_name)
 {
-       gchar hostname[256];
+       gchar hostname[NI_MAXHOST] = { 0 };
        int ret;
-       
+
        ret = gethostname (hostname, sizeof (hostname));
-       if(ret==-1) {
-               return(FALSE);
-       }
-       
-       *h_name=mono_string_new(mono_domain_get (), hostname);
+       if (ret == -1)
+               return FALSE;
 
-       return(TRUE);
+       *h_name = mono_string_new(mono_domain_get (), hostname);
+
+       return TRUE;
 }
 
 gboolean
@@ -2485,12 +2500,16 @@ ves_icall_System_Net_Sockets_Socket_SendFile_internal (SOCKET sock, MonoString *
 {
        HANDLE file;
        gint32 error;
+       gboolean ret;
        TRANSMIT_FILE_BUFFERS buffers;
 
        if (filename == NULL)
                return FALSE;
 
+       /* FIXME: replace file by a proper fd that we can call open and close on, as they are interruptible */
+
        file = ves_icall_System_IO_MonoIO_Open (filename, FileMode_Open, FileAccess_Read, FileShare_Read, 0, &error);
+
        if (file == INVALID_HANDLE_VALUE) {
                SetLastError (error);
                return FALSE;
@@ -2506,21 +2525,29 @@ ves_icall_System_Net_Sockets_Socket_SendFile_internal (SOCKET sock, MonoString *
                buffers.TailLength = mono_array_length (post_buffer);
        }
 
-       if (!TransmitFile (sock, file, 0, 0, NULL, &buffers, flags)) {
-               CloseHandle (file);
-               return FALSE;
-       }
+       MONO_PREPARE_BLOCKING;
+
+       ret = TransmitFile (sock, file, 0, 0, NULL, &buffers, flags);
+
+       MONO_FINISH_BLOCKING;
+
+       MONO_PREPARE_BLOCKING;
 
        CloseHandle (file);
-       return TRUE;
+
+       MONO_FINISH_BLOCKING;
+
+       return ret;
 }
 
-void mono_network_init(void)
+void
+mono_network_init(void)
 {
        mono_networking_init ();
 }
 
-void mono_network_cleanup(void)
+void
+mono_network_cleanup(void)
 {
        _wapi_cleanup_networking ();
        mono_networking_shutdown ();
index 45dc2ea04c4eec15ff861fa03b9e3e11777fbd62..eadb052ccd16c46a72927fb13c0b8fe0dccda8cc 100644 (file)
@@ -264,9 +264,19 @@ ves_icall_System_Math_Pow (gdouble x, gdouble y)
                result = PInfinity.d;
 
 #if defined (__linux__) && SIZEOF_VOID_P == 4
-       /* On Linux 32bits, Math.Pow (-1, Double.MaxValue) would return NaN instead of 1 */
-       if (isnan (result) && isminusone (x) && (y > 9007199254740991.0 || y < -9007199254740991.0))
-               result = POne.d;
+       /* On Linux 32bits, some tests erroneously return NaN */
+       if (isnan (result)) {
+               if (isminusone (x) && (y > 9007199254740991.0 || y < -9007199254740991.0)) {
+                       /* Math.Pow (-1, Double.MaxValue) and Math.Pow (-1, Double.MinValue) should return 1 */
+                       result = POne.d;
+               } else if (x < -9007199254740991.0 && y < -9007199254740991.0) {
+                       /* Math.Pow (Double.MinValue, Double.MinValue) should return 0 */
+                       result = 0.0;
+               } else if (x < -9007199254740991.0 && y > 9007199254740991.0) {
+                       /* Math.Pow (Double.MinValue, Double.MaxValue) should return Double.PositiveInfinity */
+                       result = PInfinity.d;
+               }
+       }
 #endif
 
        return result == -0.0 ? 0 : result;
index 47bceb56464c68f39643255cc427a2fe03be6c0d..add3be6086c8c0a38d5056d25ed107bc4d1a1c86 100644 (file)
@@ -290,6 +290,7 @@ wait_callback (gint fd, gint events, gpointer user_data)
                MonoGHashTable *states;
                MonoMList *list = NULL;
                gpointer k;
+               gboolean remove_fd = FALSE;
 
                g_assert (user_data);
                states = user_data;
@@ -311,14 +312,23 @@ wait_callback (gint fd, gint events, gpointer user_data)
                                mono_threadpool_ms_enqueue_work_item (((MonoObject*) sockares)->vtable->domain, (MonoObject*) sockares);
                }
 
-               mono_g_hash_table_replace (states, GINT_TO_POINTER (fd), list);
+               remove_fd = (events & EVENT_ERR) == EVENT_ERR;
+               if (!remove_fd) {
+                       mono_g_hash_table_replace (states, GINT_TO_POINTER (fd), list);
 
-               events = get_events (list);
+                       events = get_events (list);
 
-               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: res fd %3d, events = %2s | %2s",
-                       fd, (events & EVENT_IN) ? "RD" : "..", (events & EVENT_OUT) ? "WR" : "..");
+                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: res fd %3d, events = %2s | %2s | %2s",
+                               fd, (events & EVENT_IN) ? "RD" : "..", (events & EVENT_OUT) ? "WR" : "..", (events & EVENT_ERR) ? "ERR" : "...");
 
-               threadpool_io->backend.register_fd (fd, events, FALSE);
+                       threadpool_io->backend.register_fd (fd, events, FALSE);
+               } else {
+                       mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: err fd %d", fd);
+
+                       mono_g_hash_table_remove (states, GINT_TO_POINTER (fd));
+
+                       threadpool_io->backend.remove_fd (fd);
+               }
        }
 }
 
@@ -368,8 +378,8 @@ selector_thread (gpointer data)
 
                                events = get_events (list);
 
-                               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: %3s fd %3d, events = %2s | %2s",
-                                       exists ? "mod" : "add", fd, (events & EVENT_IN) ? "RD" : "..", (events & EVENT_OUT) ? "WR" : "..");
+                               mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_IO_THREADPOOL, "io threadpool: %3s fd %3d, events = %2s | %2s | %2s",
+                                       exists ? "mod" : "add", fd, (events & EVENT_IN) ? "RD" : "..", (events & EVENT_OUT) ? "WR" : "..", (events & EVENT_ERR) ? "ERR" : "...");
 
                                threadpool_io->backend.register_fd (fd, events, !exists);
 
index d23120162502f9d2dd54e2535d179ccc8250e294..fd83f30929e108812f54c1f0106c4e16f4b3e401 100644 (file)
@@ -206,7 +206,7 @@ static void suspend_thread_internal (MonoInternalThread *thread, gboolean interr
 static void self_suspend_internal (MonoInternalThread *thread);
 static gboolean resume_thread_internal (MonoInternalThread *thread);
 
-static MonoException* mono_thread_execute_interruption (MonoInternalThread *thread);
+static MonoException* mono_thread_execute_interruption ();
 static void ref_stack_destroy (gpointer rs);
 
 /* Spin lock for InterlockedXXX 64 bit functions */
@@ -1184,7 +1184,7 @@ ves_icall_System_Threading_Thread_Sleep_internal(gint32 ms)
                mono_thread_clr_state (thread, ThreadState_WaitSleepJoin);
 
                if (res == WAIT_IO_COMPLETION) { /* we might have been interrupted */
-                       MonoException* exc = mono_thread_execute_interruption (thread);
+                       MonoException* exc = mono_thread_execute_interruption ();
                        if (exc) {
                                mono_raise_exception (exc);
                        } else {
@@ -1433,7 +1433,7 @@ mono_wait_uninterrupted (MonoInternalThread *thread, gboolean multiple, guint32
                if (ret != WAIT_IO_COMPLETION)
                        break;
 
-               exc = mono_thread_execute_interruption (thread);
+               exc = mono_thread_execute_interruption ();
                if (exc)
                        mono_raise_exception (exc);
 
@@ -2901,7 +2901,7 @@ mono_threads_set_shutting_down (void)
                    (current_thread->state & ThreadState_AbortRequested) ||
                    (current_thread->state & ThreadState_StopRequested)) {
                        UNLOCK_THREAD (current_thread);
-                       mono_thread_execute_interruption (current_thread);
+                       mono_thread_execute_interruption ();
                } else {
                        current_thread->state |= ThreadState_Stopped;
                        UNLOCK_THREAD (current_thread);
@@ -2969,7 +2969,7 @@ void mono_thread_manage (void)
        if (!mono_runtime_try_shutdown ()) {
                /*FIXME mono_thread_suspend probably should call mono_thread_execute_interruption when self interrupting. */
                mono_thread_suspend (mono_thread_internal_current ());
-               mono_thread_execute_interruption (mono_thread_internal_current ());
+               mono_thread_execute_interruption ();
        }
 
        /* 
@@ -4004,8 +4004,10 @@ static void CALLBACK dummy_apc (ULONG_PTR param)
  * suspend or stop)
  */
 static MonoException*
-mono_thread_execute_interruption (MonoInternalThread *thread)
+mono_thread_execute_interruption (void)
 {
+       MonoInternalThread *thread = mono_thread_internal_current ();
+
        LOCK_THREAD (thread);
 
        /* MonoThread::interruption_requested can only be changed with atomics */
@@ -4112,7 +4114,7 @@ mono_thread_request_interruption (gboolean running_managed)
                return NULL;
        }
        else {
-               return mono_thread_execute_interruption (thread);
+               return mono_thread_execute_interruption ();
        }
 }
 
@@ -4142,7 +4144,7 @@ mono_thread_resume_interruption (void)
 
        mono_thread_info_self_interrupt ();
 
-       return mono_thread_execute_interruption (thread);
+       return mono_thread_execute_interruption ();
 }
 
 gboolean mono_thread_interruption_requested ()
@@ -4166,7 +4168,7 @@ mono_thread_interruption_checkpoint_request (gboolean bypass_abort_protection)
                return NULL;
 
        if (thread->interruption_requested && (bypass_abort_protection || !is_running_protected_wrapper ())) {
-               MonoException* exc = mono_thread_execute_interruption (thread);
+               MonoException* exc = mono_thread_execute_interruption ();
                if (exc)
                        return exc;
        }
@@ -4223,7 +4225,7 @@ mono_thread_get_and_clear_pending_exception (void)
                return NULL;
 
        if (thread->interruption_requested && !is_running_protected_wrapper ()) {
-               return mono_thread_execute_interruption (thread);
+               return mono_thread_execute_interruption ();
        }
        
        if (thread->pending_exception) {
@@ -4352,7 +4354,7 @@ static void
 self_interrupt_thread (void *_unused)
 {
        MonoThreadInfo *info = mono_thread_info_current ();
-       MonoException *exc = mono_thread_execute_interruption (mono_thread_internal_current ()); 
+       MonoException *exc = mono_thread_execute_interruption ();
        if (exc) /*We must use _with_context since we didn't trampoline into the runtime*/
                mono_raise_exception_with_context (exc, &info->thread_saved_state [ASYNC_SUSPEND_STATE_INDEX].ctx); /* FIXME using thread_saved_state [ASYNC_SUSPEND_STATE_INDEX] can race with another suspend coming in. */
        g_assert_not_reached (); /*this MUST not happen since we can't resume from an async call*/
index cb409a9fedc9b02a439fc3a5c8109f453f730241..f9d17cfb1e31d21244f99c51c7899f5d0c10da5a 100755 (executable)
@@ -649,13 +649,14 @@ checktests: $(regtests)
 rcheck: mono $(regtests)
 if NACL_CODEGEN
        for i in $(regtests); do echo "running test $$i"; $(MINI_RUNTIME) $$i --exclude 'NaClDisable' || exit 1; done
-elif JENKINS_URL
+else
        -($(MINI_RUNTIME) --regression $(regtests); echo $$? > regressionexitcode.out) | $(srcdir)/emitnunit.pl
        exit $$(cat regressionexitcode.out)
-else
-       $(MINI_RUNTIME) --regression $(regtests)
 endif
 
+rcheck2: mono $(regtests)
+       $(MINI_RUNTIME) --regression $(regtests)
+
 check-seq-points: mono $(regtests)
        rm -f TestResults_op_il_seq_point.xml
        for i in $(regtests); do $(srcdir)/test_op_il_seq_point.sh $$i || ($(srcdir)/test_op_il_seq_point_headerfooter.sh; exit 1) || exit 1; done
index c4f455f223b56a4aba30cc5c60c6ffd00c6b2833..8b8b3879e4cd31868fbec04d16b055f4ebe3b8ae 100644 (file)
@@ -126,7 +126,6 @@ typedef struct MonoAotOptions {
        gboolean stats;
        char *tool_prefix;
        char *ld_flags;
-       gboolean autoreg;
        char *mtriple;
        char *llvm_path;
        char *temp_path;
@@ -197,7 +196,6 @@ typedef struct MonoAotCompile {
        int method_index;
        char *static_linking_symbol;
        mono_mutex_t mutex;
-       gboolean use_bin_writer;
        gboolean gas_line_numbers;
        /* Whenever to emit an object file directly from llc */
        gboolean llvm_owriter;
@@ -854,42 +852,22 @@ arch_emit_direct_call (MonoAotCompile *acfg, const char *target, gboolean extern
 {
 #if defined(TARGET_X86) || defined(TARGET_AMD64)
        /* Need to make sure this is exactly 5 bytes long */
-       if (!acfg->use_bin_writer) {
-               emit_unset_mode (acfg);
-               fprintf (acfg->fp, "call %s\n", target);
-       } else {
-               emit_byte (acfg, '\xe8');
-               emit_symbol_diff (acfg, target, ".", -4);
-       }
+       emit_unset_mode (acfg);
+       fprintf (acfg->fp, "call %s\n", target);
        *call_size = 5;
 #elif defined(TARGET_ARM)
-       if (acfg->use_bin_writer) {
-               guint8 buf [4];
-               guint8 *code;
-
-               code = buf;
-               ARM_BL (code, 0);
-
-               mono_img_writer_emit_reloc (acfg->w, R_ARM_CALL, target, -8);
-               emit_bytes (acfg, buf, 4);
-       } else {
-               emit_unset_mode (acfg);
-               if (thumb)
-                       fprintf (acfg->fp, "blx %s\n", target);
-               else
-                       fprintf (acfg->fp, "bl %s\n", target);
-       }
+       emit_unset_mode (acfg);
+       if (thumb)
+               fprintf (acfg->fp, "blx %s\n", target);
+       else
+               fprintf (acfg->fp, "bl %s\n", target);
        *call_size = 4;
 #elif defined(TARGET_ARM64)
        arm64_emit_direct_call (acfg, target, external, thumb, ji, call_size);
 #elif defined(TARGET_POWERPC)
-       if (acfg->use_bin_writer) {
-               g_assert_not_reached ();
-       } else {
-               emit_unset_mode (acfg);
-               fprintf (acfg->fp, "bl %s\n", target);
-               *call_size = 4;
-       }
+       emit_unset_mode (acfg);
+       fprintf (acfg->fp, "bl %s\n", target);
+       *call_size = 4;
 #else
        g_assert_not_reached ();
 #endif
@@ -939,7 +917,6 @@ static void
 arch_emit_got_offset (MonoAotCompile *acfg, guint8 *code, int *code_size)
 {
 #if defined(TARGET_POWERPC64)
-       g_assert (!acfg->use_bin_writer);
        emit_unset_mode (acfg);
        /* 
         * The ppc32 code doesn't seem to work on ppc64, the assembler complains about
@@ -954,7 +931,6 @@ arch_emit_got_offset (MonoAotCompile *acfg, guint8 *code, int *code_size)
        acfg->label_generator ++;
        *code_size = 16;
 #elif defined(TARGET_POWERPC)
-       g_assert (!acfg->use_bin_writer);
        emit_unset_mode (acfg);
        fprintf (acfg->fp, ".L%d:\n", acfg->label_generator);
        fprintf (acfg->fp, "lis 0, (%s + 4 - .L%d)@h\n", acfg->got_symbol, acfg->label_generator);
@@ -1098,14 +1074,8 @@ arch_emit_plt_entry (MonoAotCompile *acfg, const char *got_symbol, int offset, i
 #endif /*__native_client_codegen__*/
 #elif defined(TARGET_AMD64)
 #if defined(__default_codegen__)
-               if (acfg->use_bin_writer) {
-                       emit_byte (acfg, '\xff');
-                       emit_byte (acfg, '\x25');
-                       emit_symbol_diff (acfg, got_symbol, ".", offset - 4);
-               } else {
-                       emit_unset_mode (acfg);
-                       fprintf (acfg->fp, "jmp *%s+%d(%%rip)\n", got_symbol, offset);
-               }
+               emit_unset_mode (acfg);
+               fprintf (acfg->fp, "jmp *%s+%d(%%rip)\n", got_symbol, offset);
                /* Used by mono_aot_get_plt_info_offset */
                emit_int32 (acfg, info_offset);
                acfg->stats.plt_size += 10;
@@ -1145,7 +1115,6 @@ arch_emit_plt_entry (MonoAotCompile *acfg, const char *got_symbol, int offset, i
                arm64_emit_plt_entry (acfg, got_symbol, offset, info_offset);
 #elif defined(TARGET_POWERPC)
                /* The GOT address is guaranteed to be in r30 by OP_LOAD_GOTADDR */
-               g_assert (!acfg->use_bin_writer);
                emit_unset_mode (acfg);
                fprintf (acfg->fp, "lis 11, %d@h\n", offset);
                fprintf (acfg->fp, "ori 11, 11, %d@l\n", offset);
@@ -1571,8 +1540,6 @@ arch_emit_specific_trampoline (MonoAotCompile *acfg, int offset, int *tramp_size
        *tramp_size = 4;
        code = buf;
 
-       g_assert (!acfg->use_bin_writer);
-
        /*
         * PPC has no ip relative addressing, so we need to compute the address
         * of the mscorlib got. That is slow and complex, so instead, we store it
@@ -1696,28 +1663,15 @@ arch_emit_unbox_trampoline (MonoAotCompile *acfg, MonoCompile *cfg, MonoMethod *
 
        emit_bytes (acfg, buf, code - buf);
        /* jump to method */
-       if (acfg->use_bin_writer) {
-               guint8 buf [4];
-               guint8 *code;
-
-               code = buf;
-               ARM_B (code, 0);
-
-               mono_img_writer_emit_reloc (acfg->w, R_ARM_JUMP24, call_target, -8);
-               emit_bytes (acfg, buf, 4);
-       } else {
-               if (acfg->thumb_mixed && cfg->compile_llvm)
-                       fprintf (acfg->fp, "\n\tbx %s\n", call_target);
-               else
-                       fprintf (acfg->fp, "\n\tb %s\n", call_target);
-       }
+       if (acfg->thumb_mixed && cfg->compile_llvm)
+               fprintf (acfg->fp, "\n\tbx %s\n", call_target);
+       else
+               fprintf (acfg->fp, "\n\tb %s\n", call_target);
 #elif defined(TARGET_ARM64)
        arm64_emit_unbox_trampoline (acfg, cfg, method, call_target);
 #elif defined(TARGET_POWERPC)
        int this_pos = 3;
 
-       g_assert (!acfg->use_bin_writer);
-
        fprintf (acfg->fp, "\n\taddi %d, %d, %d\n", this_pos, this_pos, (int)sizeof (MonoObject));
        fprintf (acfg->fp, "\n\tb %s\n", call_target);
 #else
@@ -1813,8 +1767,6 @@ arch_emit_static_rgctx_trampoline (MonoAotCompile *acfg, int offset, int *tramp_
        *tramp_size = 4;
        code = buf;
 
-       g_assert (!acfg->use_bin_writer);
-
        /*
         * PPC has no ip relative addressing, so we need to compute the address
         * of the mscorlib got. That is slow and complex, so instead, we store it
@@ -2240,73 +2192,6 @@ arch_emit_gsharedvt_arg_trampoline (MonoAotCompile *acfg, int offset, int *tramp
 #endif
 }      
 
-static void
-arch_emit_autoreg (MonoAotCompile *acfg, char *symbol)
-{
-#if defined(TARGET_POWERPC) && defined(__mono_ilp32__)
-       /* Based on code generated by gcc */
-       emit_unset_mode (acfg);
-
-       fprintf (acfg->fp,
-#if defined(_MSC_VER) || defined(MONO_CROSS_COMPILE) 
-                        ".section      .ctors,\"aw\",@progbits\n"
-                        ".align 2\n"
-                        ".globl        %s\n"
-                        ".long %s\n"
-                        ".section      .opd,\"aw\"\n"
-                        ".align 2\n"
-                        "%s:\n"
-                        ".long .%s,.TOC.@tocbase32\n"
-                        ".size %s,.-%s\n"
-                        ".section .text\n"
-                        ".type .%s,@function\n"
-                        ".align 2\n"
-                        ".%s:\n", symbol, symbol, symbol, symbol, symbol, symbol, symbol, symbol);
-#else
-                        ".section      .ctors,\"aw\",@progbits\n"
-                        ".align 2\n"
-                        ".globl        %1$s\n"
-                        ".long %1$s\n"
-                        ".section      .opd,\"aw\"\n"
-                        ".align 2\n"
-                        "%1$s:\n"
-                        ".long .%1$s,.TOC.@tocbase32\n"
-                        ".size %1$s,.-%1$s\n"
-                        ".section .text\n"
-                        ".type .%1$s,@function\n"
-                        ".align 2\n"
-                        ".%1$s:\n", symbol);
-#endif
-
-
-       fprintf (acfg->fp,
-                        "stdu 1,-128(1)\n"
-                        "mflr 0\n"
-                        "std 31,120(1)\n"
-                        "std 0,144(1)\n"
-
-                        ".Lautoreg:\n"
-                        "lis 3, .Lglobals@h\n"
-                        "ori 3, 3, .Lglobals@l\n"
-                        "bl .mono_aot_register_module\n"
-                        "ld 11,0(1)\n"
-                        "ld 0,16(11)\n"
-                        "mtlr 0\n"
-                        "ld 31,-8(11)\n"
-                        "mr 1,11\n"
-                        "blr\n"
-                        );
-#if defined(_MSC_VER) || defined(MONO_CROSS_COMPILE) 
-               fprintf (acfg->fp,
-                        ".size .%s,.-.%s\n", symbol, symbol);
-#else
-       fprintf (acfg->fp,
-                        ".size .%1$s,.-.%1$s\n", symbol);
-#endif
-#else
-#endif
-}
-
 /* END OF ARCH SPECIFIC CODE */
 
 static guint32
@@ -6700,8 +6585,6 @@ mono_aot_parse_options (const char *aot_options, MonoAotOptions *opts)
                        opts->nimt_trampolines = atoi (arg + strlen ("nimt-trampolines="));
                } else if (str_begins_with (arg, "ngsharedvt-trampolines=")) {
                        opts->ngsharedvt_arg_trampolines = atoi (arg + strlen ("ngsharedvt-trampolines="));
-               } else if (str_begins_with (arg, "autoreg")) {
-                       opts->autoreg = TRUE;
                } else if (str_begins_with (arg, "tool-prefix=")) {
                        opts->tool_prefix = g_strdup (arg + strlen ("tool-prefix="));
                } else if (str_begins_with (arg, "ld-flags=")) {
@@ -6768,7 +6651,6 @@ mono_aot_parse_options (const char *aot_options, MonoAotOptions *opts)
                        printf ("    nrgctx-trampolines=\n");
                        printf ("    nimt-trampolines=\n");
                        printf ("    ngsharedvt-trampolines=\n");
-                       printf ("    autoreg\n");
                        printf ("    tool-prefix=\n");
                        printf ("    readonly-value=\n");
                        printf ("    soft-debug\n");
@@ -8613,25 +8495,6 @@ emit_globals (MonoAotCompile *acfg)
        emit_int32 (acfg, 0);
 }
 
-static void
-emit_autoreg (MonoAotCompile *acfg)
-{
-       char *symbol;
-
-       /*
-        * Emit a function into the .ctor section which will be called by the ELF
-        * loader to register this module with the runtime.
-        */
-       if (! (!acfg->use_bin_writer && acfg->aot_opts.static_link && acfg->aot_opts.autoreg))
-               return;
-
-       symbol = g_strdup_printf ("_%s_autoreg", acfg->static_linking_symbol);
-
-       arch_emit_autoreg (acfg, symbol);
-
-       g_free (symbol);
-}      
-
 static void
 emit_mem_end (MonoAotCompile *acfg)
 {
@@ -9540,9 +9403,6 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
                acfg->logfile = fopen (acfg->aot_opts.logfile, "a+");
        }
 
-       if (acfg->aot_opts.static_link)
-               acfg->aot_opts.autoreg = TRUE;
-
        //acfg->aot_opts.print_skipped_methods = TRUE;
 
 #if !defined(MONO_ARCH_GSHAREDVT_SUPPORTED) || !defined(ENABLE_GSHAREDVT)
@@ -9752,46 +9612,24 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
        }
 #endif
 
-       if (!acfg->aot_opts.asm_only && !acfg->aot_opts.asm_writer && mono_bin_writer_supported ()) {
+       if (acfg->aot_opts.asm_only) {
                if (acfg->aot_opts.outfile)
-                       outfile_name = g_strdup_printf ("%s", acfg->aot_opts.outfile);
+                       acfg->tmpfname = g_strdup_printf ("%s", acfg->aot_opts.outfile);
                else
-                       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
-                * it might be in another file system so the rename () won't work.
-                */
-               tmp_outfile_name = g_strdup_printf ("%s.tmp", outfile_name);
-
-               acfg->fp = fopen (tmp_outfile_name, "w");
-               if (!acfg->fp) {
-                       aot_printf (acfg, "Unable to create temporary file '%s': %s\n", tmp_outfile_name, strerror (errno));
-                       return 1;
-               }
-
-               acfg->w = mono_img_writer_create (acfg->fp, TRUE);
-               acfg->use_bin_writer = TRUE;
+                       acfg->tmpfname = g_strdup_printf ("%s.s", acfg->image->name);
+               acfg->fp = fopen (acfg->tmpfname, "w+");
        } else {
-               if (acfg->aot_opts.asm_only) {
-                       if (acfg->aot_opts.outfile)
-                               acfg->tmpfname = g_strdup_printf ("%s", acfg->aot_opts.outfile);
-                       else
-                               acfg->tmpfname = g_strdup_printf ("%s.s", acfg->image->name);
-                       acfg->fp = fopen (acfg->tmpfname, "w+");
-               } else {
-                       int i = g_file_open_tmp ("mono_aot_XXXXXX", &acfg->tmpfname, NULL);
-                       acfg->fp = fdopen (i, "w+");
-               }
-               if (acfg->fp == 0) {
-                       aot_printerrf (acfg, "Unable to open file '%s': %s\n", acfg->tmpfname, strerror (errno));
-                       return 1;
-               }
-               acfg->w = mono_img_writer_create (acfg->fp, FALSE);
-               
-               tmp_outfile_name = NULL;
-               outfile_name = NULL;
+               int i = g_file_open_tmp ("mono_aot_XXXXXX", &acfg->tmpfname, NULL);
+               acfg->fp = fdopen (i, "w+");
        }
+       if (acfg->fp == 0) {
+               aot_printerrf (acfg, "Unable to open file '%s': %s\n", acfg->tmpfname, strerror (errno));
+               return 1;
+       }
+       acfg->w = mono_img_writer_create (acfg->fp, FALSE);
+
+       tmp_outfile_name = NULL;
+       outfile_name = NULL;
 
        /* Compute symbols for methods */
        for (i = 0; i < acfg->nmethods; ++i) {
@@ -9865,8 +9703,6 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
 
        emit_globals (acfg);
 
-       emit_autoreg (acfg);
-
        if (acfg->dwarf) {
                emit_dwarf_info (acfg);
                mono_dwarf_writer_close (acfg->dwarf);
@@ -9877,8 +9713,7 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
        if (acfg->need_pt_gnu_stack) {
                /* This is required so the .so doesn't have an executable stack */
                /* The bin writer already emits this */
-               if (!acfg->use_bin_writer)
-                       fprintf (acfg->fp, "\n.section  .note.GNU-stack,\"\",@progbits\n");
+               fprintf (acfg->fp, "\n.section  .note.GNU-stack,\"\",@progbits\n");
        }
 
 #ifdef ENABLE_LLVM
@@ -9932,19 +9767,10 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options)
                acfg_free (acfg);
                return res;
        }
-       if (acfg->use_bin_writer) {
-               int err = rename (tmp_outfile_name, outfile_name);
-
-               if (err) {
-                       aot_printf (acfg, "Unable to rename '%s' to '%s': %s\n", tmp_outfile_name, outfile_name, strerror (errno));
-                       return 1;
-               }
-       } else {
-               res = compile_asm (acfg);
-               if (res != 0) {
-                       acfg_free (acfg);
-                       return res;
-               }
+       res = compile_asm (acfg);
+       if (res != 0) {
+               acfg_free (acfg);
+               return res;
        }
        TV_GETTIME (btv);
        acfg->stats.link_time = TV_ELAPSED (atv, btv);
index 9f341e78930ea505fd2c3eb73233b21676515fa9..5a5faf35c4663f289bbf2821a3059955f12068af 100644 (file)
@@ -268,7 +268,7 @@ typedef struct {
 #define HEADER_LENGTH 11
 
 #define MAJOR_VERSION 2
-#define MINOR_VERSION 41
+#define MINOR_VERSION 42
 
 typedef enum {
        CMD_SET_VM = 1,
@@ -325,6 +325,7 @@ typedef enum {
        ERR_NO_INVOCATION = 104,
        ERR_ABSENT_INFORMATION = 105,
        ERR_NO_SEQ_POINT_AT_IL_OFFSET = 106,
+       ERR_INVOKE_ABORTED = 107,
        ERR_LOADER_ERROR = 200, /*XXX extend the protocol to pass this information down the pipe */
 } ErrorCode;
 
@@ -4803,7 +4804,7 @@ mono_debugger_agent_user_break (void)
                mono_loader_unlock ();
 
                process_event (EVENT_KIND_USER_BREAK, NULL, 0, &ctx, events, suspend_policy);
-       } else {
+       } else if (debug_options.native_debugger_break) {
                G_BREAKPOINT ();
        }
 }
@@ -6735,6 +6736,11 @@ invoke_method (void)
                        err = do_invoke_method (tls, &buf, invoke, p, &p);
                }
 
+               if (tls->abort_requested) {
+                       if (CHECK_PROTOCOL_VERSION (2, 42))
+                               err = ERR_INVOKE_ABORTED;
+               }
+
                /* Start suspending before sending the reply */
                if (mindex == invoke->nmethods - 1) {
                        if (!(invoke->flags & INVOKE_FLAG_SINGLE_THREADED)) {
@@ -7051,6 +7057,7 @@ vm_commands (int command, int id, guint8 *p, guint8 *end, Buffer *buf)
                g_assert (tls);
 
                if (tls->abort_requested) {
+                       DEBUG_PRINTF (1, "Abort already requested.\n");
                        mono_loader_unlock ();
                        break;
                }
index 8510917341b87d747bd61318c19552789f330cf5..bf1153ccae0116cded372ee13f96abf62b059302 100644 (file)
@@ -2781,4 +2781,20 @@ END:
     IL_001d:  ldc.i4.1
     IL_001e:  ret
   } // end of method Tests::test_0_fceq_r4
+
+  .method public static int32 test_0_switch_loop () cil managed
+  {
+       .maxstack 16
+       .locals init (valuetype Tests/TailCallStruct V_0, int32 V_1)
+       ldc.i4.0
+       ldloc.0
+       ldloc.1
+       brtrue L_1
+       L_0:
+       ldc.i4.4
+       switch (L_0)
+       L_1:
+       pop
+       ret
+  }
 }
index da457755348d1ebe3d23cb7d67198b921d872bdf..85e0725a4cdcca8c913759b10dc254e49e6c38c6 100644 (file)
@@ -9760,6 +9760,11 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
                                handle_stack_args (cfg, stack_start, sp - stack_start);
                                sp = stack_start;
                                CHECK_UNVERIFIABLE (cfg);
+
+                               /* Undo the links */
+                               mono_unlink_bblock (cfg, cfg->cbb, default_bblock);
+                               for (i = 0; i < n; ++i)
+                                       mono_unlink_bblock (cfg, cfg->cbb, targets [i]);
                        }
 
                        MONO_EMIT_NEW_BIALU_IMM (cfg, OP_ICOMPARE_IMM, -1, src1->dreg, n);
index a55e4c84565a1c7f2cacae6be55236d10fd3edc8..f0ef08925dfd65d388fafe7693236ab479c940f0 100644 (file)
@@ -2152,7 +2152,7 @@ mono_arch_get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)
                        linfo->ret.pair_storage [j] = arg_storage_to_llvm_arg_storage (cfg, cinfo->ret.pair_storage [j]);
        }
 
-       if (MONO_TYPE_ISSTRUCT (sig_ret) && cinfo->ret.storage == ArgInIReg) {
+       if (cinfo->ret.storage == ArgValuetypeAddrInIReg) {
                /* Vtype returned using a hidden argument */
                linfo->ret.storage = LLVMArgVtypeRetAddr;
                linfo->vret_arg_index = cinfo->vret_arg_index;
@@ -2311,54 +2311,58 @@ mono_arch_emit_call (MonoCompile *cfg, MonoCallInst *call)
                case ArgValuetypeInReg:
                case ArgValuetypeAddrInIReg:
                case ArgGSharedVtInReg:
-               case ArgGSharedVtOnStack:
+               case ArgGSharedVtOnStack: {
+                       if (ainfo->storage == ArgOnStack && !MONO_TYPE_ISSTRUCT (t) && !call->tail_call)
+                               /* Already emitted above */
+                               break;
                        if (ainfo->storage == ArgOnStack && call->tail_call) {
                                MonoInst *call_inst = (MonoInst*)call;
                                cfg->args [i]->flags |= MONO_INST_VOLATILE;
                                EMIT_NEW_ARGSTORE (cfg, call_inst, i, in);
-                       } else if ((i >= sig->hasthis) && (MONO_TYPE_ISSTRUCT(t))) {
-                               guint32 align;
-                               guint32 size;
+                               break;
+                       }
 
-                               if (t->type == MONO_TYPE_TYPEDBYREF) {
-                                       size = sizeof (MonoTypedRef);
-                                       align = sizeof (gpointer);
-                               }
+                       guint32 align;
+                       guint32 size;
+
+                       if (t->type == MONO_TYPE_TYPEDBYREF) {
+                               size = sizeof (MonoTypedRef);
+                               align = sizeof (gpointer);
+                       }
+                       else {
+                               if (sig->pinvoke)
+                                       size = mono_type_native_stack_size (t, &align);
                                else {
-                                       if (sig->pinvoke)
-                                               size = mono_type_native_stack_size (t, &align);
-                                       else {
-                                               /* 
-                                                * Other backends use mono_type_stack_size (), but that
-                                                * aligns the size to 8, which is larger than the size of
-                                                * the source, leading to reads of invalid memory if the
-                                                * source is at the end of address space.
-                                                */
-                                               size = mono_class_value_size (mono_class_from_mono_type (t), &align);
-                                       }
+                                       /*
+                                        * Other backends use mono_type_stack_size (), but that
+                                        * aligns the size to 8, which is larger than the size of
+                                        * the source, leading to reads of invalid memory if the
+                                        * source is at the end of address space.
+                                        */
+                                       size = mono_class_value_size (mono_class_from_mono_type (t), &align);
                                }
-                               g_assert (in->klass);
+                       }
 
-                               if (ainfo->storage == ArgOnStack && size >= 10000) {
-                                       /* Avoid asserts in emit_memcpy () */
-                                       cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
-                                       cfg->exception_message = g_strdup_printf ("Passing an argument of size '%d'.", size);
-                                       /* Continue normally */
-                               }
+                       if (size >= 10000) {
+                               /* Avoid asserts in emit_memcpy () */
+                               cfg->exception_type = MONO_EXCEPTION_INVALID_PROGRAM;
+                               cfg->exception_message = g_strdup_printf ("Passing an argument of size '%d'.", size);
+                               /* Continue normally */
+                       }
 
-                               if (size > 0) {
-                                       MONO_INST_NEW (cfg, arg, OP_OUTARG_VT);
-                                       arg->sreg1 = in->dreg;
-                                       arg->klass = mono_class_from_mono_type (t);
-                                       arg->backend.size = size;
-                                       arg->inst_p0 = call;
-                                       arg->inst_p1 = mono_mempool_alloc (cfg->mempool, sizeof (ArgInfo));
-                                       memcpy (arg->inst_p1, ainfo, sizeof (ArgInfo));
+                       if (size > 0) {
+                               MONO_INST_NEW (cfg, arg, OP_OUTARG_VT);
+                               arg->sreg1 = in->dreg;
+                               arg->klass = mono_class_from_mono_type (t);
+                               arg->backend.size = size;
+                               arg->inst_p0 = call;
+                               arg->inst_p1 = mono_mempool_alloc (cfg->mempool, sizeof (ArgInfo));
+                               memcpy (arg->inst_p1, ainfo, sizeof (ArgInfo));
 
-                                       MONO_ADD_INS (cfg->cbb, arg);
-                               }
+                               MONO_ADD_INS (cfg->cbb, arg);
                        }
                        break;
+               }
                default:
                        g_assert_not_reached ();
                }
@@ -2372,49 +2376,50 @@ mono_arch_emit_call (MonoCompile *cfg, MonoCallInst *call)
        if (!sig->pinvoke && (sig->call_convention == MONO_CALL_VARARG) && (n == sig->sentinelpos))
                emit_sig_cookie (cfg, call, cinfo);
 
-       sig_ret = mini_get_underlying_type (sig->ret);
-       if (sig_ret && MONO_TYPE_ISSTRUCT (sig_ret)) {
-               MonoInst *vtarg;
-
-               if (cinfo->ret.storage == ArgValuetypeInReg) {
-                       if (cinfo->ret.pair_storage [0] == ArgInIReg && cinfo->ret.pair_storage [1] == ArgNone) {
-                               /*
-                                * Tell the JIT to use a more efficient calling convention: call using
-                                * OP_CALL, compute the result location after the call, and save the 
-                                * result there.
-                                */
-                               call->vret_in_reg = TRUE;
-                               /* 
-                                * Nullify the instruction computing the vret addr to enable 
-                                * future optimizations.
-                                */
-                               if (call->vret_var)
-                                       NULLIFY_INS (call->vret_var);
-                       } else {
-                               if (call->tail_call)
-                                       NOT_IMPLEMENTED;
-                               /*
-                                * The valuetype is in RAX:RDX after the call, need to be copied to
-                                * the stack. Push the address here, so the call instruction can
-                                * access it.
-                                */
-                               if (!cfg->arch.vret_addr_loc) {
-                                       cfg->arch.vret_addr_loc = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL);
-                                       /* Prevent it from being register allocated or optimized away */
-                                       ((MonoInst*)cfg->arch.vret_addr_loc)->flags |= MONO_INST_VOLATILE;
-                               }
-
-                               MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ((MonoInst*)cfg->arch.vret_addr_loc)->dreg, call->vret_var->dreg);
+       switch (cinfo->ret.storage) {
+       case ArgValuetypeInReg:
+               if (cinfo->ret.pair_storage [0] == ArgInIReg && cinfo->ret.pair_storage [1] == ArgNone) {
+                       /*
+                        * Tell the JIT to use a more efficient calling convention: call using
+                        * OP_CALL, compute the result location after the call, and save the
+                        * result there.
+                        */
+                       call->vret_in_reg = TRUE;
+                       /*
+                        * Nullify the instruction computing the vret addr to enable
+                        * future optimizations.
+                        */
+                       if (call->vret_var)
+                               NULLIFY_INS (call->vret_var);
+               } else {
+                       if (call->tail_call)
+                               NOT_IMPLEMENTED;
+                       /*
+                        * The valuetype is in RAX:RDX after the call, need to be copied to
+                        * the stack. Push the address here, so the call instruction can
+                        * access it.
+                        */
+                       if (!cfg->arch.vret_addr_loc) {
+                               cfg->arch.vret_addr_loc = mono_compile_create_var (cfg, &mono_defaults.int_class->byval_arg, OP_LOCAL);
+                               /* Prevent it from being register allocated or optimized away */
+                               ((MonoInst*)cfg->arch.vret_addr_loc)->flags |= MONO_INST_VOLATILE;
                        }
-               }
-               else {
-                       MONO_INST_NEW (cfg, vtarg, OP_MOVE);
-                       vtarg->sreg1 = call->vret_var->dreg;
-                       vtarg->dreg = mono_alloc_preg (cfg);
-                       MONO_ADD_INS (cfg->cbb, vtarg);
 
-                       mono_call_inst_add_outarg_reg (cfg, call, vtarg->dreg, cinfo->ret.reg, FALSE);
+                       MONO_EMIT_NEW_UNALU (cfg, OP_MOVE, ((MonoInst*)cfg->arch.vret_addr_loc)->dreg, call->vret_var->dreg);
                }
+               break;
+       case ArgValuetypeAddrInIReg: {
+               MonoInst *vtarg;
+               MONO_INST_NEW (cfg, vtarg, OP_MOVE);
+               vtarg->sreg1 = call->vret_var->dreg;
+               vtarg->dreg = mono_alloc_preg (cfg);
+               MONO_ADD_INS (cfg->cbb, vtarg);
+
+               mono_call_inst_add_outarg_reg (cfg, call, vtarg->dreg, cinfo->ret.reg, FALSE);
+               break;
+       }
+       default:
+               break;
        }
 
        if (cfg->method->save_lmf) {
@@ -2433,7 +2438,8 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
        ArgInfo *ainfo = (ArgInfo*)ins->inst_p1;
        int size = ins->backend.size;
 
-       if (ainfo->storage == ArgValuetypeInReg) {
+       switch (ainfo->storage) {
+       case ArgValuetypeInReg: {
                MonoInst *load;
                int part;
 
@@ -2460,7 +2466,9 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
 
                        add_outarg_reg (cfg, call, ainfo->pair_storage [part], ainfo->pair_regs [part], load);
                }
-       } else if (ainfo->storage == ArgValuetypeAddrInIReg) {
+               break;
+       }
+       case ArgValuetypeAddrInIReg: {
                MonoInst *vtaddr, *load;
                vtaddr = mono_compile_create_var (cfg, &ins->klass->byval_arg, OP_LOCAL);
                
@@ -2484,7 +2492,16 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
                } else {
                        MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STORE_MEMBASE_REG, AMD64_RSP, ainfo->offset, load->dreg);
                }
-       } else {
+               break;
+       }
+       case ArgGSharedVtInReg:
+               /* Pass by addr */
+               mono_call_inst_add_outarg_reg (cfg, call, src->dreg, ainfo->reg, FALSE);
+               break;
+       case ArgGSharedVtOnStack:
+               g_assert_not_reached ();
+               break;
+       default:
                if (size == 8) {
                        int dreg = mono_alloc_ireg (cfg);
 
index e92a280219623d591227daf9742c2b3c1ae58e0d..2a0dfcfbeb572ae3c033b58f012f61672c173bc2 100644 (file)
@@ -932,6 +932,7 @@ mono_arch_init (void)
 #if defined(ENABLE_GSHAREDVT)
        mono_aot_register_jit_icall ("mono_arm_start_gsharedvt_call", mono_arm_start_gsharedvt_call);
 #endif
+       mono_aot_register_jit_icall ("mono_arm_unaligned_stack", mono_arm_unaligned_stack);
 
 #if defined(__ARM_EABI__)
        eabi_supported = TRUE;
@@ -6028,6 +6029,7 @@ mono_arch_register_lowlevel_calls (void)
        /* The signature doesn't matter */
        mono_register_jit_icall (mono_arm_throw_exception, "mono_arm_throw_exception", mono_create_icall_signature ("void"), TRUE);
        mono_register_jit_icall (mono_arm_throw_exception_by_token, "mono_arm_throw_exception_by_token", mono_create_icall_signature ("void"), TRUE);
+       mono_register_jit_icall (mono_arm_unaligned_stack, "mono_arm_unaligned_stack", mono_create_icall_signature ("void"), TRUE);
 
 #ifndef MONO_CROSS_COMPILE
        if (mono_arm_have_tls_get ()) {
@@ -6136,6 +6138,12 @@ mono_arch_patch_code_new (MonoCompile *cfg, MonoDomain *domain, guint8 *code, Mo
        }
 }
 
+void
+mono_arm_unaligned_stack (MonoMethod *method)
+{
+       g_assert_not_reached ();
+}
+
 #ifndef DISABLE_JIT
 
 /*
@@ -6292,6 +6300,27 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                        max_offset += ((guint8 *)ins_get_spec (ins->opcode))[MONO_INST_LEN];
        }
 
+       /* stack alignment check */
+       /*
+       {
+               guint8 *buf [16];
+               ARM_MOV_REG_REG (code, ARMREG_LR, ARMREG_SP);
+               code = mono_arm_emit_load_imm (code, ARMREG_IP, MONO_ARCH_FRAME_ALIGNMENT -1);
+               ARM_AND_REG_REG (code, ARMREG_LR, ARMREG_LR, ARMREG_IP);
+               ARM_CMP_REG_IMM (code, ARMREG_LR, 0, 0);
+               buf [0] = code;
+               ARM_B_COND (code, ARMCOND_EQ, 0);
+               if (cfg->compile_aot)
+                       ARM_MOV_REG_IMM8 (code, ARMREG_R0, 0);
+               else
+                       code = mono_arm_emit_load_imm (code, ARMREG_R0, (guint32)cfg->method);
+               mono_add_patch_info (cfg, code - cfg->native_code, MONO_PATCH_INFO_INTERNAL_METHOD, "mono_arm_unaligned_stack");
+               code = emit_call_seq (cfg, code);
+               code = emit_call_reg (code, ARMREG_LR);
+               arm_patch (buf [0], code);
+       }
+       */
+
        /* store runtime generic context */
        if (cfg->rgctx_var) {
                MonoInst *ins = cfg->rgctx_var;
index 5135fcbb94808cdea4d403716a883cdd7b2326fd..35ce0fa9810091435f04dfc784c951abbcf0141a 100644 (file)
@@ -359,4 +359,7 @@ mono_arm_is_hard_float (void);
 gboolean
 mono_arm_have_tls_get (void);
 
+void
+mono_arm_unaligned_stack (MonoMethod *method);
+
 #endif /* __MONO_MINI_ARM_H__ */
index 13ac12780b35bbe20ce27ab2e64733c3b3849212..c6efc5b78f864f67a42613376e6462921b8c9a02 100644 (file)
@@ -2754,9 +2754,6 @@ mini_type_is_hfa (MonoType *t, int *out_nfields, int *out_esize)
                                return FALSE;
                        prev_ftype = ftype;
                        nfields += nested_nfields;
-                       // FIXME: Nested float structs are aligned to 8 bytes
-                       if (ftype->type == MONO_TYPE_R4)
-                               return FALSE;
                } else {
                        if (!(!ftype->byref && (ftype->type == MONO_TYPE_R4 || ftype->type == MONO_TYPE_R8)))
                                return FALSE;
index fd0601355a5cec2f1cda9f042c9cdfb7fdea7a6b..af0c5a7de221c1bce80457e11794abd1bfda2c35 100644 (file)
@@ -4741,31 +4741,20 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
                        builder = ctx->builder = create_builder (ctx);
                        LLVMPositionBuilderAtEnd (builder, poll_bb);
 
-                       MonoMethodSignature *sig = mono_metadata_signature_alloc (mono_get_corlib (), 0);
-                       sig->ret = &mono_get_void_class ()->byval_arg;
-                       icall_name = "mono_threads_state_poll";
-                       llvm_sig = sig_to_llvm_sig (ctx, sig);
-
-                       if (ctx->cfg->compile_aot) {
-                               callee = ctx->lmodule->state_poll;
-                               if (!callee) {
-                                       MonoMethodSignature *sig = mono_metadata_signature_alloc (mono_get_corlib (), 0);
-                                       sig->ret = &mono_get_void_class ()->byval_arg;
-                                       llvm_sig = sig_to_llvm_sig (ctx, sig);
+                       callee = ctx->lmodule->state_poll;
+                       if (!callee) {
+                               MonoMethodSignature *sig = mono_metadata_signature_alloc (mono_get_corlib (), 0);
+                               sig->ret = &mono_get_void_class ()->byval_arg;
+                               llvm_sig = sig_to_llvm_sig (ctx, sig);
+                               icall_name = "mono_threads_state_poll";
 
+                               if (ctx->cfg->compile_aot) {
                                        callee = get_plt_entry (ctx, llvm_sig, MONO_PATCH_INFO_INTERNAL_METHOD, icall_name);
-                               }
-                       } else {
-                               callee = ctx->lmodule->state_poll;
-                               if (!callee) {
-                                       MonoMethodSignature *sig = mono_metadata_signature_alloc (mono_get_corlib (), 0);
-                                       sig->ret = &mono_get_void_class ()->byval_arg;
-                                       llvm_sig = sig_to_llvm_sig (ctx, sig);
-
+                               } else {
                                        callee = LLVMAddFunction (ctx->module, icall_name, llvm_sig);
                                        LLVMAddGlobalMapping (ctx->lmodule->ee, callee, resolve_patch (ctx->cfg, MONO_PATCH_INFO_INTERNAL_METHOD, icall_name));
-                                       ctx->lmodule->state_poll = callee;
                                }
+                               ctx->lmodule->state_poll = callee;
                        }
                        //
                        // FIXME: This can use the PreserveAll cconv to avoid clobbering registers.
index 8e42c09edf0a458cc6bb3de9228c8fc5097ed1e6..9963cb994d5fe57c5a9e1c4d049c00216fe1b367 100644 (file)
@@ -2676,9 +2676,11 @@ mini_parse_debug_options (void)
                        mono_set_partial_sharing_supported (TRUE);
                else if (!strcmp (arg, "align-small-structs"))
                        mono_align_small_structs = TRUE;
+               else if (!strcmp (arg, "native-debugger-break"))
+                       debug_options.native_debugger_break = TRUE;
                else {
                        fprintf (stderr, "Invalid option for the MONO_DEBUG env variable: %s\n", arg);
-                       fprintf (stderr, "Available options: 'handle-sigint', 'keep-delegates', 'reverse-pinvoke-exceptions', 'collect-pagefault-stats', 'break-on-unverified', 'no-gdb-backtrace', 'suspend-on-sigsegv', 'suspend-on-exception', 'suspend-on-unhandled', 'dont-free-domains', 'dyn-runtime-invoke', 'gdb', 'explicit-null-checks', 'gen-seq-points', 'gen-compact-seq-points', 'single-imm-size', 'init-stacks', 'casts', 'soft-breakpoints', 'check-pinvoke-callconv', 'arm-use-fallback-tls', 'debug-domain-unload', 'partial-sharing', 'align-small-structs'\n");
+                       fprintf (stderr, "Available options: 'handle-sigint', 'keep-delegates', 'reverse-pinvoke-exceptions', 'collect-pagefault-stats', 'break-on-unverified', 'no-gdb-backtrace', 'suspend-on-sigsegv', 'suspend-on-exception', 'suspend-on-unhandled', 'dont-free-domains', 'dyn-runtime-invoke', 'gdb', 'explicit-null-checks', 'gen-seq-points', 'gen-compact-seq-points', 'single-imm-size', 'init-stacks', 'casts', 'soft-breakpoints', 'check-pinvoke-callconv', 'arm-use-fallback-tls', 'debug-domain-unload', 'partial-sharing', 'align-small-structs', 'native-debugger-break'\n");
                        exit (1);
                }
        }
index b47a0ab2f8763752a2e6ba1984d86736315dd4fa..cf8929516eef1eb8a2a51dfe72bc66518fc20343 100644 (file)
@@ -1947,6 +1947,10 @@ typedef struct {
         * Check for pinvoke calling convention mismatches.
         */
        gboolean check_pinvoke_callconv;
+       /*
+        * Translate Debugger.Break () into a native breakpoint signal
+        */
+       gboolean native_debugger_break;
 } MonoDebugOptions;
 
 enum {
index 0df2d3cd1af74d33f445fa11a8beaef0d820a95e..4ee385504bea1c339957a3080e005c3bfaf02b41 100644 (file)
@@ -2183,6 +2183,28 @@ coverage_add_coverage (CoverageCoverage *coverage)
 #define OBJ_ADDR(diff) ((obj_base + diff) << 3)
 #define LOG_TIME(base,diff) /*fprintf("outfile, time %llu + %llu near offset %d\n", base, diff, p - ctx->buf)*/
 
+
+/* Stats */
+#define BUFFER_HEADER_SIZE 48
+
+typedef struct {
+       int count, min_size, max_size, bytes;
+} EventStat;
+
+static int buffer_count;
+static EventStat stats [256];
+
+static void
+record_event_stats (int type, int size)
+{
+       ++stats [type].count;
+       if (!stats [type].min_size)
+               stats [type].min_size = size;
+       stats [type].min_size = MIN (stats [type].min_size, size);
+       stats [type].max_size = MAX (stats [type].max_size, size);
+       stats [type].bytes += size;
+}
+
 static int
 decode_buffer (ProfContext *ctx)
 {
@@ -2224,6 +2246,9 @@ decode_buffer (ProfContext *ctx)
        thread = load_thread (ctx, thread_id);
        if (!load_data (ctx, len))
                return 0;
+
+       ++buffer_count;
+
        if (!startup_time) {
                startup_time = time_base;
                if (use_time_filter) {
@@ -2238,6 +2263,8 @@ decode_buffer (ProfContext *ctx)
        p = ctx->buf;
        end = p + len;
        while (p < end) {
+               unsigned char *start = p;
+               unsigned char event = *p;
                switch (*p & 0xf) {
                case TYPE_GC: {
                        int subtype = *p & 0xf0;
@@ -3010,6 +3037,7 @@ decode_buffer (ProfContext *ctx)
                        fprintf (outfile, "unhandled profiler event: 0x%x at file offset: %llu + %lld (len: %d\n)\n", *p, (unsigned long long) file_offset, (long long) (p - ctx->buf), len);
                        exit (1);
                }
+               record_event_stats (event, p - start);
        }
        thread->last_time = time_base;
        for (i = 0; i < thread->stack_id; ++i)
@@ -3699,6 +3727,73 @@ dump_coverage (void)
        }
 }
 
+#define DUMP_EVENT_STAT(EVENT,SUBTYPE) dump_event (#EVENT, #SUBTYPE, EVENT, SUBTYPE);
+
+static void
+dump_event (const char *event_name, const char *subtype_name, int event, int subtype)
+{
+       int idx = event | subtype;
+       EventStat evt = stats [idx];
+       if (!evt.count)
+               return;
+
+       fprintf (outfile, "\t%16s\t%26s\tcount %6d\tmin %3d\tmax %6d\tbytes %d\n", event_name, subtype_name, evt.count, evt.min_size, evt.max_size, evt.bytes);
+}
+
+static void
+dump_stats (void)
+{
+       fprintf (outfile, "\nMlpd statistics\n");
+       fprintf (outfile, "\tBuffer count %d\toverhead %d (%d bytes per header)\n", buffer_count, buffer_count * BUFFER_HEADER_SIZE, BUFFER_HEADER_SIZE);
+       fprintf (outfile, "\nEvent details:\n");
+
+       DUMP_EVENT_STAT (TYPE_ALLOC, TYPE_ALLOC_NO_BT);
+       DUMP_EVENT_STAT (TYPE_ALLOC, TYPE_ALLOC_BT);
+
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_EVENT);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_RESIZE);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_MOVE);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_HANDLE_CREATED);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_HANDLE_DESTROYED);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_HANDLE_CREATED_BT);
+       DUMP_EVENT_STAT (TYPE_GC, TYPE_GC_HANDLE_DESTROYED_BT);
+
+       DUMP_EVENT_STAT (TYPE_METADATA, TYPE_END_LOAD);
+       DUMP_EVENT_STAT (TYPE_METADATA, TYPE_END_UNLOAD);
+
+       DUMP_EVENT_STAT (TYPE_METHOD, TYPE_LEAVE);
+       DUMP_EVENT_STAT (TYPE_METHOD, TYPE_ENTER);
+       DUMP_EVENT_STAT (TYPE_METHOD, TYPE_EXC_LEAVE);
+       DUMP_EVENT_STAT (TYPE_METHOD, TYPE_JIT);
+
+       DUMP_EVENT_STAT (TYPE_EXCEPTION, TYPE_THROW);
+       DUMP_EVENT_STAT (TYPE_EXCEPTION, TYPE_CLAUSE);
+       DUMP_EVENT_STAT (TYPE_EXCEPTION, TYPE_EXCEPTION_BT);
+
+       DUMP_EVENT_STAT (TYPE_MONITOR, TYPE_MONITOR_NO_BT);
+       DUMP_EVENT_STAT (TYPE_MONITOR, TYPE_MONITOR_BT);
+
+       DUMP_EVENT_STAT (TYPE_HEAP, TYPE_HEAP_START);
+       DUMP_EVENT_STAT (TYPE_HEAP, TYPE_HEAP_END);
+       DUMP_EVENT_STAT (TYPE_HEAP, TYPE_HEAP_OBJECT);
+       DUMP_EVENT_STAT (TYPE_HEAP, TYPE_HEAP_ROOT);
+
+       DUMP_EVENT_STAT (TYPE_SAMPLE, TYPE_SAMPLE_HIT);
+       DUMP_EVENT_STAT (TYPE_SAMPLE, TYPE_SAMPLE_USYM);
+       DUMP_EVENT_STAT (TYPE_SAMPLE, TYPE_SAMPLE_UBIN);
+       DUMP_EVENT_STAT (TYPE_SAMPLE, TYPE_SAMPLE_COUNTERS_DESC);
+       DUMP_EVENT_STAT (TYPE_SAMPLE, TYPE_SAMPLE_COUNTERS);
+
+       DUMP_EVENT_STAT (TYPE_RUNTIME, TYPE_JITHELPER);
+
+       DUMP_EVENT_STAT (TYPE_COVERAGE, TYPE_COVERAGE_ASSEMBLY);
+       DUMP_EVENT_STAT (TYPE_COVERAGE, TYPE_COVERAGE_METHOD);
+       DUMP_EVENT_STAT (TYPE_COVERAGE, TYPE_COVERAGE_STATEMENT);
+       DUMP_EVENT_STAT (TYPE_COVERAGE, TYPE_COVERAGE_CLASS);
+}
+
+
+
 static void
 flush_context (ProfContext *ctx)
 {
@@ -3808,6 +3903,11 @@ print_reports (ProfContext *ctx, const char *reps, int parse_only)
                                dump_coverage ();
                        continue;
                }
+               if ((opt = match_option (p, "stats")) != p) {
+                       if (!parse_only)
+                               dump_stats ();
+                       continue;
+               }
                return 0;
        }
        return 1;
index 548d86b5065448c0981f2d64fa1fbdb92e883795..f1c8af5bf8b3c384ae5e800d1da53535b22683bb 100644 (file)
@@ -72,9 +72,11 @@ enum {
        TYPE_CLAUSE       = 1 << 4,
        TYPE_EXCEPTION_BT = 1 << 7,
        /* extended type for TYPE_ALLOC */
-       TYPE_ALLOC_BT  = 1 << 4,
+       TYPE_ALLOC_NO_BT  = 0 << 4,
+       TYPE_ALLOC_BT     = 1 << 4,
        /* extended type for TYPE_MONITOR */
-       TYPE_MONITOR_BT  = 1 << 7,
+       TYPE_MONITOR_NO_BT  = 0 << 7,
+       TYPE_MONITOR_BT     = 1 << 7,
        /* extended type for TYPE_SAMPLE */
        TYPE_SAMPLE_HIT           = 0 << 4,
        TYPE_SAMPLE_USYM          = 1 << 4,
index e3c62b5d4adda093f111c08ccd243dac3e4fd109..42946608efb263103d2e66368fcabd2c3b76c1ee 100755 (executable)
@@ -104,6 +104,8 @@ check_alloc_traces ($report,
 );
 report_errors ();
 
+emit_nunit_report();
+
 exit ($total_errors? 1: 0);
 
 # utility functions
@@ -159,6 +161,61 @@ sub report_errors
        #print $report;
 }
 
+sub emit_nunit_report
+{
+       use Cwd;
+       use POSIX qw(strftime uname locale_h);
+       use Net::Domain qw(hostname hostfqdn);
+       use locale;
+
+       my $failed = $total_errors ? 1 : 0;
+       my $successbool;
+       my $total = 1;
+       my $mylocale = setlocale (LC_CTYPE);
+       $mylocale = substr($mylocale, 0, index($mylocale, '.'));
+       $mylocale =~ s/_/-/;
+
+       if ($failed > 0) {
+               $successbool = "False";
+       } else {
+               $successbool = "True";
+       }
+       open (my $nunitxml, '>', 'TestResults_profiler.xml') or die "Could not write to 'TestResults_profiler.xml' $!";
+       print $nunitxml "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>\n";
+       print $nunitxml "<!--This file represents the results of running a test suite-->\n";
+       print $nunitxml "<test-results name=\"profiler-tests.dummy\" total=\"$total\" failures=\"$failed\" not-run=\"0\" date=\"" . strftime ("%F", localtime) . "\" time=\"" . strftime ("%T", localtime) . "\">\n";
+       print $nunitxml "  <environment nunit-version=\"2.4.8.0\" clr-version=\"4.0.30319.17020\" os-version=\"Unix " . (uname ())[2]  . "\" platform=\"Unix\" cwd=\"" . getcwd . "\" machine-name=\"" . hostname . "\" user=\"" . getpwuid ($<) . "\" user-domain=\"" . hostfqdn  . "\" />\n";
+       print $nunitxml "  <culture-info current-culture=\"$mylocale\" current-uiculture=\"$mylocale\" />\n";
+       print $nunitxml "  <test-suite name=\"profiler-tests.dummy\" success=\"$successbool\" time=\"0\" asserts=\"0\">\n";
+       print $nunitxml "    <results>\n";
+       print $nunitxml "      <test-suite name=\"MonoTests\" success=\"$successbool\" time=\"0\" asserts=\"0\">\n";
+       print $nunitxml "        <results>\n";
+       print $nunitxml "          <test-suite name=\"profiler\" success=\"$successbool\" time=\"0\" asserts=\"0\">\n";
+       print $nunitxml "            <results>\n";
+       print $nunitxml "              <test-case name=\"MonoTests.profiler.100percentsuccess\" executed=\"True\" success=\"$successbool\" time=\"0\" asserts=\"0\"";
+       if ( $failed > 0) {
+       print $nunitxml ">\n";
+       print $nunitxml "                <failure>\n";
+       print $nunitxml "                  <message><![CDATA[";
+       print $nunitxml "The profiler tests returned an error. Check the log for more details.";
+       print $nunitxml "]]></message>\n";
+       print $nunitxml "                  <stack-trace>\n";
+       print $nunitxml "                  </stack-trace>\n";
+       print $nunitxml "                </failure>\n";
+       print $nunitxml "              </test-case>\n";
+       } else {
+       print $nunitxml " />\n";
+       }
+       print $nunitxml "            </results>\n";
+       print $nunitxml "          </test-suite>\n";
+       print $nunitxml "        </results>\n";
+       print $nunitxml "      </test-suite>\n";
+       print $nunitxml "    </results>\n";
+       print $nunitxml "  </test-suite>\n";
+       print $nunitxml "</test-results>\n";
+       close $nunitxml;
+}
+
 sub get_delim_data
 {
        my $report = shift;
index 2c2369589e143fde0125a2b1ca09046b99620031..10e0da01b2e9a24119c0b45f6eef17afe506e58d 100644 (file)
@@ -7,7 +7,6 @@ if PLATFORM_DARWIN
 test_ldflags = -framework CoreFoundation -framework Foundation
 endif
 
-
 if !CROSS_COMPILE
 if !HOST_WIN32
 if SUPPORT_BOEHM
@@ -40,6 +39,16 @@ noinst_PROGRAMS = test-sgen-qsort test-memfuncs test-mono-linked-list-set test-c
 
 TESTS = test-sgen-qsort test-memfuncs test-mono-linked-list-set test-conc-hashtable
 
+.NOTPARALLEL:
+
+check-local:
+       if [ -e test-suite.log ]; then \
+               if grep -q "# FAIL:  0\|tests passed" test-suite.log; then successbool=True && failures=0; else successbool=False && failures=1; fi; \
+               echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='$$failures' total='1' not-run='0' name='unit-tests.dummy' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='MonoTests.unit-tests' success='$$successbool' time='0'><results><test-case name='MonoTests.unit-tests.100percentsuccess' executed='True' success='$$successbool' time='0'>" > TestResult-unit-tests.xml; \
+               if [ $$failures -ne 0 ]; then echo "<failure><message>"'<![CDATA[' >> TestResult-unit-tests.xml && cat test-suite.log >> TestResult-unit-tests.xml && echo "]]></message><stack-trace></stack-trace></failure>" >> TestResult-unit-tests.xml; fi; \
+               echo "</test-case></results></test-suite></test-results>" >> TestResult-unit-tests.xml; \
+       fi;
+
 endif SUPPORT_BOEHM
 endif !HOST_WIN32
 endif !CROSS_COMPILE
index a2a0b7e4dc23a9d3a678555e8c4ee14745ed83bd..6faaedf14aa57923cb1ad81259136ab09f2ecb39 100644 (file)
 #include <signal.h>
 #endif
 
-#if defined (HOST_WATCHOS) || defined (HOST_APPLETVOS)
-#include <libunwind.h>
-#endif
-
 /*
  * General notes about mono-context.
  * Each arch defines a MonoContext struct with all GPR regs + IP/PC.
@@ -183,11 +179,11 @@ extern void mono_context_get_current (void *);
 #define MONO_CONTEXT_GET_CURRENT(ctx)  \
        __asm__ __volatile__(   \
                "movq $0x0,  %%nacl:0x00(%%r15, %0, 1)\n"       \
-               "movq %%rbx, %%nacl:0x08(%%r15, %0, 1)\n"       \
-               "movq %%rcx, %%nacl:0x10(%%r15, %0, 1)\n"       \
-               "movq %%rdx, %%nacl:0x18(%%r15, %0, 1)\n"       \
-               "movq %%rbp, %%nacl:0x20(%%r15, %0, 1)\n"       \
-               "movq %%rsp, %%nacl:0x28(%%r15, %0, 1)\n"       \
+               "movq %%rcx, %%nacl:0x08(%%r15, %0, 1)\n"       \
+               "movq %%rdx, %%nacl:0x10(%%r15, %0, 1)\n"       \
+               "movq %%rbx, %%nacl:0x18(%%r15, %0, 1)\n"       \
+               "movq %%rsp, %%nacl:0x20(%%r15, %0, 1)\n"       \
+               "movq %%rbp, %%nacl:0x28(%%r15, %0, 1)\n"       \
                "movq %%rsi, %%nacl:0x30(%%r15, %0, 1)\n"       \
                "movq %%rdi, %%nacl:0x38(%%r15, %0, 1)\n"       \
                "movq %%r8,  %%nacl:0x40(%%r15, %0, 1)\n"       \
@@ -204,14 +200,15 @@ extern void mono_context_get_current (void *);
                : "a" ((int64_t)&(ctx)) \
                : "rdx", "memory")
 #else
+
 #define MONO_CONTEXT_GET_CURRENT(ctx)  \
        __asm__ __volatile__(   \
                "movq $0x0,  0x00(%0)\n"        \
-               "movq %%rbx, 0x08(%0)\n"        \
-               "movq %%rcx, 0x10(%0)\n"        \
-               "movq %%rdx, 0x18(%0)\n"        \
-               "movq %%rbp, 0x20(%0)\n"        \
-               "movq %%rsp, 0x28(%0)\n"        \
+               "movq %%rcx, 0x08(%0)\n"        \
+               "movq %%rdx, 0x10(%0)\n"        \
+               "movq %%rbx, 0x18(%0)\n"        \
+               "movq %%rsp, 0x20(%0)\n"        \
+               "movq %%rbp, 0x28(%0)\n"        \
                "movq %%rsi, 0x30(%0)\n"        \
                "movq %%rdi, 0x38(%0)\n"        \
                "movq %%r8,  0x40(%0)\n"        \
@@ -255,26 +252,6 @@ typedef struct {
 #if defined(HOST_WATCHOS)
 
 #define MONO_CONTEXT_GET_CURRENT(ctx) do { \
-       unw_context_t uctx; \
-       unw_cursor_t c; \
-       unw_word_t data; \
-       g_assert (unw_getcontext (&uctx) == 0); \
-       g_assert (unw_init_local (&c, &uctx) == 0); \
-       for (int reg = 0; reg < 13; ++reg) { \
-               unw_get_reg (&c, (unw_regnum_t) UNW_ARM_R0 + reg, &data); \
-               ctx.regs[reg] = data; \
-       } \
-       unw_get_reg (&c, UNW_ARM_SP, &data); \
-       ctx.regs[ARMREG_SP] = data; \
-       unw_get_reg (&c, UNW_ARM_LR, &data); \
-       ctx.regs[ARMREG_LR] = data; \
-       unw_get_reg (&c, UNW_ARM_IP, &data); \
-       ctx.regs[ARMREG_PC] = data; \
-       ctx.pc = ctx.regs[ARMREG_PC]; \
-       for (int reg = 0; reg < 16; ++reg) { \
-               unw_get_reg (&c, (unw_regnum_t) UNW_ARM_D0 + reg, &data); \
-               ctx.fregs[reg] = data; \
-       } \
 } while (0);
 
 #else
index d253bd07b4a60b38f14f149a5f6ca77fde423154..fc5bcc966a7105f964abe575254493d9498aa50b 100644 (file)
@@ -97,9 +97,8 @@ mono_network_get_data (char* name, MonoNetworkData data, MonoNetworkError *error
 
                char *ptr;
                buf [sizeof (buf) - 1] = 0;
-               /* FIXME: This might potentially cause a buffer overflow for cname. */
                if ((ptr = strchr (buf, ':')) == NULL ||
-                               (*ptr++ = 0, sscanf (buf, "%s", cname) != 1))
+                               (*ptr++ = 0, sscanf (buf, "%250s", cname) != 1))
                        goto out;
 
                if (strcmp (name, cname) != 0) continue;
index e84e409bf64f627b9f07de38282d23fbee655419..c0bfbec293daabd03924a2664d9cda4d5a230024 100644 (file)
@@ -417,7 +417,7 @@ mono_threads_unregister_current_thread (MonoThreadInfo *info)
 MonoThreadInfo*
 mono_thread_info_current_unchecked (void)
 {
-       return thread_info_key ? (MonoThreadInfo*)mono_native_tls_get_value (thread_info_key) : NULL;
+       return mono_threads_inited ? (MonoThreadInfo*)mono_native_tls_get_value (thread_info_key) : NULL;
 }
 
 
@@ -574,8 +574,6 @@ mono_threads_init (MonoThreadInfoCallbacks *callbacks, size_t info_size)
        res = mono_native_tls_alloc (&thread_exited_key, (void *) thread_exited_dtor);
 #endif
 
-       g_assert (thread_info_key);
-
        g_assert (res);
 
 #ifndef HAVE_KW_THREAD
index 003b4d2f3397714845abbc9c24b8c25a81e41052..693b2fdd82198819281ee5e676635dde71ed62f0 100644 (file)
@@ -472,27 +472,6 @@ mono_threads_pthread_kill (THREAD_INFO_TYPE *info, int signum);
 
 #endif /* !defined(HOST_WIN32) */
 
-/* Plartform specific functions DON'T use them */
-void mono_threads_init_platform (void); //ok
-gboolean mono_threads_core_suspend (THREAD_INFO_TYPE *info, gboolean interrupt_kernel);
-gboolean mono_threads_core_resume (THREAD_INFO_TYPE *info);
-void mono_threads_platform_register (THREAD_INFO_TYPE *info); //ok
-void mono_threads_platform_free (THREAD_INFO_TYPE *info);
-void mono_threads_core_abort_syscall (THREAD_INFO_TYPE *info);
-gboolean mono_threads_core_needs_abort_syscall (void);
-HANDLE mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start, gpointer arg, guint32 stack_size, guint32 creation_flags, MonoNativeThreadId *out_tid);
-void mono_threads_core_resume_created (THREAD_INFO_TYPE *info, MonoNativeThreadId tid);
-void mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize);
-gboolean mono_threads_core_yield (void);
-void mono_threads_core_exit (int exit_code);
-void mono_threads_core_unregister (THREAD_INFO_TYPE *info);
-HANDLE mono_threads_core_open_handle (void);
-HANDLE mono_threads_core_open_thread_handle (HANDLE handle, MonoNativeThreadId tid);
-void mono_threads_core_set_name (MonoNativeThreadId tid, const char *name);
-
-void mono_threads_core_begin_global_suspend (void);
-void mono_threads_core_end_global_suspend (void);
-
 /* Internal API between mono-threads and its backends. */
 
 /* Backend functions - a backend must implement all of the following */
@@ -544,6 +523,9 @@ HANDLE mono_threads_core_open_handle (void);
 HANDLE mono_threads_core_open_thread_handle (HANDLE handle, MonoNativeThreadId tid);
 void mono_threads_core_set_name (MonoNativeThreadId tid, const char *name);
 
+void mono_threads_core_begin_global_suspend (void);
+void mono_threads_core_end_global_suspend (void);
+
 MonoNativeThreadId mono_native_thread_id_get (void);
 
 gboolean mono_native_thread_id_equals (MonoNativeThreadId id1, MonoNativeThreadId id2);
index a8ec6d2f0e7771fcc9cd864db8fc221a66c884ff..3907485baf297ebbf7bac4d6c0a66c013e42ff3d 100644 (file)
@@ -1170,6 +1170,7 @@ namespace Mono.Tools.LocaleBuilder
                        // .net has incorrect separators for some countries and we want to be compatible
                        switch (ci.Name) {
                        case "es-ES":
+                       case "es":
                                // es-ES does not have group separator but .net has '.'
                                value = ".";
                                break;