From e458f8df6ded689323d4bd1a2a725ad32668aaec Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 4 Dec 2015 11:31:10 -0800 Subject: [PATCH] Update Reference Sources to .NET Framework 4.6.1 --- .../ServiceModel/Diagnostics/Utility.cs | 2 +- .../AssemblyInfo.cs | 2 +- .../SR.Designer.cs | 0 .../ArgumentIdentifierTrimConverter.cs | 0 .../Core/Presentation/AssignDesigner.xaml.cs | 0 .../CancellationScopeDesigner.xaml.cs | 0 .../Core/Presentation/CaseDesigner.xaml.cs | 0 .../Presentation/CaseKeyBox.ViewInterface.cs | 0 .../Core/Presentation/CaseKeyBox.ViewModel.cs | 0 .../Core/Presentation/CaseKeyBox.xaml.cs | 0 .../CaseKeyBoxIsEnabledConverter.cs | 0 .../CaseLabelVisibilityConverter.cs | 0 .../Core/Presentation/CatchDesigner.xaml.cs | 0 .../Core/Presentation/ComboBoxHelper.cs | 0 .../CompensableActivityDesigner.xaml.cs | 0 .../Core/Presentation/ConnectionPointType.cs | 0 .../DelegateArgumentsValueEditor.cs | 0 .../Core/Presentation/DesignerMetadata.cs | 0 .../Core/Presentation/DisplayNameConverter.cs | 0 .../Core/Presentation/DoWhileDesigner.xaml.cs | 0 .../DynamicActivityPropertyChooser.xaml.cs | 0 ...DynamicActivityPropertyChooserViewModel.cs | 0 ...namicActivityPropertyToTooltipConverter.cs | 0 ...ableItemShowExpandedMultiValueConverter.cs | 0 .../Presentation/ExpandableItemWrapper.cs | 0 .../ExpressionToExpressionTextConverter.cs | 0 .../GenericForEachWithBodyFactory.cs | 0 .../GenericParallelForEachWithBodyFactory.cs | 0 .../Factories/PickWithTwoBranchesFactory.cs | 0 .../StateMachineWithInitialStateFactory.cs | 0 .../Activities/Core/Presentation/FakeRoot.cs | 0 .../Core/Presentation/FinalState.cs | 2 +- .../Presentation/FlowDecisionDesigner.xaml.cs | 0 .../Presentation/FlowDecisionLabelFeature.cs | 0 .../FlowSwitchCaseEditorDialog.cs | 0 .../FlowSwitchDefaultLinkFeature.cs | 0 .../Presentation/FlowSwitchDesigner.xaml.cs | 0 .../Presentation/FlowSwitchLabelFeature.cs | 0 .../Core/Presentation/FlowSwitchLink.cs | 0 .../FlowSwitchLinkCasePropertyEditor.cs | 0 .../FlowSwitchLinkMultiValueConverter.cs | 0 .../FlowchartConnectionPointsAdorner.cs | 0 .../FlowchartDesigner.Container.cs | 0 .../Presentation/FlowchartDesigner.Helpers.cs | 0 .../FlowchartDesigner.ModelChangeReactions.cs | 0 .../FlowchartDesigner.ModelChanges.cs | 0 .../Presentation/FlowchartDesigner.xaml.cs | 0 .../Presentation/FlowchartDesignerCommands.cs | 0 .../FlowchartExpressionAdorner.cs | 0 .../FlowchartExpressionAutomationPeer.cs | 0 .../Presentation/FlowchartFreeFormPanel.cs | 0 .../Core/Presentation/FlowchartResizeGrip.cs | 0 .../Core/Presentation/FlowchartSizeFeature.cs | 0 .../Core/Presentation/ForEachDesigner.xaml.cs | 0 .../Presentation/FreeFormPanelUtilities.cs | 0 .../Presentation/GenericFlowSwitchHelper.cs | 0 .../GenericTypeArgumentConverter.cs | 0 .../Core/Presentation/HintTextConverter.cs | 0 .../Presentation/HintTextMaxWidthConverter.cs | 0 .../Core/Presentation/IFlowSwitch.cs | 0 .../Core/Presentation/IfElseDesigner.xaml.cs | 0 .../Core/Presentation/InteropDesigner.xaml.cs | 0 .../InvokeDelegateDesigner.xaml.cs | 0 .../InvokeDelegateValidationFeature.cs | 0 .../Presentation/InvokeMethodDesigner.xaml.cs | 0 .../IsLastSelectedItemConverter.cs | 0 .../IsStateRootDesignerConverter.cs | 0 .../Presentation/LocationChangedEventArgs.cs | 0 .../Core/Presentation/MaxValueConverter.cs | 0 .../Core/Presentation/MorphHelpers.cs | 0 .../NoPersistScopeDesigner.xaml.cs | 0 .../Core/Presentation/NotConverter.cs | 0 .../Presentation/ParallelDesigner.xaml.cs | 0 .../Presentation/ParallelSeparator.xaml.cs | 0 .../Presentation/PickBranchDesigner.xaml.cs | 0 .../Core/Presentation/PickDesigner.xaml.cs | 0 .../PickValidationErrorSourceLocator.cs | 0 ...PickValidationErrorSourceLocatorFeature.cs | 0 .../Core/Presentation/PropertyNames.cs | 0 .../RegisterMetadataDelayedWorker.cs | 0 .../ReorderableListEditor.xaml.cs | 0 .../SelectedPropertyNameChangedEventArgs.cs | 0 .../Presentation/SequenceDesigner.xaml.cs | 0 .../Activities/Core/Presentation/StartNode.cs | 0 .../Core/Presentation/StartSymbol.xaml.cs | 0 .../StateConnectionPointToolTip.xaml.cs | 0 .../StateContainerEditor.CompositeView.cs | 0 ...ateContainerEditor.ModelChangeReactions.cs | 0 .../StateContainerEditor.ModelChanges.cs | 0 .../StateContainerEditor.Utilities.cs | 0 .../Presentation/StateContainerEditor.xaml.cs | 0 .../Presentation/StateContainerResizeGrip.cs | 0 .../Core/Presentation/StateDesigner.xaml.cs | 0 .../StateLinkButtonToolTipConverter.cs | 0 .../StateMachineConnetionPointsAdorner.cs | 0 .../Presentation/StateMachineDesigner.xaml.cs | 0 .../Presentation/StateMachineFreeFormPanel.cs | 0 ...tateMachineValidationErrorSourceLocator.cs | 0 ...hineValidationErrorSourceLocatorFeature.cs | 0 .../Core/Presentation/SwitchDesigner.xaml.cs | 0 .../SwitchTryCatchDesignerHelper.cs | 0 .../Themes/DesignerStyleDictionary.xaml.cs | 0 .../EditorCategoryTemplateDictionary.xaml.cs | 0 .../Themes/StringResourceDictionary.xaml.cs | 0 .../TransactionScopeDesigner.xaml.cs | 0 .../Presentation/TransitionDesigner.xaml.cs | 0 .../Presentation/TransitionReorderChange.cs | 0 .../Presentation/TryCatchDesigner.xaml.cs | 0 .../Presentation/VerticalConnector.xaml.cs | 0 .../Core/Presentation/WhileDesigner.xaml.cs | 0 .../Presentation/WriteLineDesigner.xaml.cs | 0 .../Presentation/ActivityDesignerHelper.cs | 0 .../ActivityXRefPropertyEditor.cs | 0 .../ArgumentCollectionPropertyEditor.cs | 0 .../DynamicArgumentDesigner.xaml.cs | 0 .../DynamicArgumentDesignerOptions.cs | 0 .../Presentation/DynamicArgumentDialog.cs | 0 .../TypeCollectionDesigner.xaml.cs | 0 .../TypeCollectionPropertyEditor.cs | 0 .../Presentation/ActivityXRefConverter.cs | 0 .../Presentation/BindingEditor.xaml.cs | 0 .../BindingPropertyValueEditor.cs | 0 .../ContentButtonTitleConverter.cs | 0 .../ContentCorrelationTypeExpander.xaml.cs | 0 .../Presentation/ContentDialogViewModel.cs | 0 ...MessageContentSearchableStringConverter.cs | 0 ...ametersContentSearchableStringConverter.cs | 0 ...MessageContentSearchableStringConverter.cs | 0 ...ametersContentSearchableStringConverter.cs | 0 ...thMessageQuerySearchableStringConverter.cs | 0 .../Presentation/CorrelatesOnValueEditor.cs | 0 .../CorrelationDataDesigner.xaml.cs | 0 .../CorrelationInitializerDesigner.xaml.cs | 0 .../CorrelationInitializerValueEditor.cs | 0 .../CorrelationScopeDesigner.xaml.cs | 0 .../Presentation/EndpointDesigner.cs | 0 .../Factories/ReceiveAndSendReplyFactory.cs | 0 .../Factories/SendAndReceiveReplyFactory.cs | 0 .../InitializeCorrelationDesigner.xaml.cs | 0 .../Presentation/MessageQueryEditor.xaml.cs | 0 .../MessageQuerySetDesigner.xaml.cs | 0 ...gingContentPropertyEditorResources.xaml.cs | 0 .../Presentation/ReceiveContentDialog.xaml.cs | 0 .../ReceiveContentPropertyEditor.cs | 0 .../Presentation/ReceiveDesigner.xaml.cs | 0 .../Presentation/ReceiveReplyDesigner.xaml.cs | 0 .../ReceiveReplyValidationFeature.cs | 0 .../Presentation/SendContentDialog.xaml.cs | 0 .../Presentation/SendContentPropertyEditor.cs | 0 .../Presentation/SendDesigner.xaml.cs | 0 .../Presentation/SendReplyDesigner.xaml.cs | 0 .../SendReplyValidationFeature.cs | 0 .../Presentation/ServiceContractImporter.cs | 0 .../TransactedReceiveScope.xaml.cs | 0 .../Presentation/TypeToTreeConverter.cs | 0 .../Presentation/ServiceDesigner.xaml.cs | 0 .../SqlCommandAsyncResult.cs | 6 +- .../Presentation/Xaml/XamlWriterExtensions.cs | 2 +- ...fyArgumentVariableAnnotationTextChanged.cs | 2 +- .../Internal/PropertyEditing/CategoryList.cs | 2 +- .../EditModeSwitchButtonKeyboardFix.cs | 30 +- .../Editors/EditorUtilities.cs | 18 +- .../PropertyEditing/ExtensibilityAccessor.cs | 2 +- .../Framework/Controls/WorkaroundPopup.cs | 16 +- .../CategoryContainer.xaml.cs | 16 +- .../PropertyContainerPopupHelper.cs | 10 +- .../Framework/ValueEditors/ChoiceEditor.cs | 10 +- .../PropertyValueDialogHost.cs | 4 +- .../PropertyEditing/VisualTreeUtils.cs | 2 +- .../Base/Core/Metadata/MetadataStore.cs | 22 +- .../PropertyEditing/EditModeSwitchButton.cs | 2 +- .../CachedResourceDictionaryExtension.cs | 2 +- .../Hosting/WindowHelperService.cs | 2 +- .../Model/ModelItemDictionaryImpl.cs | 4 +- .../Presentation/Model/ModelPropertyImpl.cs | 2 +- .../View/ArgumentDesigner.xaml.cs | 2 +- .../Presentation/View/DataGridHelper.cs | 6 +- .../View/ExpressionTextBox.xaml.cs | 2 +- .../Presentation/View/VBIdentifierName.cs | 2 +- .../View/VariableDesigner.xaml.cs | 4 +- .../Presentation/WorkflowItemPresenter.cs | 12 +- .../Xaml/ErrorTolerantObjectWriter.cs | 2 +- .../Xaml/ObjectToSourceLocationMapping.cs | 2 +- .../Activities/Debugger/StateManager.cs | 2 +- .../Activities/Runtime/ActivityExecutor.cs | 2 +- .../Activities/Runtime/ActivityInstanceMap.cs | 2 +- .../Activities/Statements/MethodExecutor.cs | 4 +- .../Activities/Statements/MethodResolver.cs | 2 +- .../System/Activities/WorkflowApplication.cs | 6 +- .../Activities/WorkflowPersistenceContext.cs | 2 +- .../ActivityWithResultConverter.cs | 2 +- .../DynamicActivityXamlReader.cs | 4 +- .../XamlIntegration/XamlWriterExtensions.cs | 2 +- .../AppContextDefaultValues.Default.cs | 35 ++ .../DataAnnotations/AppSettings.cs | 48 ++ .../DataAnnotations/EmailAddressAttribute.cs | 48 +- .../LocalAppContextSwitches.cs | 28 ++ .../MetadataPropertyDescriptorWrapper.cs | 6 +- .../DataAnnotations/PhoneAttribute.cs | 112 ++++- .../RegularExpressionAttribute.cs | 27 +- .../DataAnnotations/UrlAttribute.cs | 41 +- .../Clr/inc/AppContextDefaultValues.cs | 169 +++++++ .../InternalApis/Clr/inc/LocalAppContext.cs | 128 +++++ .../Configuration/BaseConfigurationRecord.cs | 22 +- .../Internal/InternalConfigHost.cs | 2 +- .../Configuration/MgmtConfigurationRecord.cs | 6 +- .../RSAProtectedConfigurationProvider.cs | 2 +- .../Scripting/Ast/TypeBinaryExpression.cs | 8 +- .../Scripting/Compiler/AssemblyGen.cs | 6 +- .../Compiler/LambdaCompiler.Unary.cs | 12 +- .../Win32/SafeHandles/BCryptSafeHandles.cs | 18 + .../Win32/SafeHandles/NCryptSafeHandles.cs | 2 +- .../Diagnostics/Eventing/EventDescriptor.cs | 4 +- .../Diagnostics/Eventing/EventProvider.cs | 2 +- .../Eventing/Reader/EventLogSession.cs | 2 +- .../Eventing/Reader/EventMetadata.cs | 2 +- .../Eventing/Reader/EventOpcode.cs | 2 +- .../Eventing/Reader/EventRecord.cs | 4 +- .../Eventing/Reader/ProviderMetadata.cs | 2 +- System.Core/System/IO/BufferedStream2.cs | 4 +- System.Core/System/IO/LogStream.cs | 2 +- .../IO/MemoryMappedFiles/MemoryMappedView.cs | 2 +- .../MemoryMappedViewAccessor.cs | 2 +- .../MemoryMappedViewStream.cs | 2 +- System.Core/System/IO/Pipes/PipeStream.cs | 6 +- System.Core/System/Linq/Enumerable.cs | 4 +- .../Parallel/Channels/AsynchronousChannel.cs | 2 +- .../Parallel/Channels/SynchronousChannel.cs | 2 +- .../Enumerables/AggregationMinMaxHelpers.cs | 2 +- .../Parallel/Enumerables/EmptyEnumerable.cs | 2 +- .../EnumerableWrapperWeakToStrong.cs | 2 +- .../Enumerables/OrderedParallelQuery.cs | 2 +- .../Enumerables/ParallelEnumerableWrapper.cs | 2 +- .../Parallel/Enumerables/ParallelQuery.cs | 2 +- .../Parallel/Enumerables/RangeEnumerable.cs | 2 +- .../Parallel/Enumerables/RepeatEnumerable.cs | 2 +- .../Linq/Parallel/Merging/ArrayMergeHelper.cs | 2 +- .../AsynchronousChannelMergeEnumerator.cs | 2 +- .../Parallel/Merging/DefaultMergeHelper.cs | 4 +- .../Linq/Parallel/Merging/MergeEnumerator.cs | 2 +- .../Linq/Parallel/Merging/MergeExecutor.cs | 2 +- .../Merging/OrderPreservingMergeHelper.cs | 2 +- .../OrderPreservingPipeliningMergeHelper.cs | 2 +- .../SynchronousChannelMergeEnumerator.cs | 2 +- .../Partitioning/HashRepartitionEnumerator.cs | 2 +- .../Partitioning/HashRepartitionStream.cs | 2 +- .../OrderedHashRepartitionEnumerator.cs | 2 +- .../OrderedHashRepartitionStream.cs | 2 +- .../Partitioning/PartitionedDataSource.cs | 2 +- .../Partitioning/PartitionedStream.cs | 2 +- .../UnorderedHashRepartitionStream.cs | 2 +- .../AssociativeAggregationOperator.cs | 2 +- .../Binary/ExceptQueryOperator.cs | 2 +- .../Binary/GroupJoinQueryOperator.cs | 2 +- .../Binary/HashJoinQueryOperatorEnumerator.cs | 2 +- .../Binary/IntersectQueryOperator.cs | 2 +- .../Binary/JoinQueryOperator.cs | 2 +- .../Binary/UnionQueryOperator.cs | 2 +- .../QueryOperators/Binary/ZipQueryOperator.cs | 2 +- .../QueryOperators/BinaryQueryOperator.cs | 2 +- .../Inlined/CountAggregationOperator.cs | 2 +- .../DecimalAverageAggregationOperator.cs | 2 +- .../DecimalMinMaxAggregationOperator.cs | 2 +- .../Inlined/DecimalSumAggregationOperator.cs | 2 +- .../DoubleAverageAggregationOperator.cs | 2 +- .../DoubleMinMaxAggregationOperator.cs | 2 +- .../Inlined/DoubleSumAggregationOperator.cs | 2 +- .../FloatAverageAggregationOperator.cs | 2 +- .../Inlined/FloatMinMaxAggregationOperator.cs | 2 +- .../Inlined/FloatSumAggregationOperator.cs | 2 +- .../Inlined/InlinedAggregationOperator.cs | 2 +- .../InlinedAggregationOperatorEnumerator.cs | 2 +- .../Inlined/IntAverageAggregationOperator.cs | 2 +- .../Inlined/IntMinMaxAggregationOperator.cs | 2 +- .../Inlined/IntSumAggregationOperator.cs | 2 +- .../Inlined/LongAverageAggregationOperator.cs | 2 +- .../Inlined/LongCountAggregationOperator.cs | 2 +- .../Inlined/LongMinMaxAggregationOperator.cs | 2 +- .../Inlined/LongSumAggregationOperator.cs | 2 +- ...llableDecimalAverageAggregationOperator.cs | 2 +- ...ullableDecimalMinMaxAggregationOperator.cs | 2 +- .../NullableDecimalSumAggregationOperator.cs | 2 +- ...ullableDoubleAverageAggregationOperator.cs | 2 +- ...NullableDoubleMinMaxAggregationOperator.cs | 2 +- .../NullableDoubleSumAggregationOperator.cs | 2 +- ...NullableFloatAverageAggregationOperator.cs | 2 +- .../NullableFloatMinMaxAggregationOperator.cs | 2 +- .../NullableFloatSumAggregationOperator.cs | 2 +- .../NullableIntAverageAggregationOperator.cs | 2 +- .../NullableIntMinMaxAggregationOperator.cs | 2 +- .../NullableIntSumAggregationOperator.cs | 2 +- .../NullableLongAverageAggregationOperator.cs | 2 +- .../NullableLongMinMaxAggregationOperator.cs | 2 +- .../NullableLongSumAggregationOperator.cs | 2 +- .../QueryOperators/ListQueryResults.cs | 2 +- .../Options/OrderingQueryOperator.cs | 2 +- .../Options/QueryExecutionOption.cs | 2 +- .../QueryOperators/PartitionedStreamMerger.cs | 2 +- .../PartitionerQueryOperator.cs | 2 +- .../QueryOperators/QueryOpeningEnumerator.cs | 4 +- .../Parallel/QueryOperators/QueryOperator.cs | 2 +- .../QueryOperators/QueryOperatorEnumerator.cs | 2 +- .../Parallel/QueryOperators/QueryResults.cs | 2 +- .../Parallel/QueryOperators/QuerySettings.cs | 6 +- .../QueryOperators/ScanQueryOperator.cs | 2 +- .../Unary/AnyAllSearchOperator.cs | 2 +- .../Unary/ConcatQueryOperator.cs | 2 +- .../Unary/ContainsSearchOperator.cs | 2 +- .../Unary/DefaultIfEmptyQueryOperator.cs | 2 +- .../Unary/DistinctQueryOperator.cs | 2 +- .../Unary/ElementAtQueryOperator.cs | 2 +- .../Unary/FirstQueryOperator.cs | 2 +- .../QueryOperators/Unary/ForAllOperator.cs | 2 +- .../Unary/GroupByQueryOperator.cs | 2 +- .../Unary/IndexedSelectQueryOperator.cs | 2 +- .../Unary/IndexedWhereQueryOperator.cs | 2 +- .../QueryOperators/Unary/LastQueryOperator.cs | 2 +- .../Unary/ReverseQueryOperator.cs | 2 +- .../Unary/SelectManyQueryOperator.cs | 2 +- .../Unary/SelectQueryOperator.cs | 2 +- .../Unary/SingleQueryOperator.cs | 2 +- .../QueryOperators/Unary/SortQueryOperator.cs | 2 +- .../Unary/TakeOrSkipQueryOperator.cs | 2 +- .../Unary/TakeOrSkipWhileQueryOperator.cs | 2 +- .../Unary/WhereQueryOperator.cs | 2 +- .../QueryOperators/UnaryQueryOperator.cs | 2 +- .../Parallel/Scheduling/CancellationState.cs | 2 +- .../OrderPreservingPipeliningSpoolingTask.cs | 2 +- .../Scheduling/OrderPreservingSpoolingTask.cs | 2 +- .../Parallel/Scheduling/QueryLifecycle.cs | 2 +- .../Linq/Parallel/Scheduling/QueryTask.cs | 4 +- .../Scheduling/QueryTaskGroupState.cs | 10 +- .../Linq/Parallel/Scheduling/Scheduling.cs | 2 +- .../Linq/Parallel/Scheduling/SpoolingTask.cs | 2 +- .../Parallel/Scheduling/SpoolingTaskBase.cs | 2 +- .../Parallel/Utils/CancellableEnumerable.cs | 2 +- .../Parallel/Utils/ExceptionAggregator.cs | 2 +- .../Linq/Parallel/Utils/ExchangeUtilities.cs | 2 +- .../Linq/Parallel/Utils/FixedMaxHeap.cs | 2 +- .../Linq/Parallel/Utils/GrowingArray.cs | 2 +- .../System/Linq/Parallel/Utils/HashLookup.cs | 2 +- .../System/Linq/Parallel/Utils/ListChunk.cs | 2 +- .../System/Linq/Parallel/Utils/Lookup.cs | 2 +- .../Linq/Parallel/Utils/PLINQETWProvider.cs | 2 +- .../System/Linq/Parallel/Utils/Pair.cs | 2 +- .../Linq/Parallel/Utils/PairComparer.cs | 2 +- .../Linq/Parallel/Utils/ReverseComparer.cs | 2 +- .../System/Linq/Parallel/Utils/Shared.cs | 2 +- .../System/Linq/Parallel/Utils/Sorting.cs | 2 +- .../Linq/Parallel/Utils/TraceHelpers.cs | 2 +- .../System/Linq/Parallel/Utils/Util.cs | 14 +- .../System/Linq/Parallel/Utils/Wrapper.cs | 2 +- .../Parallel/Utils/WrapperEqualityComparer.cs | 2 +- System.Core/System/Linq/ParallelEnumerable.cs | 2 +- System.Core/System/Linq/SequenceQuery.cs | 2 +- .../Security/Cryptography/BCryptNative.cs | 55 +++ .../System/Security/Cryptography/ECDsa.cs | 91 ++++ .../System/Security/Cryptography/ECDsaCng.cs | 32 ++ .../Security/Cryptography/NCryptNative.cs | 5 + .../ECDsaCertificateExtensions.cs | 129 +++++ .../RSACertificateExtensions.cs | 21 +- .../X509Certificates/X509Native.cs | 66 +++ .../System/threading/Tasks/TaskExtensions.cs | 2 +- .../System/Data/DataRowComparer.cs | 2 +- .../System/Data/DataRowExtensions.cs | 2 +- .../System/Data/DataSetUtil.cs | 4 +- .../System/Data/DataTableExtensions.cs | 4 +- .../System/Data/EnumerableRowCollection.cs | 4 +- .../Data/EnumerableRowCollectionExtensions.cs | 4 +- .../System/Data/LinqDataView.cs | 4 +- .../Data/OrderedEnumerableRowCollection.cs | 4 +- .../System/Data/SortExpressionBuilder.cs | 4 +- .../System/Data/TypedTableBase.cs | 2 +- .../System/Data/TypedTableBaseExtensions.cs | 4 +- .../Design/AspNet/BuildProviderUtils.cs | 4 +- .../AspNet/EntityDesignerBuildProvider.cs | 4 +- .../Design/AspNet/EntityModelBuildProvider.cs | 4 +- .../AspNet/MappingModelBuildProvider.cs | 4 +- .../AspNet/StorageModelBuildProvider.cs | 4 +- .../Data/Entity/Design/Common/EDesignUtil.cs | 4 +- .../Design/Common/MetadataItemSerializer.cs | 4 +- .../Data/Entity/Design/Common/MetadataUtil.cs | 4 +- .../Common/OneToOneMappingSerializer.cs | 34 +- .../Design/Common/UniqueIdentifierService.cs | 4 +- .../Data/Entity/Design/EntityCodeGenerator.cs | 4 +- .../Data/Entity/Design/EntityDesignerUtils.cs | 4 +- .../Entity/Design/EntityFrameworkVersions.cs | 4 +- .../Design/EntityModelSchemaGenerator.cs | 4 +- .../Design/EntityStoreSchemaFilterEntry.cs | 4 +- .../Design/EntityStoreSchemaGenerator.cs | 4 +- .../EntityStoreSchemaGenerator.DbObjectKey.cs | 4 +- ...eSchemaGenerator.LoadMethodSessionState.cs | 4 +- .../EntityViewGenerationConstants.cs | 4 +- .../EntityViewGenerator.cs | 6 +- .../Entity/Design/MetadataExtensionMethods.cs | 2 +- .../Design/MetadataItemCollectionFactory.cs | 4 +- .../BidirectionalDictionary.cs | 4 +- .../EnglishPluralizationService.cs | 4 +- .../EntityDesignPluralizationHandler.cs | 4 +- .../PluralizationServiceUtil.cs | 4 +- ...toreSchemaGeneratorDatabaseSchemaLoader.cs | 4 +- .../SSDLGenerator/FunctionDetailsReader.cs | 4 +- .../RelationshipDetailsCollection.cs | 4 +- .../SSDLGenerator/RelationshipDetailsRow.cs | 4 +- .../SSDLGenerator/TableDetailsCollection.cs | 4 +- .../Design/SSDLGenerator/TableDetailsRow.cs | 4 +- .../EntityModel/EdmToObjectNamespaceMap.cs | 4 +- .../Emitters/AssociationTypeEmitter.cs | 4 +- .../EntityModel/Emitters/AttributeEmitter.cs | 4 +- .../Emitters/ClientApiGenerator.cs | 4 +- .../EntityModel/Emitters/CommentEmitter.cs | 4 +- .../Emitters/ComplexTypeEmitter.cs | 4 +- .../Data/EntityModel/Emitters/Emitter.cs | 4 +- .../Emitters/EntityContainerEmitter.cs | 4 +- .../EntityModel/Emitters/EntityTypeEmitter.cs | 4 +- .../System/Data/EntityModel/Emitters/FixUp.cs | 4 +- .../EntityModel/Emitters/FixUpCollection.cs | 4 +- .../Emitters/MetadataItemEmitter.cs | 4 +- .../EntityModel/Emitters/NamespaceEmitter.cs | 4 +- .../Emitters/NavigationPropertyEmitter.cs | 4 +- .../EntityModel/Emitters/PropertyEmitter.cs | 4 +- .../Emitters/PropertyEmitterBase.cs | 4 +- .../EntityModel/Emitters/SchemaTypeEmitter.cs | 4 +- .../Emitters/StructuredTypeEmitter.cs | 4 +- .../EntityModel/Emitters/TypeReference.cs | 4 +- .../System/Data/EntityModel/Emitters/Utils.cs | 4 +- .../Data/EntityModel/EntityClassGenerator.cs | 4 +- .../Data/EntityModel/LazyTextWriterCreator.cs | 4 +- .../EntityModel/PropertyGeneratedEventArgs.cs | 4 +- .../EntityModel/TypeGeneratedEventArgs.cs | 4 +- .../CommandTrees/AbstractExpressions.cs | 4 +- .../Data/Common/CommandTrees/Aggregates.cs | 4 +- .../CommandTrees/BasicCommandTreeVisitor.cs | 4 +- .../CommandTrees/BasicExpressionVisitor.cs | 4 +- .../Data/Common/CommandTrees/DbCommandTree.cs | 4 +- .../CommandTrees/DbDeleteCommandTree.cs | 4 +- .../CommandTrees/DbExpressionVisitor.cs | 4 +- .../DbExpressionVisitor_TResultType.cs | 4 +- .../CommandTrees/DbFunctionCommandTree.cs | 4 +- .../CommandTrees/DbInsertCommandTree.cs | 4 +- .../Data/Common/CommandTrees/DbLambda.cs | 4 +- .../CommandTrees/DbModificationClause.cs | 4 +- .../CommandTrees/DbModificationCommandTree.cs | 4 +- .../Common/CommandTrees/DbQueryCommandTree.cs | 4 +- .../Data/Common/CommandTrees/DbSetClause.cs | 4 +- .../CommandTrees/DbUpdateCommandTree.cs | 4 +- .../CommandTrees/DefaultExpressionVisitor.cs | 4 +- .../Common/CommandTrees/ExpressionBindings.cs | 4 +- .../ExpressionBuilder/DbExpressionBuilder.cs | 4 +- .../ExpressionBuilder/EdmFunctions.cs | 4 +- .../Internal/ArgumentValidation.cs | 4 +- .../Internal/EnumerableValidator.cs | 4 +- .../CommandTrees/ExpressionBuilder/Row.cs | 4 +- .../Spatial/SpatialEdmFunctions.cs | 2 +- .../Internal/DbExpressionRules.cs | 4 +- .../CommandTrees/Internal/ExpressionCopier.cs | 4 +- .../CommandTrees/Internal/ExpressionDumper.cs | 4 +- .../CommandTrees/Internal/ExpressionKeyGen.cs | 2 +- .../CommandTrees/Internal/ExpressionList.cs | 4 +- .../Internal/ExpressionPrinter.cs | 4 +- .../Internal/ParameterRetriever.cs | 4 +- .../Internal/PatternMatchRules.cs | 4 +- .../Common/CommandTrees/Internal/Validator.cs | 4 +- .../CommandTrees/Internal/ViewSimplifier.cs | 4 +- .../Internal/XmlExpressionDumper.cs | 4 +- .../CommandTrees/OperatorExpressions.cs | 4 +- .../CommandTrees/RelationalExpressions.cs | 4 +- .../Common/CommandTrees/ValueExpressions.cs | 4 +- .../System/Data/Common/DataRecord.cs | 6 +- .../System/Data/Common/DataRecordInfo.cs | 4 +- .../System/Data/Common/DbCommandDefinition.cs | 4 +- .../System/Data/Common/DbProviderManifest.cs | 4 +- .../System/Data/Common/DbProviderServices.cs | 4 +- .../Common/DbXmlEnabledProviderManifest.cs | 2 +- .../System/Data/Common/EntityRecordInfo.cs | 4 +- .../Data/Common/EntitySql/AST/AliasedExpr.cs | 4 +- .../Data/Common/EntitySql/AST/AstNode.cs | 4 +- .../Data/Common/EntitySql/AST/BuiltInExpr.cs | 4 +- .../Data/Common/EntitySql/AST/CaseExpr.cs | 4 +- .../Data/Common/EntitySql/AST/Command.cs | 4 +- .../Common/EntitySql/AST/ConstructorExpr.cs | 4 +- .../Common/EntitySql/AST/CreateRefExpr.cs | 4 +- .../Data/Common/EntitySql/AST/DotExpr.cs | 4 +- .../EntitySql/AST/FunctionDefinition.cs | 4 +- .../EntitySql/AST/GroupAggregateExpr.cs | 4 +- .../EntitySql/AST/GroupPartitionExpr.cs | 4 +- .../Data/Common/EntitySql/AST/Identifier.cs | 4 +- .../Data/Common/EntitySql/AST/Literal.cs | 4 +- .../Data/Common/EntitySql/AST/MethodExpr.cs | 4 +- .../Common/EntitySql/AST/NamespaceImport.cs | 4 +- .../Common/EntitySql/AST/NavigationExpr.cs | 4 +- .../Data/Common/EntitySql/AST/ParenExpr.cs | 4 +- .../Data/Common/EntitySql/AST/QueryExpr.cs | 4 +- .../Common/EntitySql/AST/QueryParameter.cs | 4 +- .../Common/EntitySql/AST/QueryStatement.cs | 4 +- .../Data/Common/EntitySql/AST/RefExpr.cs | 4 +- .../Common/EntitySql/AST/TypeDefinition.cs | 4 +- .../Data/Common/EntitySql/CqlErrorHelper.cs | 4 +- .../System/Data/Common/EntitySql/CqlLexer.cs | 4 +- .../Data/Common/EntitySql/CqlLexerHelpers.cs | 4 +- .../System/Data/Common/EntitySql/CqlParser.cs | 4 +- .../Data/Common/EntitySql/CqlParserHelpers.cs | 4 +- .../System/Data/Common/EntitySql/CqlQuery.cs | 4 +- .../Data/Common/EntitySql/EntitySqlParser.cs | 4 +- .../EntitySql/FunctionOverloadResolver.cs | 4 +- .../Data/Common/EntitySql/ParseResult.cs | 4 +- .../Data/Common/EntitySql/ParserOptions.cs | 4 +- .../Data/Common/EntitySql/SemanticAnalyzer.cs | 4 +- .../Data/Common/EntitySql/SemanticResolver.cs | 4 +- .../Data/Common/EntitySql/StaticContext.cs | 4 +- .../Data/Common/EntitySql/TypeResolver.cs | 4 +- .../System/Data/Common/EntityUtil.cs | 6 +- .../System/Data/Common/FieldMetadata.cs | 4 +- .../System/Data/Common/FieldNameLookup.cs | 4 +- .../System/Data/Common/Internal/DbTypeMap.cs | 2 +- .../Materialization/ColumnMapKeyBuilder.cs | 4 +- .../Materialization/CompensatingCollection.cs | 4 +- .../Internal/Materialization/Coordinator.cs | 4 +- .../Materialization/CoordinatorFactory.cs | 4 +- .../Materialization/CoordinatorScratchpad.cs | 4 +- .../Internal/Materialization/RecordState.cs | 2 +- .../Materialization/RecordStateFactory.cs | 2 +- .../Materialization/RecordStateScratchpad.cs | 2 +- .../Common/Internal/Materialization/Shaper.cs | 4 +- .../Internal/Materialization/ShaperFactory.cs | 4 +- .../Internal/Materialization/Translator.cs | 6 +- .../Common/Internal/Materialization/Util.cs | 2 +- .../Common/Internal/MultipartIdentifier.cs | 4 +- .../QueryCache/CompiledQueryCacheEntry.cs | 4 +- .../QueryCache/CompiledQueryCacheKey.cs | 4 +- .../Common/QueryCache/EntityClientCacheKey.cs | 4 +- .../QueryCache/EntitySqlQueryCacheKey.cs | 4 +- .../Common/QueryCache/LinqQueryCacheKey.cs | 2 +- .../Data/Common/QueryCache/QueryCacheEntry.cs | 4 +- .../Data/Common/QueryCache/QueryCacheKey.cs | 4 +- .../Common/QueryCache/QueryCacheManager.cs | 4 +- .../QueryCache/ShaperFactoryQueryCacheKey.cs | 4 +- .../Data/Common/Utils/AliasGenerator.cs | 4 +- .../Data/Common/Utils/Boolean/BoolExpr.cs | 4 +- .../Data/Common/Utils/Boolean/Clause.cs | 4 +- .../Common/Utils/Boolean/ConversionContext.cs | 4 +- .../Data/Common/Utils/Boolean/Converter.cs | 4 +- .../Common/Utils/Boolean/DomainConstraint.cs | 4 +- .../Common/Utils/Boolean/IdentifierService.cs | 4 +- .../Common/Utils/Boolean/KnowledgeBase.cs | 4 +- .../Data/Common/Utils/Boolean/Literal.cs | 4 +- .../Common/Utils/Boolean/NegationPusher.cs | 4 +- .../Data/Common/Utils/Boolean/Sentence.cs | 4 +- .../Data/Common/Utils/Boolean/Simplifier.cs | 4 +- .../Data/Common/Utils/Boolean/Solver.cs | 8 +- .../Data/Common/Utils/Boolean/Vertex.cs | 4 +- .../Data/Common/Utils/Boolean/Visitor.cs | 4 +- .../Common/Utils/ByValueEqualityComparer.cs | 4 +- .../System/Data/Common/Utils/CommandHelper.cs | 4 +- .../Utils/DisposableCollectionWrapper.cs | 4 +- .../System/Data/Common/Utils/Helpers.cs | 4 +- .../System/Data/Common/Utils/InternalBase.cs | 4 +- .../System/Data/Common/Utils/KeyToListMap.cs | 4 +- .../System/Data/Common/Utils/Memoizer.cs | 2 +- .../Data/Common/Utils/MetadataHelper.cs | 4 +- .../Utils/ModifiableIteratorCollection.cs | 4 +- .../System/Data/Common/Utils/Pair.cs | 4 +- .../System/Data/Common/Utils/Set.cs | 4 +- .../System/Data/Common/Utils/Singleton.cs | 2 +- .../System/Data/Common/Utils/StringUtil.cs | 4 +- .../Data/Common/Utils/ThreadSafeList.cs | 4 +- .../Common/Utils/TrailingSpaceComparer.cs | 4 +- .../System/Data/Common/Utils/TreePrinter.cs | 2 +- .../Data/EntityClient/DbConnectionOptions.cs | 4 +- .../DbParameterCollectionHelper.cs | 4 +- .../Data/EntityClient/DbParameterHelper.cs | 4 +- .../System/Data/EntityClient/EntityAdapter.cs | 4 +- .../System/Data/EntityClient/EntityCommand.cs | 4 +- .../EntityClient/EntityCommandDefinition.cs | 4 +- .../Data/EntityClient/EntityConnection.cs | 20 +- .../EntityConnectionStringBuilder.cs | 4 +- .../Data/EntityClient/EntityDataReader.cs | 4 +- .../Data/EntityClient/EntityParameter.cs | 4 +- .../EntityClient/EntityParameterCollection.cs | 4 +- .../EntityClient/EntityProviderFactory.cs | 4 +- .../EntityClient/EntityProviderServices.cs | 4 +- .../Data/EntityClient/EntityTransaction.cs | 4 +- .../System/Data/EntityClient/NameValuePair.cs | 4 +- .../Data/EntityCommandCompilationException.cs | 4 +- .../Data/EntityCommandExecutionException.cs | 4 +- .../System/Data/EntityException.cs | 4 +- System.Data.Entity/System/Data/EntityKey.cs | 4 +- .../BooleanFacetDescriptionElement.cs | 4 +- .../ByteFacetDescriptionElement.cs | 4 +- .../CollectionTypeElement.cs | 4 +- .../SchemaObjectModel/Documentation.cs | 4 +- .../SchemaObjectModel/EntityContainer.cs | 4 +- .../EntityContainerAssociationSet.cs | 4 +- .../EntityContainerAssociationSetEnd.cs | 4 +- .../EntityContainerEntitySet.cs | 4 +- .../EntityContainerEntitySetDefiningQuery.cs | 4 +- .../EntityContainerRelationshipSet.cs | 34 +- .../EntityContainerRelationshipSetEnd.cs | 4 +- .../SchemaObjectModel/EntityKeyElement.cs | 4 +- .../FacetDescriptionElement.cs | 4 +- .../FacetEnabledSchemaElement.cs | 4 +- .../FilteredSchemaElementLookUpTable.cs | 4 +- .../EntityModel/SchemaObjectModel/Function.cs | 4 +- .../SchemaObjectModel/FunctionCommandText.cs | 4 +- .../FunctionImportElement.cs | 2 +- .../IntegerFacetDescriptionElement.cs | 4 +- .../EntityModel/SchemaObjectModel/ItemType.cs | 4 +- .../SchemaObjectModel/KeyProperty.cs | 4 +- .../SchemaObjectModel/ModelFunction.cs | 4 +- .../ModelFunctionTypeElement.cs | 4 +- .../SchemaObjectModel/NavigationProperty.cs | 4 +- .../SchemaObjectModel/OnOperation.cs | 4 +- .../SchemaObjectModel/Parameter.cs | 4 +- .../SchemaObjectModel/PrimitiveSchema.cs | 4 +- .../EntityModel/SchemaObjectModel/Property.cs | 4 +- .../SchemaObjectModel/ReferenceSchema.cs | 4 +- .../SchemaObjectModel/ReferenceTypeElement.cs | 4 +- .../ReferentialConstraint.cs | 4 +- .../ReferentialConstraintRoleElement.cs | 4 +- .../SchemaObjectModel/Relationship.cs | 4 +- .../SchemaObjectModel/RelationshipEnd.cs | 4 +- .../RelationshipEndCollection.cs | 4 +- .../SchemaObjectModel/ReturnType.cs | 4 +- .../SchemaObjectModel/ReturnValue.cs | 4 +- .../SchemaObjectModel/RowTypeElement.cs | 4 +- .../RowTypePropertyElement.cs | 4 +- .../SchemaObjectModel/ScalarType.cs | 4 +- .../EntityModel/SchemaObjectModel/Schema.cs | 10 +- .../SchemaObjectModel/SchemaComplexType.cs | 4 +- .../SchemaObjectModel/SchemaElement.cs | 4 +- .../SchemaElementLookUpTable.cs | 4 +- .../SchemaElementLookUpTableEnumerator.cs | 4 +- .../SchemaObjectModel/SchemaEnumMember.cs | 4 +- .../SchemaObjectModel/SchemaEnumType.cs | 4 +- .../SchemaObjectModel/SchemaLookupTable.cs | 4 +- .../SchemaObjectModel/SchemaManager.cs | 4 +- .../SchemaObjectModel/SchemaType.cs | 4 +- .../SridFacetDescriptionElement.cs | 4 +- .../SchemaObjectModel/StructuredProperty.cs | 4 +- .../SchemaObjectModel/StructuredType.cs | 4 +- .../SchemaObjectModel/TextElement.cs | 4 +- .../SchemaObjectModel/TypeElement.cs | 4 +- .../SchemaObjectModel/TypeRefElement.cs | 4 +- .../SchemaObjectModel/TypeUsageBuilder.cs | 4 +- .../EntityModel/SchemaObjectModel/Utils.cs | 4 +- .../SchemaObjectModel/ValidationHelper.cs | 4 +- .../SchemaObjectModel/XmlSchemaResource.cs | 4 +- .../System/Data/EntitySqlException.cs | 4 +- .../System/Data/InternalMappingException.cs | 4 +- .../Data/InvalidCommandTreeException.cs | 4 +- .../Mapping/BaseMetadataMappingVisitor.cs | 4 +- .../DefaultObjectMappingItemCollection.cs | 4 +- .../Data/Mapping/EntityViewContainer.cs | 4 +- .../Mapping/EntityViewGenerationAttribute.cs | 4 +- ...onImportMapping.ReturnTypeRenameMapping.cs | 4 +- .../Data/Mapping/FunctionImportMapping.cs | 2 +- .../FunctionImportMappingComposable.cs | 2 +- .../FunctionImportMappingNonComposable.cs | 2 +- .../System/Data/Mapping/Mapping.cs | 4 +- .../Data/Mapping/MappingItemCollection.cs | 4 +- ...aMappingHasherVisitor.HashSourceBuilder.cs | 4 +- .../Mapping/MetadataMappingHasherVisitor.cs | 4 +- .../Mapping/ObjectAssociationEndMapping.cs | 4 +- .../Mapping/ObjectComplexPropertyMapping.cs | 4 +- .../Data/Mapping/ObjectMemberMapping.cs | 4 +- .../ObjectNavigationPropertyMapping.cs | 4 +- .../Data/Mapping/ObjectPropertyMapping.cs | 4 +- .../System/Data/Mapping/ObjectTypeMapping.cs | 4 +- .../Mapping/StorageAssociationSetMapping.cs | 4 +- .../Mapping/StorageAssociationTypeMapping.cs | 2 +- .../Mapping/StorageComplexPropertyMapping.cs | 4 +- .../Data/Mapping/StorageComplexTypeMapping.cs | 2 +- .../StorageConditionPropertyMapping.cs | 4 +- .../Data/Mapping/StorageEndPropertyMapping.cs | 4 +- .../Mapping/StorageEntityContainerMapping.cs | 4 +- .../Data/Mapping/StorageEntitySetMapping.cs | 4 +- .../Data/Mapping/StorageEntityTypeMapping.cs | 4 +- .../Data/Mapping/StorageMappingFragment.cs | 4 +- ...ageMappingItemCollection.ViewDictionary.cs | 4 +- .../Mapping/StorageMappingItemCollection.cs | 4 +- .../Data/Mapping/StorageMappingItemLoader.cs | 4 +- .../StorageModificationFunctionMapping.cs | 4 +- .../Data/Mapping/StoragePropertyMapping.cs | 4 +- .../Mapping/StorageScalarPropertyMapping.cs | 4 +- .../System/Data/Mapping/StorageSetMapping.cs | 4 +- .../System/Data/Mapping/StorageTypeMapping.cs | 4 +- .../Update/Internal/AssociationSetMetadata.cs | 4 +- .../Mapping/Update/Internal/ChangeNode.cs | 4 +- .../Mapping/Update/Internal/CompositeKey.cs | 4 +- .../Update/Internal/DynamicUpdateCommand.cs | 4 +- .../Update/Internal/ExtractedStateEntry.cs | 2 +- .../Update/Internal/ExtractorMetadata.cs | 4 +- .../Internal/FunctionMappingTranslator.cs | 6 +- .../Update/Internal/FunctionUpdateCommand.cs | 4 +- .../Data/Mapping/Update/Internal/Graph.cs | 4 +- .../Mapping/Update/Internal/KeyManager.cs | 4 +- .../Update/Internal/Propagator.Evaluator.cs | 4 +- .../Propagator.ExtentPlaceholderCreator.cs | 4 +- ...tor.JoinPropagator.JoinPredicateVisitor.cs | 4 +- ...JoinPropagator.SubstitutingCloneVisitor.cs | 4 +- .../Internal/Propagator.JoinPropagator.cs | 4 +- .../Mapping/Update/Internal/Propagator.cs | 4 +- .../Update/Internal/PropagatorResult.cs | 4 +- .../Update/Internal/RecordConverter.cs | 4 +- .../RelationshipConstraintValidator.cs | 4 +- .../Update/Internal/SourceInterpreter.cs | 4 +- .../Update/Internal/TableChangeProcessor.cs | 4 +- .../Update/Internal/UndirectedGraph.cs | 4 +- .../Mapping/Update/Internal/UpdateCommand.cs | 4 +- .../Update/Internal/UpdateCommandOrderer.cs | 4 +- .../Mapping/Update/Internal/UpdateCompiler.cs | 4 +- .../Internal/UpdateExpressionVisitor.cs | 4 +- .../Update/Internal/UpdateTranslator.cs | 4 +- .../Mapping/Update/Internal/ViewLoader.cs | 4 +- .../ViewGeneration/BasicViewGenerator.cs | 6 +- .../Mapping/ViewGeneration/CellCreator.cs | 4 +- .../Mapping/ViewGeneration/CellPartitioner.cs | 4 +- .../ViewGeneration/CellTreeSimplifier.cs | 6 +- .../ViewGeneration/ConfigViewGenerator.cs | 4 +- .../CqlGeneration/AliasedSlot.cs | 4 +- .../CqlGeneration/BooleanProjectedSlot.cs | 4 +- .../CqlGeneration/CaseCqlBlock.cs | 4 +- .../ViewGeneration/CqlGeneration/CqlBlock.cs | 4 +- .../CqlGeneration/CqlIdentifiers.cs | 4 +- .../ViewGeneration/CqlGeneration/CqlWriter.cs | 4 +- .../CqlGeneration/ExtentCqlBlock.cs | 4 +- .../CqlGeneration/JoinCqlBlock.cs | 4 +- .../ViewGeneration/CqlGeneration/SlotInfo.cs | 4 +- .../CqlGeneration/UnionCqlBlock.cs | 4 +- .../Mapping/ViewGeneration/CqlGenerator.cs | 4 +- .../ViewGeneration/DiscriminatorMap.cs | 4 +- .../Mapping/ViewGeneration/GeneratedView.cs | 4 +- .../QueryRewriting/FragmentQuery.cs | 4 +- .../QueryRewriting/FragmentQueryKB.cs | 4 +- .../QueryRewriting/FragmentQueryProcessor.cs | 4 +- .../QueryRewriting/QueryRewriter.cs | 4 +- .../QueryRewriting/RewritingPass.cs | 4 +- .../QueryRewriting/RewritingProcessor.cs | 4 +- .../QueryRewriting/RewritingSimplifier.cs | 4 +- .../QueryRewriting/RewritingValidator.cs | 4 +- .../QueryRewriting/RoleBoolean.cs | 4 +- .../ViewGeneration/QueryRewriting/Tile.cs | 4 +- .../Structures/BoolExpression.cs | 6 +- .../Structures/BoolExpressionVisitors.cs | 4 +- .../ViewGeneration/Structures/BoolLiteral.cs | 4 +- .../Structures/CaseStatement.cs | 4 +- .../Structures/CaseStatementProjectedSlot.cs | 4 +- .../Mapping/ViewGeneration/Structures/Cell.cs | 4 +- .../Structures/CellIdBoolean.cs | 4 +- .../ViewGeneration/Structures/CellLabel.cs | 4 +- .../ViewGeneration/Structures/CellQuery.cs | 4 +- .../ViewGeneration/Structures/CellTreeNode.cs | 4 +- .../Structures/CellTreeNodeVisitors.cs | 4 +- .../ViewGeneration/Structures/Constant.cs | 4 +- .../Structures/ConstantProjectedSlot.cs | 4 +- .../ViewGeneration/Structures/Domain.cs | 6 +- .../ViewGeneration/Structures/ErrorLog.cs | 4 +- .../Structures/LeafCellTreeNode.cs | 4 +- .../Structures/LeftCellWrapper.cs | 4 +- .../Structures/MemberDomainMap.cs | 4 +- .../ViewGeneration/Structures/MemberMaps.cs | 4 +- .../ViewGeneration/Structures/MemberPath.cs | 4 +- .../Structures/MemberProjectedSlot.cs | 4 +- .../Structures/MemberProjectionIndex.cs | 4 +- .../Structures/MemberRestriction.cs | 4 +- .../Structures/NegatedConstant.cs | 4 +- .../Structures/OpCellTreeNode.cs | 4 +- .../Structures/ProjectedSlot.cs | 4 +- .../Structures/QualifiedCellIdBoolean.cs | 4 +- .../Structures/ScalarConstant.cs | 4 +- .../Structures/ScalarRestriction.cs | 4 +- .../ViewGeneration/Structures/TypeConstant.cs | 4 +- .../Structures/TypeRestriction.cs | 4 +- .../Structures/WithStatement.cs | 4 +- .../ViewGeneration/Utils/ExceptionHelpers.cs | 4 +- .../ViewGeneration/Utils/ExternalCalls.cs | 4 +- .../Validation/BasicCellRelation.cs | 6 +- .../Validation/BasicKeyConstraint.cs | 4 +- .../ViewGeneration/Validation/CellRelation.cs | 4 +- .../Validation/ErrorPatternMatcher.cs | 4 +- .../ViewGeneration/Validation/ExtentKey.cs | 6 +- .../Validation/ForeignConstraint.cs | 4 +- .../Validation/KeyConstraint.cs | 4 +- .../Validation/SchemaConstraints.cs | 4 +- .../Validation/ViewCellRelation.cs | 6 +- .../ViewGeneration/Validation/ViewCellSlot.cs | 4 +- .../Validation/ViewKeyConstraint.cs | 4 +- .../Data/Mapping/ViewGeneration/Validator.cs | 4 +- .../Mapping/ViewGeneration/ViewGenResults.cs | 4 +- .../Mapping/ViewGeneration/ViewGenerator.cs | 6 +- .../Mapping/ViewGeneration/ViewgenContext.cs | 4 +- .../ViewGeneration/ViewgenGatekeeper.cs | 4 +- .../System/Data/Mapping/ViewValidator.cs | 4 +- .../System/Data/MappingException.cs | 4 +- .../System/Data/Metadata/AspProxy.cs | 4 +- .../Data/Metadata/CacheForPrimitiveTypes.cs | 4 +- .../System/Data/Metadata/ClrPerspective.cs | 4 +- .../System/Data/Metadata/Converter.cs | 4 +- .../Data/Metadata/CustomAssemblyResolver.cs | 4 +- .../Data/Metadata/DefaultAssemblyResolver.cs | 4 +- .../Data/Metadata/Edm/AssociationEndMember.cs | 4 +- .../Data/Metadata/Edm/AssociationSet.cs | 4 +- .../Data/Metadata/Edm/AssociationSetEnd.cs | 4 +- .../Data/Metadata/Edm/AssociationType.cs | 4 +- .../Data/Metadata/Edm/CollectionType.cs | 4 +- .../System/Data/Metadata/Edm/ComplexType.cs | 4 +- .../System/Data/Metadata/Edm/Documentation.cs | 4 +- .../System/Data/Metadata/Edm/EdmConstants.cs | 4 +- .../System/Data/Metadata/Edm/EdmFunction.cs | 4 +- .../System/Data/Metadata/Edm/EdmMember.cs | 4 +- .../System/Data/Metadata/Edm/EdmProperty.cs | 4 +- .../System/Data/Metadata/Edm/EdmType.cs | 4 +- .../Data/Metadata/Edm/EntityContainer.cs | 4 +- .../System/Data/Metadata/Edm/EntitySet.cs | 4 +- .../System/Data/Metadata/Edm/EntitySetBase.cs | 4 +- .../Metadata/Edm/EntitySetBaseCollection.cs | 4 +- .../System/Data/Metadata/Edm/EntityType.cs | 4 +- .../Data/Metadata/Edm/EntityTypeBase.cs | 10 +- .../System/Data/Metadata/Edm/EnumMember.cs | 4 +- .../System/Data/Metadata/Edm/EnumType.cs | 4 +- .../System/Data/Metadata/Edm/Facet.cs | 4 +- .../Data/Metadata/Edm/FacetDescription.cs | 4 +- .../Data/Metadata/Edm/FacetValueContainer.cs | 4 +- .../System/Data/Metadata/Edm/FacetValues.cs | 4 +- .../Edm/FilteredReadOnlyMetadataCollection.cs | 6 +- .../Data/Metadata/Edm/FunctionParameter.cs | 4 +- .../System/Data/Metadata/Edm/GlobalItem.cs | 4 +- .../Data/Metadata/Edm/ItemCollection.cs | 4 +- .../Metadata/Edm/LightweightCodeGenerator.cs | 4 +- .../Data/Metadata/Edm/MemberCollection.cs | 4 +- .../Data/Metadata/Edm/MetadataCollection.cs | 6 +- .../System/Data/Metadata/Edm/MetadataItem.cs | 4 +- .../Data/Metadata/Edm/MetadataItem_Static.cs | 4 +- .../Data/Metadata/Edm/MetadataProperty.cs | 4 +- .../Metadata/Edm/MetadataPropertyAttribute.cs | 4 +- .../Edm/MetadataPropertyCollection.cs | 4 +- .../Metadata/Edm/MetadataPropertyvalue.cs | 4 +- .../Data/Metadata/Edm/NavigationProperty.cs | 4 +- .../Edm/NavigationPropertyAccessor.cs | 4 +- .../System/Data/Metadata/Edm/PrimitiveType.cs | 4 +- .../Edm/Provider/ClrProviderManifest.cs | 4 +- .../Edm/Provider/EdmProviderManifest.cs | 4 +- .../EdmProviderManifestFunctionBuilder.cs | 4 +- .../EdmProviderManifestSpatialFunctions.cs | 2 +- .../Edm/ReadOnlyMetadataCollection.cs | 12 +- .../System/Data/Metadata/Edm/RefType.cs | 4 +- .../Metadata/Edm/ReferentialConstraint.cs | 4 +- .../Metadata/Edm/RelationshipEndMember.cs | 4 +- .../Data/Metadata/Edm/RelationshipSet.cs | 4 +- .../Data/Metadata/Edm/RelationshipType.cs | 4 +- .../System/Data/Metadata/Edm/RowType.cs | 4 +- .../System/Data/Metadata/Edm/SafeLink.cs | 4 +- .../Data/Metadata/Edm/SafeLinkCollection.cs | 4 +- .../System/Data/Metadata/Edm/SimpleType.cs | 4 +- .../Data/Metadata/Edm/StructuralType.cs | 4 +- .../System/Data/Metadata/Edm/TypeUsage.cs | 4 +- .../System/Data/Metadata/Edm/util.cs | 4 +- .../System/Data/Metadata/EdmError.cs | 4 +- .../EdmItemCollection.OcAssemblyCache.cs | 4 +- .../System/Data/Metadata/EdmItemCollection.cs | 4 +- .../System/Data/Metadata/EdmItemError.cs | 4 +- .../System/Data/Metadata/EdmSchemaError.cs | 4 +- .../System/Data/Metadata/EdmValidator.cs | 4 +- .../System/Data/Metadata/Helper.cs | 4 +- .../Data/Metadata/MappingMetadataHelper.cs | 4 +- .../Data/Metadata/MetadataArtifactLoader.cs | 4 +- .../MetadataArtifactLoaderComposite.cs | 4 +- .../MetadataArtifactLoaderCompositeFile.cs | 4 +- ...MetadataArtifactLoaderCompositeResource.cs | 4 +- .../Metadata/MetadataArtifactLoaderFile.cs | 4 +- .../MetadataArtifactLoaderResource.cs | 4 +- .../MetadataArtifactLoaderXmlReaderWrapper.cs | 4 +- .../System/Data/Metadata/MetadataCache.cs | 4 +- .../System/Data/Metadata/MetadataWorkspace.cs | 4 +- .../System/Data/Metadata/ModelPerspective.cs | 4 +- .../System/Data/Metadata/ObjectHelper.cs | 4 +- .../Data/Metadata/ObjectItemCollection.cs | 4 +- .../Metadata/ObjectLayer/AssemblyCache.cs | 4 +- .../ObjectLayer/AssemblyCacheEntry.cs | 4 +- .../ImmutableAssemblyCacheEntry.cs | 4 +- .../ObjectLayer/KnownAssembliesSet.cs | 4 +- .../ObjectLayer/KnownAssemblyEntry.cs | 4 +- .../Metadata/ObjectLayer/LoadMessageLogger.cs | 4 +- .../ObjectLayer/LockedAssemblyCache.cs | 4 +- .../ObjectLayer/MetadataAssemblyHelper.cs | 4 +- .../ObjectLayer/MutableAssemblyCacheEntry.cs | 4 +- .../ObjectLayer/ObjectItemAssemblyLoader.cs | 4 +- .../ObjectItemAttributeAssemblyLoader.cs | 4 +- .../ObjectItemCachedAssemblyLoader.cs | 4 +- .../ObjectItemConventionAssemblyLoader.cs | 4 +- .../ObjectItemLoadingSessionData.cs | 4 +- .../ObjectItemNoOpAssemblyLoader.cs | 4 +- .../System/Data/Metadata/Perspective.cs | 4 +- .../Metadata/StoreItemCollection.Loader.cs | 4 +- .../Data/Metadata/StoreItemCollection.cs | 4 +- .../System/Data/Metadata/TargetPerspective.cs | 4 +- .../System/Data/Metadata/TypeHelpers.cs | 4 +- .../System/Data/Metadata/TypeSemantics.cs | 4 +- .../System/Data/MetadataException.cs | 4 +- .../System/Data/ObjectNotFoundException.cs | 2 +- .../Data/Objects/AdditionalEntityFunctions.cs | 4 +- .../System/Data/Objects/CompiledQuery.cs | 4 +- .../Data/Objects/DataClasses/ComplexObject.cs | 4 +- .../EdmComplexPropertyAttribute.cs | 4 +- .../DataClasses/EdmComplexTypeAttribute.cs | 4 +- .../DataClasses/EdmEntityTypeAttribute.cs | 4 +- .../DataClasses/EdmEnumTypeAttribute.cs | 4 +- .../DataClasses/EdmFunctionAttribute.cs | 2 +- .../DataClasses/EdmPropertyAttribute.cs | 4 +- ...RelationshipNavigationPropertyAttribute.cs | 4 +- .../EdmRelationshipRoleAttribute.cs | 4 +- .../DataClasses/EdmScalarPropertyAttribute.cs | 4 +- .../Objects/DataClasses/EdmSchemaAttribute.cs | 4 +- .../Objects/DataClasses/EdmTypeAttribute.cs | 4 +- .../Objects/DataClasses/EntityCollection.cs | 4 +- .../Data/Objects/DataClasses/EntityObject.cs | 4 +- .../Objects/DataClasses/EntityReference.cs | 4 +- .../EntityReference_TResultType.cs | 4 +- .../Data/Objects/DataClasses/RelatedEnd.cs | 4 +- .../Objects/DataClasses/RelationshipFixer.cs | 4 +- .../DataClasses/RelationshipManager.cs | 8 +- .../DataClasses/RelationshipNavigation.cs | 4 +- .../Objects/DataClasses/StructuralObject.cs | 4 +- .../Data/Objects/DataRecordObjectView.cs | 12 +- .../Data/Objects/ELinq/BindingContext.cs | 2 +- .../Objects/ELinq/CompiledELinqQueryState.cs | 4 +- .../Data/Objects/ELinq/ELinqQueryState.cs | 4 +- .../Data/Objects/ELinq/ExpressionConverter.cs | 6 +- .../Objects/ELinq/ExpressionVisitorHelpers.cs | 2 +- .../System/Data/Objects/ELinq/Funcletizer.cs | 4 +- .../Data/Objects/ELinq/InitializerFacet.cs | 2 +- .../Objects/ELinq/LinqExpressionNormalizer.cs | 2 +- .../Objects/ELinq/MethodCallTranslator.cs | 2 +- .../Data/Objects/ELinq/ObjectQueryProvider.cs | 4 +- .../Data/Objects/ELinq/OrderByLifter.cs | 2 +- .../Data/Objects/ELinq/ReflectionUtil.cs | 2 +- .../ELinq/SpatialMethodCallTranslator.cs | 2 +- .../ELinq/SpatialPropertyTranslator.cs | 2 +- .../System/Data/Objects/ELinq/Translator.cs | 2 +- .../System/Data/Objects/ELinq/TypeSystem.cs | 2 +- .../System/Data/Objects/EntityEntry.cs | 6 +- .../System/Data/Objects/EntityFunctions.cs | 4 +- .../System/Data/Objects/FieldDescriptor.cs | 4 +- .../Objects/Internal/BaseEntityWrapper.cs | 4 +- .../Internal/ComplexTypeMaterializer.cs | 4 +- .../Objects/Internal/EntityProxyFactory.cs | 4 +- .../Objects/Internal/EntityProxyTypeInfo.cs | 4 +- .../Objects/Internal/EntitySqlQueryBuilder.cs | 2 +- .../Objects/Internal/EntitySqlQueryState.cs | 2 +- .../Data/Objects/Internal/EntityWrapper.cs | 4 +- .../Objects/Internal/EntityWrapperFactory.cs | 4 +- .../Data/Objects/Internal/LazyLoadBehavior.cs | 4 +- .../Internal/LightweightEntityWrapper.cs | 4 +- .../Objects/Internal/NullEntityWrapper.cs | 4 +- .../Internal/ObjectFullSpanRewriter.cs | 4 +- .../Internal/ObjectQueryExecutionPlan.cs | 2 +- .../Data/Objects/Internal/ObjectQueryState.cs | 2 +- .../Objects/Internal/ObjectSpanRewriter.cs | 4 +- .../Objects/Internal/TransactionManager.cs | 4 +- .../System/Data/Objects/ObjectContext.cs | 12 +- .../Objects/ObjectMaterializedEventArgs.cs | 4 +- .../System/Data/Objects/ObjectParameter.cs | 4 +- .../Data/Objects/ObjectParameterCollection.cs | 4 +- .../System/Data/Objects/ObjectQuery.cs | 4 +- .../ObjectQuery_EntitySqlExtensions.cs | 4 +- .../Data/Objects/ObjectQuery_TResultType.cs | 4 +- .../System/Data/Objects/ObjectResult.cs | 4 +- .../Data/Objects/ObjectResult_TResultType.cs | 4 +- .../System/Data/Objects/ObjectSet.cs | 4 +- .../System/Data/Objects/ObjectStateEntry.cs | 4 +- ...ObjectStateEntryBaseUpdatableDataRecord.cs | 4 +- .../Objects/ObjectStateEntryDbDataRecord.cs | 4 +- .../ObjectStateEntryDbUpdatableDataRecord.cs | 4 +- ...StateEntryOriginalDbUpdatableDataRecord.cs | 4 +- .../System/Data/Objects/ObjectStateManager.cs | 8 +- .../Objects/ObjectStateManagerMetadata.cs | 4 +- .../System/Data/Objects/ObjectView.cs | 4 +- .../Objects/ObjectViewEntityCollectionData.cs | 4 +- .../System/Data/Objects/ObjectViewFactory.cs | 4 +- .../System/Data/Objects/ObjectViewListener.cs | 4 +- .../Data/Objects/ObjectViewQueryResultData.cs | 4 +- .../Data/Objects/ProxyDataContractResolver.cs | 4 +- .../System/Data/Objects/RelationshipEntry.cs | 4 +- .../Data/Objects/RelationshipWrapper.cs | 4 +- .../System/Data/Objects/Span.cs | 4 +- .../System/Data/Objects/SpanIndex.cs | 4 +- .../Data/Objects/SqlClient/SqlFunctions.cs | 4 +- .../Objects/SqlClient/SqlSpatialFunctions.cs | 4 +- .../Data/OptimisticConcurrencyException.cs | 2 +- .../Data/PropertyConstraintException.cs | 4 +- .../Data/ProviderIncompatibleException.cs | 4 +- .../Data/Query/InternalTrees/AncillaryOps.cs | 4 +- .../Data/Query/InternalTrees/ColumnMap.cs | 4 +- .../Query/InternalTrees/ColumnMapCopier.cs | 4 +- .../Query/InternalTrees/ColumnMapFactory.cs | 4 +- .../Query/InternalTrees/ColumnMapVisitor.cs | 4 +- .../Data/Query/InternalTrees/Command.cs | 4 +- .../System/Data/Query/InternalTrees/Dump.cs | 4 +- .../InternalTrees/ExplicitDiscriminatorMap.cs | 4 +- .../Data/Query/InternalTrees/Metadata.cs | 4 +- .../Data/Query/InternalTrees/NodeCounter.cs | 4 +- .../Data/Query/InternalTrees/NodeInfo.cs | 8 +- .../System/Data/Query/InternalTrees/Nodes.cs | 4 +- .../Data/Query/InternalTrees/OpCopier.cs | 4 +- .../System/Data/Query/InternalTrees/Ops.cs | 4 +- .../Data/Query/InternalTrees/PhysicalOps.cs | 4 +- .../System/Data/Query/InternalTrees/RelOps.cs | 4 +- .../Query/InternalTrees/RelPropertyHelper.cs | 4 +- .../System/Data/Query/InternalTrees/Rule.cs | 4 +- .../Query/InternalTrees/RulePatternOps.cs | 4 +- .../Data/Query/InternalTrees/RuleProcessor.cs | 4 +- .../Data/Query/InternalTrees/ScalarOps.cs | 4 +- .../System/Data/Query/InternalTrees/Vars.cs | 4 +- .../Data/Query/InternalTrees/Visitors.cs | 4 +- .../Query/PlanCompiler/AggregatePushdown.cs | 4 +- .../Data/Query/PlanCompiler/CTreeGenerator.cs | 6 +- .../System/Data/Query/PlanCompiler/CodeGen.cs | 4 +- .../Query/PlanCompiler/ColumnMapProcessor.cs | 4 +- .../Query/PlanCompiler/ColumnMapTranslator.cs | 4 +- .../Data/Query/PlanCompiler/CommandPlan.cs | 4 +- .../Query/PlanCompiler/ConstraintManager.cs | 4 +- .../Data/Query/PlanCompiler/ITreeGenerator.cs | 4 +- .../Query/PlanCompiler/JoinElimination.cs | 4 +- .../Data/Query/PlanCompiler/JoinGraph.cs | 14 +- .../Data/Query/PlanCompiler/KeyPullup.cs | 4 +- .../Data/Query/PlanCompiler/NestPullup.cs | 30 +- .../PlanCompiler/NominalTypeEliminator.cs | 10 +- .../Data/Query/PlanCompiler/Normalizer.cs | 4 +- .../Data/Query/PlanCompiler/PlanCompiler.cs | 4 +- .../Query/PlanCompiler/PlanCompilerUtil.cs | 4 +- .../Data/Query/PlanCompiler/PreProcessor.cs | 8 +- .../Data/Query/PlanCompiler/Predicate.cs | 4 +- .../Query/PlanCompiler/ProjectionPruner.cs | 4 +- .../PlanCompiler/PropertyPushdownHelper.cs | 6 +- .../Data/Query/PlanCompiler/PropertyRef.cs | 4 +- .../PlanCompiler/ProviderCommandInfoUtils.cs | 4 +- .../Query/PlanCompiler/StructuredTypeInfo.cs | 14 +- .../PlanCompiler/SubqueryTrackingVisitor.cs | 4 +- .../Query/PlanCompiler/TransformationRules.cs | 40 +- .../Data/Query/PlanCompiler/TypeInfo.cs | 4 +- .../Data/Query/PlanCompiler/TypeUtils.cs | 4 +- .../System/Data/Query/PlanCompiler/VarInfo.cs | 4 +- .../Data/Query/PlanCompiler/VarRefManager.cs | 4 +- .../Data/Query/PlanCompiler/VarRemapper.cs | 4 +- .../Query/ResultAssembly/BridgeDataReader.cs | 4 +- .../Query/ResultAssembly/BridgeDataRecord.cs | 4 +- .../System/Data/Spatial/DbGeography.cs | 2 +- .../Data/Spatial/DbGeographyWellKnownValue.cs | 2 +- .../System/Data/Spatial/DbGeometry.cs | 2 +- .../Data/Spatial/DbGeometryWellKnownValue.cs | 2 +- .../System/Data/Spatial/DbSpatialServices.cs | 2 +- .../Data/Spatial/DefaultSpatialServices.cs | 2 +- .../System/Data/Spatial/ExtensionMethods.cs | 2 +- .../Spatial/Internal/SpatialExceptions.cs | 2 +- .../System/Data/Spatial/SpatialHelpers.cs | 2 +- .../System/Data/SqlClient/IDbSpatialValue.cs | 2 +- .../Data/SqlClient/SqlGen/DmlSqlGenerator.cs | 4 +- .../Data/SqlClient/SqlGen/JoinSymbol.cs | 4 +- .../Data/SqlClient/SqlGen/OptionalColumn.cs | 2 +- .../SqlGen/Sql8ConformanceChecker.cs | 4 +- .../SqlGen/Sql8ExpressionRewriter.cs | 4 +- .../Data/SqlClient/SqlGen/SqlBuilder.cs | 4 +- .../SqlGen/SqlFunctionCallHandler.cs | 6 +- .../Data/SqlClient/SqlGen/SqlGenerator.cs | 8 +- .../SqlGen/SqlSelectClauseBuilder.cs | 2 +- .../SqlClient/SqlGen/SqlSelectStatement.cs | 4 +- .../System/Data/SqlClient/SqlGen/SqlWriter.cs | 4 +- .../System/Data/SqlClient/SqlGen/Symbol.cs | 4 +- .../Data/SqlClient/SqlGen/SymbolPair.cs | 4 +- .../Data/SqlClient/SqlGen/SymbolTable.cs | 4 +- .../SqlClient/SqlGen/SymbolUsageManager.cs | 2 +- .../System/Data/SqlClient/SqlGen/TopClause.cs | 4 +- .../Data/SqlClient/SqlProviderManifest.cs | 4 +- .../Data/SqlClient/SqlProviderServices.cs | 4 +- .../Data/SqlClient/SqlProviderUtilities.cs | 4 +- .../Data/SqlClient/SqlSpatialDataReader.cs | 2 +- .../SqlClient/SqlSpatialServices.Generated.cs | 2 +- .../Data/SqlClient/SqlSpatialServices.cs | 2 +- .../System/Data/SqlClient/SqlTypesAssembly.cs | 2 +- .../System/Data/SqlClient/SqlVersion.cs | 4 +- .../System/Data/UpdateException.cs | 4 +- System.Data.Entity/Util/AppSettings.cs | 2 +- System.Data.Linq/ChangeConflicts.cs | 4 +- System.Data.Linq/ChangeDirector.cs | 22 +- System.Data.Linq/ChangeProcessor.cs | 4 +- System.Data.Linq/ChangeTracker.cs | 2 +- System.Data.Linq/CompiledQuery.cs | 32 +- System.Data.Linq/DataContext.cs | 20 +- System.Data.Linq/DataShape.cs | 10 +- System.Data.Linq/DbConvert.cs | 4 +- System.Data.Linq/IdentityManager.cs | 4 +- System.Data.Linq/Mapping/MetaModel.cs | 2 +- System.Data.Linq/Provider/IProvider.cs | 28 +- .../SqlClient/Common/SqlVisitor.cs | 2 +- .../SqlClient/Query/Funcletizer.cs | 2 +- .../SqlClient/Query/QueryConverter.cs | 2 +- System.Data.Linq/SqlClient/Query/SqlBinder.cs | 2 +- .../SqlClient/Query/SqlComparer.cs | 2 +- .../SqlClient/Query/SqlDeflator.cs | 2 +- .../SqlClient/Query/SqlFlattener.cs | 2 +- .../SqlClient/Query/SqlMethodCallConverter.cs | 6 +- .../SqlClient/Reader/ObjectReaderCompiler.cs | 28 +- System.Data.Linq/SqlClient/SqlMethods.cs | 16 +- System.Data.Linq/SqlClient/SqlProvider.cs | 4 +- .../SqlClient/SqlTypeSystemProvider.cs | 2 +- System.Data.Linq/Types.cs | 18 +- System.Data.Linq/misc/SecurityUtils.cs | 6 +- .../System/Xml/Xsl/IlGen/GenerateHelper.cs | 2 +- .../Xml/Xsl/IlGen/IteratorDescriptor.cs | 2 +- .../System/Xml/Xsl/IlGen/OptimizerPatterns.cs | 2 +- .../System/Xml/Xsl/IlGen/StaticDataManager.cs | 4 +- .../System/Xml/Xsl/IlGen/TailCallAnalyzer.cs | 2 +- .../System/Xml/Xsl/IlGen/XmlILAnnotation.cs | 2 +- .../Xml/Xsl/IlGen/XmlILConstructAnalyzer.cs | 2 +- .../System/Xml/Xsl/IlGen/XmlILModule.cs | 4 +- .../Xml/Xsl/IlGen/XmlILOptimizerVisitor.cs | 2 +- .../System/Xml/Xsl/IlGen/XmlIlTypeHelper.cs | 2 +- .../System/Xml/Xsl/IlGen/XmlIlVisitor.cs | 2 +- System.Data.SqlXml/System/Xml/Xsl/ListBase.cs | 2 +- System.Data.SqlXml/System/Xml/Xsl/Pair.cs | 2 +- .../System/Xml/Xsl/QIL/QilBinary.cs | 2 +- .../System/Xml/Xsl/QIL/QilChoice.cs | 2 +- .../System/Xml/Xsl/QIL/QilCloneVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilDataSource.cs | 2 +- .../System/Xml/Xsl/QIL/QilExpression.cs | 2 +- .../System/Xml/Xsl/QIL/QilFactory.cs | 2 +- .../System/Xml/Xsl/QIL/QilFunction.cs | 2 +- .../System/Xml/Xsl/QIL/QilInvoke.cs | 2 +- .../System/Xml/Xsl/QIL/QilInvokeEarlyBound.cs | 2 +- .../System/Xml/Xsl/QIL/QilInvokeLateBound.cs | 2 +- .../System/Xml/Xsl/QIL/QilIterator.cs | 2 +- .../System/Xml/Xsl/QIL/QilList.cs | 2 +- .../System/Xml/Xsl/QIL/QilLiteral.cs | 2 +- .../System/Xml/Xsl/QIL/QilLoop.cs | 2 +- .../System/Xml/Xsl/QIL/QilName.cs | 2 +- .../System/Xml/Xsl/QIL/QilNode.cs | 2 +- .../System/Xml/Xsl/QIL/QilParameter.cs | 2 +- .../System/Xml/Xsl/QIL/QilPatternFactory.cs | 2 +- .../System/Xml/Xsl/QIL/QilPatternVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilReference.cs | 2 +- .../System/Xml/Xsl/QIL/QilReplaceVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilScopedVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilSortKey.cs | 2 +- .../System/Xml/Xsl/QIL/QilStrConcat.cs | 2 +- .../System/Xml/Xsl/QIL/QilTargetType.cs | 2 +- .../System/Xml/Xsl/QIL/QilTernary.cs | 2 +- .../System/Xml/Xsl/QIL/QilTypeChecker.cs | 2 +- .../System/Xml/Xsl/QIL/QilUnary.cs | 2 +- .../Xml/Xsl/QIL/QilValidationVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilVisitor.cs | 2 +- .../System/Xml/Xsl/QIL/QilXmlReader.cs | 2 +- .../System/Xml/Xsl/QIL/QilXmlWriter.cs | 2 +- .../System/Xml/Xsl/QIL/SubstitutionList.cs | 2 +- .../System/Xml/Xsl/QIL/WhitespaceRule.cs | 4 +- .../System/Xml/Xsl/QueryReaderSettings.cs | 2 +- .../Xml/Xsl/Runtime/ContentIterators.cs | 2 +- .../Xml/Xsl/Runtime/DecimalFormatter.cs | 2 +- .../Xml/Xsl/Runtime/DocumentOrderComparer.cs | 2 +- .../Xml/Xsl/Runtime/DodSequenceMerge.cs | 2 +- .../System/Xml/Xsl/Runtime/EarlyBoundInfo.cs | 4 +- .../System/Xml/Xsl/Runtime/NumberFormatter.cs | 2 +- .../System/Xml/Xsl/Runtime/RtfNavigator.cs | 2 +- .../System/Xml/Xsl/Runtime/SetIterators.cs | 2 +- .../Xml/Xsl/Runtime/SiblingIterators.cs | 2 +- .../System/Xml/Xsl/Runtime/StringConcat.cs | 2 +- .../System/Xml/Xsl/Runtime/TreeIterators.cs | 2 +- .../Xml/Xsl/Runtime/WhitespaceRuleLookup.cs | 2 +- .../Xml/Xsl/Runtime/WhitespaceRuleReader.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlAggregates.cs | 2 +- .../Xml/Xsl/Runtime/XmlAttributeCache.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlCollation.cs | 2 +- .../Xml/Xsl/Runtime/XmlExtensionFunction.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlILIndex.cs | 2 +- .../Xml/Xsl/Runtime/XmlILStorageConverter.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlIterators.cs | 2 +- .../Xml/Xsl/Runtime/XmlNavigatorFilter.cs | 2 +- .../Xml/Xsl/Runtime/XmlNavigatorStack.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlQueryContext.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlQueryOutput.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlQueryRuntime.cs | 2 +- .../Xml/Xsl/Runtime/XmlQuerySequence.cs | 2 +- .../Xml/Xsl/Runtime/XmlQueryStaticData.cs | 2 +- .../Xml/Xsl/Runtime/XmlRawWriterWrapper.cs | 2 +- .../Xml/Xsl/Runtime/XmlSequenceWriter.cs | 2 +- .../System/Xml/Xsl/Runtime/XmlSortKey.cs | 2 +- .../Xml/Xsl/Runtime/XmlSortKeyAccumulator.cs | 2 +- .../System/Xml/Xsl/Runtime/XslNumber.cs | 2 +- .../System/Xml/Xsl/Runtime/XsltConvert.cs | 2 +- .../System/Xml/Xsl/Runtime/XsltFunctions.cs | 2 +- .../System/Xml/Xsl/Runtime/XsltLibrary.cs | 2 +- .../System/Xml/Xsl/SourceLineInfo.cs | 2 +- .../System/Xml/Xsl/XPath/XPathBuilder.cs | 4 +- .../Xml/Xsl/XPath/XPathCompileException.cs | 2 +- .../System/Xml/Xsl/XPath/XPathParser.cs | 2 +- .../System/Xml/Xsl/XPath/XPathQilFactory.cs | 2 +- .../System/Xml/Xsl/XPath/XPathScanner.cs | 2 +- .../System/Xml/Xsl/XPathConvert.cs | 4 +- .../System/Xml/Xsl/XmlILCommand.cs | 4 +- .../System/Xml/Xsl/XmlIlGenerator.cs | 4 +- .../System/Xml/Xsl/XmlQualifiedNameTest.cs | 2 +- .../System/Xml/Xsl/XmlQueryCardinality.cs | 2 +- .../System/Xml/Xsl/XmlQueryType.cs | 4 +- .../System/Xml/Xsl/XmlQueryTypeFactory.cs | 4 +- .../System/Xml/Xsl/XslException.cs | 2 +- .../System/Xml/Xsl/Xslt/Compiler.cs | 2 +- .../Xml/Xsl/Xslt/CompilerScopeManager.cs | 2 +- .../System/Xml/Xsl/Xslt/Focus.cs | 2 +- .../System/Xml/Xsl/Xslt/InvokeGenerator.cs | 2 +- .../System/Xml/Xsl/Xslt/KeyMatchBuilder.cs | 2 +- .../System/Xml/Xsl/Xslt/Keywords.cs | 2 +- .../System/Xml/Xsl/Xslt/MatcherBuilder.cs | 2 +- .../System/Xml/Xsl/Xslt/OutputScopeManager.cs | 2 +- .../System/Xml/Xsl/Xslt/QilGenerator.cs | 2 +- .../System/Xml/Xsl/Xslt/QilGeneratorEnv.cs | 2 +- .../System/Xml/Xsl/Xslt/QilStrConcatenator.cs | 2 +- .../System/Xml/Xsl/Xslt/Scripts.cs | 4 +- .../System/Xml/Xsl/Xslt/Stylesheet.cs | 2 +- .../Xml/Xsl/Xslt/XPathPatternBuilder.cs | 2 +- .../System/Xml/Xsl/Xslt/XPathPatternParser.cs | 2 +- .../System/Xml/Xsl/Xslt/XslAst.cs | 2 +- .../System/Xml/Xsl/Xslt/XslAstAnalyzer.cs | 4 +- .../System/Xml/Xsl/Xslt/XslVisitor.cs | 2 +- .../System/Xml/Xsl/Xslt/XsltInput.cs | 2 +- .../System/Xml/Xsl/Xslt/XsltLoader.cs | 2 +- .../System/Xml/Xsl/Xslt/XsltQilFactory.cs | 2 +- .../System/Xml/Xsl/XsltOld/Action.cs | 2 +- .../System/Xml/Xsl/XsltOld/ActionFrame.cs | 2 +- .../Xml/Xsl/XsltOld/ApplyImportsAction.cs | 2 +- .../Xml/Xsl/XsltOld/ApplyTemplatesAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/AttributeAction.cs | 2 +- .../Xml/Xsl/XsltOld/AttributeSetAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/Avt.cs | 2 +- .../System/Xml/Xsl/XsltOld/AvtEvent.cs | 2 +- .../System/Xml/Xsl/XsltOld/BeginEvent.cs | 2 +- .../System/Xml/Xsl/XsltOld/BuilderInfo.cs | 2 +- .../Xml/Xsl/XsltOld/CallTemplateAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/ChooseAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/CommentAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/CompiledAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/Compiler.cs | 2 +- .../System/Xml/Xsl/XsltOld/ContainerAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/CopyAction.cs | 2 +- .../Xml/Xsl/XsltOld/CopyAttributesAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/CopyCodeAction.cs | 2 +- .../Xml/Xsl/XsltOld/CopyNamespacesAction.cs | 2 +- .../Xml/Xsl/XsltOld/CopyNodesetAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/CopyOfAction.cs | 6 +- .../System/Xml/Xsl/XsltOld/DbgCompiler.cs | 2 +- .../System/Xml/Xsl/XsltOld/DocumentScope.cs | 2 +- .../System/Xml/Xsl/XsltOld/ElementAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/EndEvent.cs | 2 +- .../System/Xml/Xsl/XsltOld/Event.cs | 2 +- .../System/Xml/Xsl/XsltOld/ForeachAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/HtmlProps.cs | 2 +- .../System/Xml/Xsl/XsltOld/IfAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/InputScope.cs | 2 +- .../Xml/Xsl/XsltOld/InputScopeManager.cs | 2 +- .../System/Xml/Xsl/XsltOld/MessageAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/NamespaceDecl.cs | 2 +- .../System/Xml/Xsl/XsltOld/NamespaceEvent.cs | 2 +- .../System/Xml/Xsl/XsltOld/NavigatorInput.cs | 2 +- .../System/Xml/Xsl/XsltOld/NavigatorOutput.cs | 2 +- .../Xml/Xsl/XsltOld/NewInstructionAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/NumberAction.cs | 4 +- .../System/Xml/Xsl/XsltOld/OutKeywords.cs | 2 +- .../System/Xml/Xsl/XsltOld/OutputScope.cs | 2 +- .../Xml/Xsl/XsltOld/OutputScopeManager.cs | 2 +- .../System/Xml/Xsl/XsltOld/PrefixQname.cs | 2 +- .../XsltOld/ProcessingInstructionAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/Processor.cs | 2 +- .../System/Xml/Xsl/XsltOld/ReaderOutput.cs | 2 +- .../System/Xml/Xsl/XsltOld/RecordBuilder.cs | 2 +- .../System/Xml/Xsl/XsltOld/RootAction.cs | 2 +- .../Xml/Xsl/XsltOld/SequentialOutput.cs | 2 +- .../System/Xml/Xsl/XsltOld/SortAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/StateMachine.cs | 2 +- .../System/Xml/Xsl/XsltOld/StringOutput.cs | 2 +- .../System/Xml/Xsl/XsltOld/Stylesheet.cs | 2 +- .../System/Xml/Xsl/XsltOld/TemplateAction.cs | 2 +- .../Xml/Xsl/XsltOld/TemplateBaseAction.cs | 2 +- .../Xml/Xsl/XsltOld/TemplateLookupAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/Templatemanager.cs | 2 +- .../System/Xml/Xsl/XsltOld/TextAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/TextEvent.cs | 2 +- .../System/Xml/Xsl/XsltOld/TextOnlyOutput.cs | 2 +- .../System/Xml/Xsl/XsltOld/TextOutput.cs | 2 +- .../System/Xml/Xsl/XsltOld/TheQuery.cs | 2 +- .../Xml/Xsl/XsltOld/UseAttributesetsAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/ValueOfAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/VariableAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/WithParamAction.cs | 2 +- .../System/Xml/Xsl/XsltOld/WriterOutput.cs | 2 +- .../Xml/Xsl/XsltOld/XsltCompileContext.cs | 4 +- .../System/Xml/Xsl/XsltOld/XsltOutput.cs | 2 +- .../SqlServer/Server/MemoryRecordBuffer.cs | 6 +- .../SqlServer/Server/MetadataUtilsSmi.cs | 4 +- .../SqlServer/Server/SmiConnection.cs | 4 +- .../Microsoft/SqlServer/Server/SmiContext.cs | 4 +- .../SqlServer/Server/SmiContextFactory.cs | 4 +- .../SqlServer/Server/SmiEventSink.cs | 4 +- .../SqlServer/Server/SmiEventSink_Default.cs | 4 +- .../Server/SmiEventSink_DeferedProcessing.cs | 4 +- .../SqlServer/Server/SmiEventStream.cs | 4 +- .../SqlServer/Server/SmiGettersStream.cs | 4 +- .../Microsoft/SqlServer/Server/SmiMetaData.cs | 4 +- .../SqlServer/Server/SmiMetaDataProperty.cs | 4 +- .../SqlServer/Server/SmiRecordBuffer.cs | 4 +- .../SqlServer/Server/SmiRequestExecutor.cs | 4 +- .../SqlServer/Server/SmiSettersStream.cs | 4 +- .../SqlServer/Server/SmiTypedGetterSetter.cs | 4 +- .../SqlServer/Server/SmiXetterAccessMap.cs | 4 +- .../SqlServer/Server/SqlDataRecord.cs | 8 +- .../SqlServer/Server/SqlRecordBuffer.cs | 6 +- .../SqlServer/Server/SqlTriggerContext.cs | 4 +- .../SqlServer/Server/ValueUtilsSmi.cs | 12 +- .../Microsoft/SqlServer/Server/sqlcontext.cs | 4 +- .../Microsoft/SqlServer/Server/sqlpipe.cs | 4 +- System.Data/System/Data/BaseCollection.cs | 6 +- .../Data/CodeGen/StrongTypingException.cs | 6 +- System.Data/System/Data/CodeGen/datacache.cs | 8 +- .../System/Data/ColumnTypeConverter.cs | 6 +- .../System/Data/Common/ActivityCorrelator.cs | 2 +- System.Data/System/Data/Common/AdapterUtil.cs | 7 +- .../System/Data/Common/BigIntegerStorage.cs | 4 +- .../System/Data/Common/BooleanStorage.cs | 6 +- System.Data/System/Data/Common/ByteStorage.cs | 6 +- System.Data/System/Data/Common/CharStorage.cs | 6 +- System.Data/System/Data/Common/DBCommand.cs | 4 +- .../System/Data/Common/DBCommandBuilder.cs | 4 +- .../System/Data/Common/DBConnection.cs | 6 +- .../System/Data/Common/DBConnectionString.cs | 6 +- .../System/Data/Common/DBDataPermission.cs | 4 +- .../Data/Common/DBDataPermissionAttribute.cs | 4 +- System.Data/System/Data/Common/DBParameter.cs | 4 +- System.Data/System/Data/Common/DBSchemaRow.cs | 4 +- .../System/Data/Common/DBSchemaTable.cs | 4 +- System.Data/System/Data/Common/DataAdapter.cs | 4 +- .../System/Data/Common/DataColumnMapping.cs | 4 +- .../Common/DataColumnMappingCollection.cs | 4 +- .../System/Data/Common/DataRecordInternal.cs | 4 +- System.Data/System/Data/Common/DataStorage.cs | 4 +- .../System/Data/Common/DataTableMapping.cs | 4 +- .../Data/Common/DataTableMappingCollection.cs | 4 +- .../Data/Common/DateTimeOffsetStorage.cs | 4 +- .../System/Data/Common/DateTimeStorage.cs | 6 +- .../System/Data/Common/DbConnectionOptions.cs | 4 +- .../System/Data/Common/DbConnectionPoolKey.cs | 4 +- .../Data/Common/DbConnectionStringBuilder.cs | 6 +- .../Data/Common/DbConnectionStringCommon.cs | 123 ++--- .../System/Data/Common/DbDataAdapter.cs | 4 +- .../System/Data/Common/DbDataReader.cs | 4 +- .../Data/Common/DbDataSourceEnumerator.cs | 4 +- System.Data/System/Data/Common/DbException.cs | 4 +- .../Data/Common/DbParameterCollection.cs | 4 +- .../Common/DbProviderConfigurationHandler.cs | 4 +- .../System/Data/Common/DbProviderFactories.cs | 4 +- ...DbProviderFactoriesConfigurationHandler.cs | 10 +- .../System/Data/Common/DbProviderFactory.cs | 4 +- ...DbProviderSpecificTypePropertyAttribute.cs | 4 +- .../System/Data/Common/DbTransaction.cs | 4 +- .../System/Data/Common/DecimalStorage.cs | 6 +- .../System/Data/Common/DoubleStorage.cs | 6 +- .../System/Data/Common/FieldNameLookup.cs | 4 +- .../System/Data/Common/GreenMethods.cs | 4 +- System.Data/System/Data/Common/HandlerBase.cs | 4 +- .../System/Data/Common/Int16Storage.cs | 6 +- .../System/Data/Common/Int32Storage.cs | 6 +- .../System/Data/Common/Int64Storage.cs | 6 +- .../System/Data/Common/MultipartIdentifier.cs | 4 +- .../System/Data/Common/NameValuePair.cs | 4 +- .../System/Data/Common/NameValuePermission.cs | 4 +- .../System/Data/Common/ObjectStorage.cs | 4 +- .../System/Data/Common/RowUpdatedEventArgs.cs | 4 +- .../Data/Common/RowUpdatingEventArgs.cs | 4 +- .../System/Data/Common/SByteStorage.cs | 6 +- System.Data/System/Data/Common/SQLConvert.cs | 4 +- .../Data/Common/SQLTypes/SQLBinaryStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLByteStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLBytesStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLCharsStorage.cs | 8 +- .../Common/SQLTypes/SQLDateTimeStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLDecimalStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLDoubleStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLGuidStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLInt16Storage.cs | 8 +- .../Data/Common/SQLTypes/SQLInt32Storage.cs | 8 +- .../Data/Common/SQLTypes/SQLInt64Storage.cs | 8 +- .../Data/Common/SQLTypes/SQLMoneyStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLSingleStorage.cs | 8 +- .../Data/Common/SQLTypes/SQLStringStorage.cs | 8 +- .../Data/Common/SQLTypes/SQlBooleanStorage.cs | 8 +- .../Data/Common/SQLTypes/SqlUDTStorage.cs | 8 +- .../Data/Common/SQLTypes/SqlXmlStorage.cs | 6 +- .../System/Data/Common/SafeNativeMethods.cs | 6 +- .../System/Data/Common/SchemaTableColumn.cs | 2 +- .../Data/Common/SchemaTableOptionalColumn.cs | 2 +- .../System/Data/Common/SingleStorage.cs | 6 +- .../System/Data/Common/StringStorage.cs | 6 +- .../System/Data/Common/System.Data_BID.cs | 4 +- .../System/Data/Common/TimeSpanStorage.cs | 6 +- .../System/Data/Common/UInt16Storage.cs | 6 +- .../System/Data/Common/UInt32Storage.cs | 6 +- .../System/Data/Common/UInt64Storage.cs | 6 +- .../System/Data/Common/UnsafeNativeMethods.cs | 6 +- .../System/Data/Common/dbdatarecord.cs | 4 +- .../System/Data/Common/dbenumerator.cs | 4 +- System.Data/System/Data/Constraint.cs | 6 +- .../System/Data/ConstraintCollection.cs | 6 +- .../System/Data/ConstraintConverter.cs | 6 +- .../System/Data/ConstraintEnumerator.cs | 6 +- .../System/Data/DBConcurrencyException.cs | 4 +- System.Data/System/Data/DataColumn.cs | 6 +- .../System/Data/DataColumnChangeEvent.cs | 6 +- .../System/Data/DataColumnCollection.cs | 6 +- .../Data/DataColumnPropertyDescriptor.cs | 6 +- System.Data/System/Data/DataError.cs | 6 +- System.Data/System/Data/DataException.cs | 6 +- System.Data/System/Data/DataKey.cs | 6 +- System.Data/System/Data/DataRelation.cs | 6 +- .../System/Data/DataRelationCollection.cs | 8 +- .../Data/DataRelationPropertyDescriptor.cs | 6 +- System.Data/System/Data/DataRow.cs | 10 +- System.Data/System/Data/DataRowChangeEvent.cs | 6 +- System.Data/System/Data/DataRowCollection.cs | 6 +- System.Data/System/Data/DataRowView.cs | 4 +- System.Data/System/Data/DataSet.cs | 10 +- System.Data/System/Data/DataSysAttribute.cs | 4 +- System.Data/System/Data/DataTable.cs | 40 +- .../System/Data/DataTableClearEvent.cs | 4 +- .../System/Data/DataTableCollection.cs | 8 +- .../System/Data/DataTableNewRowEvent.cs | 4 +- .../Data/DataTablePropertyDescriptor.cs | 6 +- System.Data/System/Data/DataTableReader.cs | 6 +- .../System/Data/DataTableReaderListener.cs | 4 +- .../System/Data/DataTableTypeConverter.cs | 6 +- System.Data/System/Data/DataView.cs | 10 +- System.Data/System/Data/DataViewListener.cs | 4 +- System.Data/System/Data/DataViewManager.cs | 8 +- .../DataViewManagerListItemTypeDescriptor.cs | 6 +- System.Data/System/Data/DataViewSetting.cs | 6 +- .../System/Data/DataViewSettingCollection.cs | 6 +- .../System/Data/DefaultValueTypeConverter.cs | 6 +- System.Data/System/Data/FillErrorEventArgs.cs | 4 +- .../System/Data/Filter/AggregateNode.cs | 4 +- System.Data/System/Data/Filter/BinaryNode.cs | 6 +- System.Data/System/Data/Filter/ConstNode.cs | 6 +- .../System/Data/Filter/DataExpression.cs | 6 +- .../System/Data/Filter/ExpressionNode.cs | 6 +- .../System/Data/Filter/ExpressionParser.cs | 6 +- .../System/Data/Filter/FilterException.cs | 6 +- .../System/Data/Filter/FunctionNode.cs | 6 +- System.Data/System/Data/Filter/LookupNode.cs | 8 +- System.Data/System/Data/Filter/NameNode.cs | 6 +- System.Data/System/Data/Filter/Operators.cs | 6 +- System.Data/System/Data/Filter/UnaryNode.cs | 6 +- System.Data/System/Data/Filter/ZeroOpNode.cs | 6 +- .../System/Data/ForeignKeyConstraint.cs | 8 +- System.Data/System/Data/MergeFailedEvent.cs | 6 +- System.Data/System/Data/Merger.cs | 4 +- System.Data/System/Data/Odbc/DbDataRecord.cs | 4 +- System.Data/System/Data/Odbc/Odbc32.cs | 4 +- System.Data/System/Data/Odbc/OdbcCommand.cs | 4 +- .../System/Data/Odbc/OdbcCommandBuilder.cs | 4 +- .../System/Data/Odbc/OdbcConnection.cs | 4 +- .../System/Data/Odbc/OdbcConnectionFactory.cs | 4 +- .../System/Data/Odbc/OdbcConnectionHandle.cs | 4 +- .../System/Data/Odbc/OdbcConnectionOpen.cs | 4 +- .../Odbc/OdbcConnectionPoolProviderInfo.cs | 4 +- .../System/Data/Odbc/OdbcConnectionString.cs | 4 +- .../Data/Odbc/OdbcConnectionStringbuilder.cs | 4 +- .../System/Data/Odbc/OdbcDataAdapter.cs | 4 +- .../System/Data/Odbc/OdbcDataReader.cs | 26 +- .../System/Data/Odbc/OdbcEnvironment.cs | 4 +- .../System/Data/Odbc/OdbcEnvironmentHandle.cs | 4 +- System.Data/System/Data/Odbc/OdbcError.cs | 4 +- .../System/Data/Odbc/OdbcErrorCollection.cs | 4 +- System.Data/System/Data/Odbc/OdbcException.cs | 6 +- System.Data/System/Data/Odbc/OdbcFactory.cs | 4 +- System.Data/System/Data/Odbc/OdbcHandle.cs | 4 +- .../System/Data/Odbc/OdbcInfoMessageEvent.cs | 4 +- System.Data/System/Data/Odbc/OdbcParameter.cs | 18 +- .../Data/Odbc/OdbcParameterCollection.cs | 4 +- .../System/Data/Odbc/OdbcPermission.cs | 4 +- .../Data/Odbc/OdbcReferenceCollection.cs | 4 +- .../System/Data/Odbc/OdbcRowUpdatingEvent.cs | 4 +- .../System/Data/Odbc/OdbcStatementHandle.cs | 4 +- .../System/Data/Odbc/OdbcTransaction.cs | 4 +- System.Data/System/Data/Odbc/OdbcUtils.cs | 4 +- .../Data/Odbc/odbcmetadatacollectionnames.cs | 4 +- .../Data/Odbc/odbcmetadatacolumnnames.cs | 4 +- .../System/Data/Odbc/odbcmetadatafactory.cs | 6 +- .../System/Data/OleDb/ColumnBinding.cs | 4 +- System.Data/System/Data/OleDb/DBBindings.cs | 4 +- System.Data/System/Data/OleDb/DBPropSet.cs | 4 +- System.Data/System/Data/OleDb/OLEDB_Enum.cs | 4 +- System.Data/System/Data/OleDb/OLEDB_Util.cs | 4 +- System.Data/System/Data/OleDb/OleDbCommand.cs | 4 +- .../System/Data/OleDb/OleDbCommandBuilder.cs | 4 +- .../System/Data/OleDb/OleDbConnection.cs | 4 +- .../Data/OleDb/OleDbConnectionFactory.cs | 4 +- .../Data/OleDb/OleDbConnectionInternal.cs | 4 +- .../OleDbConnectionPoolGroupProviderInfo.cs | 2 +- .../System/Data/OleDb/OleDbDataAdapter.cs | 4 +- .../System/Data/OleDb/OleDbDataReader.cs | 6 +- .../System/Data/OleDb/OleDbEnumerator.cs | 4 +- System.Data/System/Data/OleDb/OleDbError.cs | 4 +- .../System/Data/OleDb/OleDbErrorCollection.cs | 4 +- .../System/Data/OleDb/OleDbException.cs | 4 +- System.Data/System/Data/OleDb/OleDbFactory.cs | 4 +- .../Data/OleDb/OleDbInfoMessageEvent.cs | 4 +- .../System/Data/OleDb/OleDbMetaDataFactory.cs | 2 +- .../System/Data/OleDb/OleDbParameter.cs | 4 +- .../Data/OleDb/OleDbParameterCollection.cs | 4 +- .../System/Data/OleDb/OleDbPermission.cs | 4 +- .../System/Data/OleDb/OleDbPropertySetGuid.cs | 4 +- .../Data/OleDb/OleDbReferenceCollection.cs | 4 +- .../System/Data/OleDb/OleDbRowUpdatedEvent.cs | 4 +- .../Data/OleDb/OleDbRowUpdatingEvent.cs | 4 +- .../System/Data/OleDb/OleDbSchemaGuid.cs | 4 +- System.Data/System/Data/OleDb/OleDbStruct.cs | 4 +- .../System/Data/OleDb/OleDbTransaction.cs | 4 +- System.Data/System/Data/OleDb/OleDbWrapper.cs | 4 +- .../OleDb/OledbConnectionStringbuilder.cs | 4 +- .../System/Data/OleDb/PropertyIDSet.cs | 4 +- .../System/Data/OleDb/PropertyInfoSet.cs | 4 +- System.Data/System/Data/OleDb/RowBinding.cs | 4 +- System.Data/System/Data/OleDb/SafeHandles.cs | 4 +- .../Data/OleDb/oledbconnectionstring.cs | 4 +- .../OleDb/oledbmetadatacollectionnames.cs | 4 +- .../Data/OleDb/oledbmetadatacolumnnames.cs | 4 +- .../System/Data/OperationAbortedException.cs | 4 +- .../System/Data/PrimaryKeyTypeConverter.cs | 6 +- System.Data/System/Data/PropertyCollection.cs | 6 +- .../Data/ProviderBase/DataReaderContainer.cs | 2 +- .../System/Data/ProviderBase/DbBuffer.cs | 2 +- .../Data/ProviderBase/DbConnectionClosed.cs | 4 +- .../Data/ProviderBase/DbConnectionFactory.cs | 4 +- .../Data/ProviderBase/DbConnectionHelper.cs | 2 +- .../Data/ProviderBase/DbConnectionInternal.cs | 26 +- .../Data/ProviderBase/DbConnectionPool.cs | 6 +- .../ProviderBase/DbConnectionPoolCounters.cs | 2 +- .../ProviderBase/DbConnectionPoolGroup.cs | 2 +- .../DbConnectionPoolGroupProviderInfo.cs | 4 +- .../ProviderBase/DbConnectionPoolIdentity.cs | 2 +- .../ProviderBase/DbConnectionPoolOptions.cs | 2 +- .../ProviderBase/DbMetaDataCollectionNames.cs | 4 +- .../ProviderBase/DbMetaDataColumnNames.cs | 4 +- .../Data/ProviderBase/DbMetaDataFactory.cs | 4 +- .../DbParameterCollectionHelper.cs | 2 +- .../Data/ProviderBase/DbParameterHelper.cs | 2 +- .../ProviderBase/DbReferenceCollection.cs | 4 +- .../System/Data/ProviderBase/SchemaMapping.cs | 2 +- .../System/Data/ProviderBase/TimeoutTimer.cs | 4 +- .../Data/ProviderBase/WrappedIUnknown.cs | 4 +- System.Data/System/Data/Range.cs | 6 +- System.Data/System/Data/RbTree.cs | 4 +- System.Data/System/Data/RecordManager.cs | 4 +- .../System/Data/RecordsAffectedEventArgs.cs | 4 +- System.Data/System/Data/RelatedView.cs | 4 +- .../System/Data/RelationshipConverter.cs | 6 +- System.Data/System/Data/SQLTypes/SQLBinary.cs | 4 +- .../System/Data/SQLTypes/SQLBoolean.cs | 4 +- System.Data/System/Data/SQLTypes/SQLByte.cs | 4 +- System.Data/System/Data/SQLTypes/SQLBytes.cs | 26 +- System.Data/System/Data/SQLTypes/SQLChars.cs | 24 +- .../System/Data/SQLTypes/SQLDateTime.cs | 10 +- .../System/Data/SQLTypes/SQLDecimal.cs | 6 +- System.Data/System/Data/SQLTypes/SQLDouble.cs | 4 +- .../System/Data/SQLTypes/SQLFileStream.cs | 10 +- System.Data/System/Data/SQLTypes/SQLGuid.cs | 4 +- System.Data/System/Data/SQLTypes/SQLInt16.cs | 4 +- System.Data/System/Data/SQLTypes/SQLInt32.cs | 4 +- System.Data/System/Data/SQLTypes/SQLInt64.cs | 4 +- System.Data/System/Data/SQLTypes/SQLMoney.cs | 4 +- .../System/Data/SQLTypes/SQLResource.cs | 4 +- System.Data/System/Data/SQLTypes/SQLSingle.cs | 4 +- System.Data/System/Data/SQLTypes/SQLString.cs | 4 +- .../System/Data/SQLTypes/SQLUtility.cs | 4 +- .../System/Data/SQLTypes/SqlCharStream.cs | 4 +- .../Data/SQLTypes/SqlTypesSchemaImporter.cs | 4 +- System.Data/System/Data/SQLTypes/SqlXml.cs | 14 +- .../Data/SQLTypes/UnsafeNativeMethods.cs | 6 +- System.Data/System/Data/Select.cs | 14 +- System.Data/System/Data/Selection.cs | 6 +- System.Data/System/Data/SimpleType.cs | 92 ++-- .../Data/Sql/SqlDataSourceEnumerator.cs | 4 +- .../System/Data/Sql/SqlFacetAttribute.cs | 8 +- .../System/Data/Sql/SqlFunctionAttribute.cs | 8 +- System.Data/System/Data/Sql/SqlGenericUtil.cs | 4 +- System.Data/System/Data/Sql/SqlMetaData.cs | 8 +- .../System/Data/Sql/SqlMethodAttribute.cs | 8 +- .../System/Data/Sql/SqlNotificationRequest.cs | 6 +- .../System/Data/Sql/SqlProcedureAttribute.cs | 8 +- .../System/Data/Sql/SqlTriggerAttribute.cs | 8 +- .../Sql/SqlUserDefinedAggregateAttribute.cs | 10 +- .../Data/Sql/SqlUserDefinedTypeAttribute.cs | 10 +- .../System/Data/Sql/invalidudtexception.cs | 4 +- System.Data/System/Data/Sql/sqlnorm.cs | 10 +- System.Data/System/Data/Sql/sqlser.cs | 10 +- .../Data/SqlClient/RowsCopiedEventArgs.cs | 4 +- .../System/Data/SqlClient/SqlBuffer.cs | 6 +- .../System/Data/SqlClient/SqlBulkCopy.cs | 45 +- .../SqlClient/SqlBulkCopyColumnMapping.cs | 4 +- .../SqlBulkCopyColumnMappingCollection.cs | 4 +- .../Data/SqlClient/SqlBulkCopyOptions.cs | 1 + .../System/Data/SqlClient/SqlCachedBuffer.cs | 4 +- .../System/Data/SqlClient/SqlClientFactory.cs | 4 +- .../SqlClientMetaDataCollectionNames.cs | 4 +- .../Data/SqlClient/SqlClientPermission.cs | 4 +- .../SqlClient/SqlClientWrapperSmiStream.cs | 4 +- .../SqlClientWrapperSmiStreamChars.cs | 4 +- ...olumnEncryptionCertificateStoreProvider.cs | 15 +- .../SqlColumnEncryptionCngProvider.cs | 414 ++++++++++++++++ .../SqlColumnEncryptionCspProvider.cs | 462 ++++++++++++++++++ .../System/Data/SqlClient/SqlCommand.cs | 14 +- .../Data/SqlClient/SqlCommandBuilder.cs | 4 +- .../System/Data/SqlClient/SqlCommandSet.cs | 4 +- .../System/Data/SqlClient/SqlConnection.cs | 38 +- .../Data/SqlClient/SqlConnectionFactory.cs | 18 +- .../SqlConnectionPoolGroupProviderInfo.cs | 4 +- .../Data/SqlClient/SqlConnectionPoolKey.cs | 4 +- .../SqlConnectionPoolProviderInfo.cs | 2 +- .../Data/SqlClient/SqlConnectionString.cs | 319 ++++++------ .../SqlClient/SqlConnectionStringBuilder.cs | 392 ++++++++------- .../SqlConnectionTimeoutErrorInternal.cs | 2 +- .../System/Data/SqlClient/SqlCredential.cs | 4 +- .../System/Data/SqlClient/SqlDataAdapter.cs | 4 +- .../System/Data/SqlClient/SqlDataReader.cs | 87 ++-- .../System/Data/SqlClient/SqlDataReaderSmi.cs | 4 +- .../Data/SqlClient/SqlDelegatedTransaction.cs | 27 +- .../System/Data/SqlClient/SqlDependency.cs | 6 +- .../Data/SqlClient/SqlDependencyListener.cs | 12 +- .../Data/SqlClient/SqlDependencyUtils.cs | 16 +- System.Data/System/Data/SqlClient/SqlEnums.cs | 4 +- System.Data/System/Data/SqlClient/SqlError.cs | 20 +- .../Data/SqlClient/SqlErrorCollection.cs | 4 +- .../System/Data/SqlClient/SqlException.cs | 4 +- .../Data/SqlClient/SqlInfoMessageEvent.cs | 4 +- .../Data/SqlClient/SqlInternalConnection.cs | 86 +++- .../SqlClient/SqlInternalConnectionSmi.cs | 4 +- .../SqlClient/SqlInternalConnectionTds.cs | 148 +++++- .../SqlClient/SqlNotificationEventArgs.cs | 6 +- .../System/Data/SqlClient/SqlParameter.cs | 50 +- .../Data/SqlClient/SqlParameterCollection.cs | 4 +- .../Data/SqlClient/SqlReferenceCollection.cs | 4 +- .../Data/SqlClient/SqlRowUpdatedEvent.cs | 4 +- .../Data/SqlClient/SqlRowUpdatingEvent.cs | 4 +- .../Data/SqlClient/SqlSequentialTextReader.cs | 2 +- .../System/Data/SqlClient/SqlStatistics.cs | 4 +- .../System/Data/SqlClient/SqlStream.cs | 8 +- .../System/Data/SqlClient/SqlTransaction.cs | 4 +- .../System/Data/SqlClient/SqlUdtInfo.cs | 4 +- System.Data/System/Data/SqlClient/SqlUtil.cs | 182 ++++++- System.Data/System/Data/SqlClient/TdsEnums.cs | 13 +- .../Data/SqlClient/TdsParameterSetter.cs | 6 +- .../System/Data/SqlClient/TdsParser.cs | 103 ++-- .../Data/SqlClient/TdsParserHelperClasses.cs | 4 +- .../Data/SqlClient/TdsParserSafeHandles.cs | 11 +- .../Data/SqlClient/TdsParserSessionPool.cs | 4 +- .../Data/SqlClient/TdsParserStateObject.cs | 34 +- .../Data/SqlClient/TdsParserStaticMethods.cs | 6 +- .../Data/SqlClient/TdsRecordBufferSetter.cs | 4 +- .../System/Data/SqlClient/TdsValueSetter.cs | 4 +- .../System/Data/SqlClient/assemblycache.cs | 4 +- .../Data/SqlClient/sqlinternaltransaction.cs | 4 +- .../Data/SqlClient/sqlmetadatafactory.cs | 2 +- System.Data/System/Data/StateChangeEvent.cs | 4 +- System.Data/System/Data/UniqueConstraint.cs | 6 +- System.Data/System/Data/XDRSchema.cs | 6 +- System.Data/System/Data/XMLDiffLoader.cs | 6 +- System.Data/System/Data/XMLSchema.cs | 14 +- System.Data/System/Data/XmlDataLoader.cs | 6 +- System.Data/System/Data/XmlKeywords.cs | 6 +- System.Data/System/Data/XmlToDatasetMap.cs | 14 +- System.Data/System/Data/xmlsaver.cs | 16 +- System.Data/System/NewXml/BaseTreeIterator.cs | 4 +- .../NewXml/DataDocumentXPathNavigator.cs | 4 +- System.Data/System/NewXml/DataPointer.cs | 4 +- System.Data/System/NewXml/DataSetMappper.cs | 4 +- System.Data/System/NewXml/RegionIterator.cs | 4 +- System.Data/System/NewXml/TreeIterator.cs | 4 +- System.Data/System/NewXml/XPathNodePointer.cs | 6 +- System.Data/System/NewXml/XmlBoundElement.cs | 4 +- System.Data/System/NewXml/XmlDataDocument.cs | 26 +- .../System/NewXml/XmlDataImplementation.cs | 4 +- System.Data/bid/inc/cs/bidPrivateBase.cs | 4 +- .../common/managed/InfoCardCryptoHelper.cs | 2 +- .../Clr/inc/AppContextDefaultValues.cs | 1 - .../System/AppContextDefaultValues.cs | 5 + .../System/IdentityModel/AsyncResult.cs | 2 +- .../System/IdentityModel/Claims/Claim.cs | 2 +- .../Claims/X509CertificateClaimSet.cs | 70 ++- .../System/IdentityModel/CryptoApi.cs | 6 +- .../System/IdentityModel/CryptoHelper.cs | 6 +- .../System/IdentityModel/HashStream.cs | 2 +- .../IdentityModel/LocalAppContextSwitches.cs | 19 + .../WSTrust/WSTrustSerializationHelper.cs | 2 +- .../System/IdentityModel/SafeCryptHandles.cs | 4 +- .../System/IdentityModel/SecurityUtils.cs | 10 +- .../System/IdentityModel/SignedXml.cs | 7 +- .../System/IdentityModel/SspiSafeHandles.cs | 32 +- .../Tokens/BinaryKeyIdentifierClause.cs | 2 +- .../Tokens/EncryptedKeyIdentifierClause.cs | 2 +- .../GenericXmlSecurityKeyIdentifierClause.cs | 2 +- .../Tokens/LocalIdKeyIdentifierClause.cs | 2 +- .../Tokens/RsaKeyIdentifierClause.cs | 2 +- .../Tokens/Saml2SecurityTokenHandler.cs | 6 +- .../SamlAssertionKeyIdentifierClause.cs | 2 +- .../Tokens/SamlSecurityTokenHandler.cs | 2 +- ...rappedSaml2AssertionKeyIdentifierClause.cs | 6 +- .../X509IssuerSerialKeyIdentifierClause.cs | 2 +- .../System/IdentityModel/X509Util.cs | 2 +- .../BinarySecretKeyIdentifierClause.cs | 2 +- .../Security/KeyNameIdentifierClause.cs | 2 +- .../ServiceModel/Security/ReferenceList.cs | 2 +- .../RelAssertionDirectKeyIdentifierClause.cs | 2 +- .../SamlAssertionDirectKeyIdentifierClause.cs | 2 +- .../SecurityContextKeyIdentifierClause.cs | 2 +- .../Collaboration/ContactManager.cs | 2 +- .../PeerToPeer/Collaboration/PeerNearMe.cs | 6 +- System.Net/net/PeerToPeer/PeerName.cs | 2 +- System.Net/net/PeerToPeer/PeerNameResolver.cs | 8 +- System.Numerics/System/Numerics/Complex.cs | 8 +- .../System/Numerics/Vector2_Intrinsics.cs | 9 +- .../System/Numerics/Vector3_Intrinsics.cs | 9 +- .../System/Numerics/Vector4_Intrinsics.cs | 9 +- .../System/Caching/MemoryCache.cs | 2 +- .../System/Caching/PerfCounters.cs | 2 +- .../DurableInstancing/InstanceHandle.cs | 2 +- .../InstancePersistenceContext.cs | 2 +- .../SerializationSectionGroup.cs | 2 +- .../Runtime/Serialization/DataContractSet.cs | 12 +- .../Json/JsonEncodingStreamWrapper.cs | 2 +- .../Serialization/Json/JsonWriterDelegator.cs | 2 +- .../Serialization/Json/XmlJsonWriter.cs | 4 +- .../XmlObjectSerializerReadContextComplex.cs | 2 +- .../System/Xml/EncodingStreamWrapper.cs | 8 +- .../System/Xml/UniqueID.cs | 2 +- .../System/Xml/ValueHandle.cs | 2 +- .../System/Xml/XmlBaseReader.cs | 10 +- .../System/Xml/XmlConverter.cs | 6 +- .../System/Xml/XmlDictionaryWriter.cs | 14 +- .../System/Xml/XmlMtomReader.cs | 8 +- .../System/Xml/XmlStreamNodeWriter.cs | 8 +- .../Activation/HostedHttpContext.cs | 2 +- .../Activation/HostedImpersonationContext.cs | 2 +- .../ServiceModel/ServiceHostingEnvironment.cs | 2 +- .../Dispatcher/BufferedReceiveManager.cs | 2 +- .../Dispatcher/DurableInstanceManager.cs | 2 +- .../Dispatcher/PersistenceContext.cs | 2 +- .../PersistenceProviderDirectory.cs | 2 +- .../Dispatcher/WorkflowServiceInstance.cs | 14 +- .../Activities/InternalSendMessage.cs | 10 +- .../Activities/WorkflowOperationContext.cs | 2 +- .../ServiceModel/Channels/UdpChannelBase.cs | 4 +- .../ServiceModel/Channels/UdpOutputChannel.cs | 2 +- .../System/ServiceModel/Channels/UdpSocket.cs | 4 +- .../Discovery/AnnouncementService.cs | 12 +- .../ServiceModel/Discovery/DiscoveryProxy.cs | 32 +- .../Discovery/DiscoveryService.cs | 20 +- .../System/Runtime/AsyncResult.cs | 2 +- .../Diagnostics/DiagnosticTraceBase.cs | 2 +- .../Runtime/Diagnostics/EtwDiagnosticTrace.cs | 2 +- .../System/Runtime/IOThreadScheduler.cs | 2 +- .../System/Runtime/MruCache.cs | 2 +- .../System/Runtime/ThreadNeutralSemaphore.cs | 4 +- .../System/Runtime/TraceLevelHelper.cs | 2 +- .../Routing/ProcessRequestAsyncResult.cs | 16 + .../ServiceModel/Routing/RoutingService.cs | 2 +- .../Description/WebHttpBehavior.cs | 20 +- .../Description/WebScriptEnablingBehavior.cs | 8 +- .../Dispatcher/HelpHtmlBuilder.cs | 4 +- .../HttpUnhandledOperationInvoker.cs | 2 +- .../WebHttpDispatchOperationSelector.cs | 10 +- .../System/ServiceModel/Web/HttpDateParse.cs | 12 +- .../ServiceModel/Web/WebOperationContext.cs | 2 +- .../System/ServiceModel/WebHttpBinding.cs | 2 +- .../Clr/inc/AppContextDefaultValues.cs | 1 - .../ServiceModelActivationSectionGroup.cs | 2 +- .../Activation/ListenerUnsafeNativeMethods.cs | 4 +- .../System/ServiceModel/Activation/Utility.cs | 14 +- .../Administration/ProviderBase.cs | 4 +- .../Administration/WbemProvider.cs | 2 +- .../ServiceModel/Channels/AddressHeader.cs | 2 +- .../Channels/AddressHeaderCollection.cs | 2 +- .../Channels/BinaryMessageEncoder.cs | 6 +- .../Channels/BufferedOutputAsyncStream.cs | 29 +- .../ServiceModel/Channels/ChannelDemuxer.cs | 25 +- .../Channels/CompositeDuplexBindingElement.cs | 2 +- .../ServiceModel/Channels/Connection.cs | 6 +- .../Channels/ConnectionDemuxer.cs | 2 +- .../Channels/ConnectionModeReader.cs | 4 +- .../ServiceModel/Channels/ConnectionPool.cs | 4 +- .../Channels/ContentOnlyMessage.cs | 4 +- .../ServiceModel/Channels/FramingChannels.cs | 26 +- .../ServiceModel/Channels/FramingDecoders.cs | 38 +- .../Channels/HttpChannelFactory.cs | 18 +- .../Channels/HttpChannelHelpers.cs | 44 +- .../ServiceModel/Channels/HttpPipeline.cs | 4 +- .../Channels/HttpRequestContext.cs | 2 +- .../Channels/HttpTransportBindingElement.cs | 8 +- .../Channels/HttpsChannelFactory.cs | 4 +- .../Channels/IdlingCommunicationPool.cs | 2 +- .../Channels/InitialServerConnectionReader.cs | 2 +- .../ServiceModel/Channels/InputChannel.cs | 2 +- .../Channels/InternalDuplexBindingElement.cs | 2 +- .../Channels/InternalDuplexChannelListener.cs | 2 +- .../System/ServiceModel/Channels/Message.cs | 20 +- .../ServiceModel/Channels/MessageBuffer.cs | 4 +- .../Channels/MessageEncodingBindingElement.cs | 8 +- .../MessageEncodingBindingElementImporter.cs | 2 +- .../ServiceModel/Channels/MessageFault.cs | 2 +- .../ServiceModel/Channels/MessageHeaders.cs | 2 +- .../ServiceModel/Channels/MsmqDecodeHelper.cs | 4 +- .../Channels/OneWayChannelFactory.cs | 4 +- .../Channels/OneWayChannelListener.cs | 18 +- .../Channels/OverlappedContext.cs | 24 +- .../PeerCustomResolverBindingElement.cs | 10 +- .../ServiceModel/Channels/PeerFlooder.cs | 2 +- .../Channels/PeerNeighborManager.cs | 2 +- .../ServiceModel/Channels/PipeConnection.cs | 10 +- .../ServiceModel/Channels/ReplyChannel.cs | 2 +- .../ServiceModel/Channels/RequestChannel.cs | 2 +- .../Channels/RequestContextBase.cs | 2 +- .../SecurityBindingElementImporter.cs | 4 +- .../Channels/ServiceChannelProxy.cs | 8 +- .../Channels/SessionConnectionReader.cs | 2 +- .../Channels/SingletonConnectionReader.cs | 10 +- .../ServiceModel/Channels/SocketConnection.cs | 10 +- .../SslStreamSecurityBindingElement.cs | 8 +- .../SslStreamSecurityUpgradeProvider.cs | 18 +- .../Channels/StandardBindingImporter.cs | 2 +- ...treamSecurityUpgradeAcceptorAsyncResult.cs | 2 +- ...reamSecurityUpgradeInitiatorAsyncResult.cs | 2 +- .../Channels/StreamedFramingRequestChannel.cs | 16 +- .../Channels/SynchronizedMessageSource.cs | 6 +- .../Channels/TransportBindingElement.cs | 6 +- .../TransportBindingElementImporter.cs | 6 +- .../Channels/TransportDefaults.cs | 5 +- .../Channels/TransportDuplexSessionChannel.cs | 14 +- .../ServiceModel/Channels/TransportManager.cs | 2 +- .../Channels/TransportSecurityHelpers.cs | 4 +- .../Channels/UnsafeNativeMethods.cs | 2 +- .../ServiceModel/Channels/UriPrefixTable.cs | 2 +- .../WebSocketTransportDuplexSessionChannel.cs | 10 +- .../WindowsStreamSecurityBindingElement.cs | 8 +- .../WindowsStreamSecurityUpgradeProvider.cs | 10 +- .../System/ServiceModel/ClientBase.cs | 2 +- .../ComIntegration/SafeNativeMethods.cs | 46 +- .../BinaryMessageEncodingElement.cs | 4 +- .../Configuration/CallbackDebugElement.cs | 2 +- .../Configuration/CallbackTimeoutsElement.cs | 2 +- .../Configuration/ClientCredentialsElement.cs | 2 +- .../Configuration/ClientViaElement.cs | 2 +- .../CommonEndpointBehaviorElement.cs | 4 +- .../CommonServiceBehaviorElement.cs | 4 +- .../Configuration/CompositeDuplexElement.cs | 2 +- .../Configuration/ConfigurationHelpers.cs | 8 +- .../ConnectionOrientedTransportElement.cs | 2 +- .../DataContractSerializerElement.cs | 2 +- .../Configuration/EndpointBehaviorElement.cs | 4 +- .../ExtensionElementCollection.cs | 2 +- .../Configuration/HttpTransportElement.cs | 2 +- .../Configuration/HttpsTransportElement.cs | 2 +- .../Configuration/IdentityElement.cs | 2 +- .../Configuration/IssuedTokenClientElement.cs | 6 +- .../IssuedTokenServiceElement.cs | 2 +- .../MtomMessageEncodingElement.cs | 4 +- .../NamedPipeTransportElement.cs | 6 +- .../Configuration/OneWayElement.cs | 4 +- .../Configuration/PeerTransportElement.cs | 4 +- .../Configuration/PrivacyNoticeElement.cs | 2 +- .../ReliableMessagingVersionConverter.cs | 2 +- .../Configuration/ReliableSessionElement.cs | 2 +- .../Configuration/RemoveBehaviorElement.cs | 2 +- .../Configuration/SecurityElement.cs | 2 +- .../Configuration/SecurityElementBase.cs | 2 +- .../ServiceAuthorizationElement.cs | 2 +- .../Configuration/ServiceBehaviorElement.cs | 4 +- .../ServiceCredentialsElement.cs | 2 +- .../Configuration/ServiceDebugElement.cs | 2 +- .../ServiceMetadataPublishingElement.cs | 2 +- ...viceModelConfigurationElementCollection.cs | 2 +- .../ServiceModelExtensionCollectionElement.cs | 6 +- .../Configuration/ServiceModelSectionGroup.cs | 2 +- .../ServiceSecurityAuditElement.cs | 2 +- .../Configuration/ServiceThrottlingElement.cs | 2 +- .../Configuration/ServiceTimeoutsElement.cs | 2 +- .../Configuration/SslStreamSecurityElement.cs | 2 +- .../StandardBindingCollectionElement.cs | 2 +- .../StandardEndpointCollectionElement.cs | 2 +- .../Configuration/TcpTransportElement.cs | 8 +- .../TextMessageEncodingElement.cs | 4 +- .../TransactedBatchingElement.cs | 2 +- .../Configuration/TransactionFlowElement.cs | 2 +- .../TransactionProtocolConverter.cs | 2 +- .../Configuration/TransportElement.cs | 2 +- .../WindowsStreamSecurityElement.cs | 2 +- .../Description/ClientClassGenerator.cs | 4 +- .../ServiceModel/Description/ConfigWriter.cs | 4 +- .../ImportedPolicyConversionContext.cs | 2 +- .../Description/MessageContractExporter.cs | 4 +- .../Description/MetadataSection.cs | 2 +- .../ServiceModel/Description/PolicyReader.cs | 6 +- .../Description/ServiceEndpoint.cs | 2 +- .../ServiceModel/Description/SoapHelper.cs | 2 +- .../TaskOperationDescriptionValidator.cs | 2 +- .../ServiceModel/Description/TypeLoader.cs | 14 +- .../ServiceModel/Description/WsdlExporter.cs | 2 +- .../ServiceModel/Description/WsdlImporter.cs | 8 +- .../ServiceModel/Diagnostics/MessageLogger.cs | 4 +- .../Diagnostics/PerformanceCountersBase.cs | 6 +- .../ServiceModel/Diagnostics/TraceUtility.cs | 18 + .../Dispatcher/ActionMessageFilterTable.cs | 8 +- .../ServiceModel/Dispatcher/ChannelHandler.cs | 51 +- .../Dispatcher/DuplexChannelBinder.cs | 6 +- .../EndpointAddressMessageFilter.cs | 2 +- .../EndpointAddressMessageFilterTable.cs | 8 +- .../Dispatcher/ErrorHandlingAcceptor.cs | 6 +- .../Dispatcher/ImmutableDispatchRuntime.cs | 2 +- .../Dispatcher/InputChannelBinder.cs | 2 +- .../Dispatcher/MessageFilterTable.cs | 2 +- .../Dispatcher/OperationInvokerBehavior.cs | 4 +- .../Dispatcher/OutputChannelBinder.cs | 2 +- .../PrefixEndpointAddressMessageFilter.cs | 2 +- ...PrefixEndpointAddressMessageFilterTable.cs | 4 +- .../Dispatcher/PrimitiveOperationFormatter.cs | 4 +- .../ServiceModel/Dispatcher/QueryFunctions.cs | 6 +- .../ServiceModel/Dispatcher/QueryMatcher.cs | 4 +- .../ServiceModel/Dispatcher/QueryNode.cs | 14 +- .../ServiceModel/Dispatcher/QueryProcessor.cs | 4 +- .../ServiceModel/Dispatcher/QuerySelectOp.cs | 2 +- .../Dispatcher/QuerySubExprEliminator.cs | 6 +- .../ServiceModel/Dispatcher/QueryUtil.cs | 4 +- .../Dispatcher/ReplyChannelBinder.cs | 2 +- .../SecurityImpersonationBehavior.cs | 8 +- .../Dispatcher/SecurityValidationBehavior.cs | 2 +- .../Dispatcher/SeekableMessageNavigator.cs | 14 +- .../Dispatcher/ServiceThrottle.cs | 93 ++-- .../Dispatcher/StreamFormatter.cs | 2 +- .../Dispatcher/XPathMessageContext.cs | 10 +- .../ServiceModel/DnsEndpointIdentity.cs | 2 +- .../System/ServiceModel/EndpointAddress.cs | 4 +- .../System/ServiceModel/EndpointIdentity.cs | 2 +- .../System/ServiceModel/FaultReason.cs | 2 +- .../ServiceModel/LocalAppContextSwitches.cs | 12 + .../ServiceModel/RsaEndpointIdentity.cs | 2 +- .../ServiceModel/Security/CryptoHelper.cs | 4 +- .../Security/FederatedSecurityTokenManager.cs | 16 +- .../Security/RequestSecurityToken.cs | 10 +- .../Security/RequestSecurityTokenResponse.cs | 16 +- .../Security/SctClaimSerializer.cs | 2 +- .../Security/SecureConversationDriver.cs | 8 +- .../Security/SecuritySessionClientSettings.cs | 2 +- .../SecuritySessionSecurityTokenProvider.cs | 4 +- .../ServiceModel/Security/SecurityUtils.cs | 12 +- .../Security/SecurityVerifiedMessage.cs | 4 +- .../Security/TlsSspiNegotiation.cs | 6 +- .../ServiceModel/Security/TrustDriver.cs | 8 +- ...SecurityOneDotZeroReceiveSecurityHeader.cs | 30 +- .../ServiceModel/Security/WSSecurityPolicy.cs | 2 +- .../Security/WSSecurityTokenSerializer.cs | 2 +- .../System/ServiceModel/Security/WSTrust.cs | 2 +- .../ServiceModel/Security/WSTrustFeb2005.cs | 2 +- .../Security/WSTrustServiceContract.cs | 2 +- .../ServiceModel/SpnEndpointIdentity.cs | 2 +- .../Syndication/Rss20FeedFormatter.cs | 12 +- .../Transactions/WsatTransactionFormatter.cs | 8 +- .../ServiceModel/UpnEndpointIdentity.cs | 30 +- .../DynamicData/DynamicDataExtensions.cs | 2 +- .../DynamicData/DynamicDataManager.cs | 2 +- .../DynamicData/FieldTemplateUserControl.cs | 10 +- .../EntityConnectionStringBuilderItem.cs | 4 +- .../EntityDataSourceConfigureObjectContext.cs | 4 +- ...tyDataSourceConfigureObjectContextPanel.cs | 4 +- ...rceConfigureObjectContextPanel.designer.cs | 4 +- .../EntityDataSourceContainerNameConverter.cs | 4 +- .../EntityDataSourceContainerNameItem.cs | 4 +- .../Design/EntityDataSourceDataSelection.cs | 4 +- .../EntityDataSourceDataSelectionPanel.cs | 4 +- ...tyDataSourceDataSelectionPanel.designer.cs | 4 +- .../Design/EntityDataSourceDesigner.cs | 4 +- .../Design/EntityDataSourceDesignerHelper.cs | 16 +- .../EntityDataSourceEntitySetNameConverter.cs | 4 +- .../EntityDataSourceEntitySetNameItem.cs | 4 +- ...tityDataSourceEntityTypeFilterConverter.cs | 4 +- .../EntityDataSourceEntityTypeFilterItem.cs | 4 +- .../Design/EntityDataSourceState.cs | 4 +- .../Design/EntityDataSourceStatementEditor.cs | 4 +- .../EntityDataSourceStatementEditorForm.cs | 4 +- .../Design/EntityDataSourceWizardForm.cs | 4 +- .../Design/EntityDesignerDataSourceView.cs | 4 +- .../WebControls/Design/Util/DesignerForm.cs | 4 +- .../Design/Util/RTLAwareMessageBox.cs | 4 +- .../Util/ResourceDescriptionAttribute.cs | 4 +- .../WebControls/Design/Util/TaskFormBase.cs | 4 +- .../Data/WebControls/Design/Util/UIHelper.cs | 4 +- .../WebControls/Design/Util/WizardForm.cs | 4 +- .../WebControls/Design/Util/WizardPanel.cs | 4 +- .../Util/WizardPanelChangingEventArgs.cs | 4 +- .../Data/WebControls/EntityDataSource.cs | 4 +- .../EntityDataSourceChangedEventArgs.cs | 2 +- .../EntityDataSourceChangingEventArgs.cs | 2 +- .../WebControls/EntityDataSourceColumn.cs | 4 +- ...EntityDataSourceContextCreatedEventArgs.cs | 2 +- ...ntityDataSourceContextCreatingEventArgs.cs | 2 +- ...tityDataSourceContextDisposingEventArgs.cs | 2 +- .../WebControls/EntityDataSourceMemberPath.cs | 4 +- .../EntityDataSourceQueryBuilder.cs | 4 +- .../EntityDataSourceReferenceGroup.cs | 4 +- .../EntityDataSourceSelectedEventArgs.cs | 2 +- .../EntityDataSourceSelectingEventArgs.cs | 2 +- .../Data/WebControls/EntityDataSourceUtil.cs | 4 +- .../EntityDataSourceValidationException.cs | 4 +- .../Data/WebControls/EntityDataSourceView.cs | 4 +- .../WebControls/EntityDataSourceViewSchema.cs | 4 +- .../WebControls/EntityDataSourceWrapper.cs | 4 +- .../EntityDataSourceWrapperCollection.cs | 4 +- ...tityDataSourceWrapperPropertyDescriptor.cs | 4 +- .../ResourceDescriptionAttribute.cs | 4 +- .../ResourceDisplayNameAttribute.cs | 4 +- .../WebControls/WebControlParameterProxy.cs | 2 +- .../WCFModel/VSWCFServiceContractGenerator.cs | 8 +- .../Handlers/ScriptResourceHandler.cs | 4 +- .../Services/PageClientProxyGenerator.cs | 14 +- .../Script/Services/RestHandler.cs | 6 +- System.Web.Extensions/ui/AssemblyCache.cs | 2 +- .../ui/ProfileServiceManager.cs | 6 +- .../ui/RoleServiceManager.cs | 6 +- System.Web.Extensions/ui/ScriptManager.cs | 4 +- System.Web.Mobile/Mobile/UrlPath.cs | 4 +- .../XhtmlBasicObjectListAdapter.cs | 2 +- .../Design/AppliedDeviceFiltersDialog.cs | 2 +- .../Design/ListComponentEditorPage.cs | 2 +- .../Design/StylesEditorDialog.cs | 2 +- .../MobileControls/Design/Util/GenericUI.cs | 2 +- .../MobileControls/Design/Util/MSHTMLHost.cs | 6 +- .../UI/MobileControls/MobilePage.cs | 4 +- .../UI/MobileControls/ObjectList.cs | 2 +- .../UI/MobileControls/SessionViewState.cs | 2 +- .../Description/SoapProtocolImporter.cs | 4 +- .../Services/Discovery/DiscoveryDocument.cs | 2 +- .../Discovery/DiscoveryDocumentReference.cs | 2 +- .../Discovery/DynamicVirtualDiscoSearcher.cs | 2 +- .../Web/Services/Protocols/ClientProtocol.cs | 2 +- .../Services/Protocols/LogicalMethodInfo.cs | 4 +- .../System/Web/Services/Protocols/Scalars.cs | 4 +- .../Web/Services/Protocols/SoapException.cs | 14 +- System.Web/AspNetEventSource.cs | 6 +- System.Web/AspNetSynchronizationContext.cs | 10 +- System.Web/Cache/SqlCacheDependency.cs | 6 +- .../Compilation/BaseResourcesBuildProvider.cs | 4 +- .../BaseTemplateCodeDomTreeGenerator.cs | 22 +- .../BrowserCapabilitiesCompiler.cs | 4 +- System.Web/Compilation/BuildManager.cs | 22 +- .../Compilation/BuildProvidersCompiler.cs | 8 +- System.Web/Compilation/BuildResult.cs | 18 +- System.Web/Compilation/BuildResultCache.cs | 2 +- System.Web/Compilation/CompilationLock.cs | 2 +- System.Web/Compilation/CompilationUtil.cs | 14 +- System.Web/Compilation/MultiTargetingUtil.cs | 2 +- .../Compilation/PreservationFileReader.cs | 2 +- System.Web/Compilation/XsdBuildProvider.cs | 8 +- .../BrowserCapabilitiesCodeGenerator.cs | 2 +- .../Configuration/HttpCapabilitiesBase.cs | 3 +- System.Web/Configuration/MembershipSection.cs | 2 + .../Configuration/MetabaseServerConfig.cs | 2 +- .../Configuration/ProcessHostMapPath.cs | 2 +- System.Web/Configuration/RegexWorker.cs | 3 +- .../Configuration/SessionStateSection.cs | 2 +- .../Configuration/WebConfigurationHost.cs | 6 +- System.Web/FileChangesMonitor.cs | 8 +- System.Web/Hosting/ApplicationManager.cs | 2 +- System.Web/Hosting/HostingEnvironment.cs | 4 +- System.Web/Hosting/IIS7WorkerRequest.cs | 12 +- System.Web/Hosting/IISUnsafeMethods.cs | 8 +- System.Web/Hosting/ISAPIWorkerRequest.cs | 4 +- System.Web/HttpApplication.cs | 28 +- System.Web/HttpBufferlessInputStream.cs | 2 +- System.Web/HttpCachePolicy.cs | 8 +- System.Web/HttpContext.cs | 4 +- System.Web/HttpCookieCollection.cs | 2 +- System.Web/HttpRequest.cs | 8 +- System.Web/HttpResponse.cs | 14 +- System.Web/HttpRuntime.cs | 16 +- System.Web/HttpWriter.cs | 6 +- .../NDP_Common/inc/StrongNameHelpers.cs | 40 +- .../LegacyAspNetSynchronizationContext.cs | 14 +- System.Web/Management/WebEvents.cs | 18 +- .../ModelBinding/ControlValueProvider.cs | 2 +- .../ModelBinding/RangeAttributeAdapter.cs | 2 +- System.Web/PipelineModuleStepContainer.cs | 2 +- System.Web/RootedObjects.cs | 6 +- System.Web/Routing/Route.cs | 2 +- System.Web/Routing/RouteCollection.cs | 6 +- System.Web/Security/ADMembershipProvider.cs | 15 +- .../Security/Cryptography/CryptoAlgorithms.cs | 2 +- .../Security/MembershipPasswordAttribute.cs | 7 +- System.Web/Security/RoleClaimProvider.cs | 2 +- System.Web/Security/SQLMembershipProvider.cs | 11 +- System.Web/State/StateRuntime.cs | 12 +- System.Web/State/StateWorkerRequest.cs | 2 +- System.Web/StaticFileHandler.cs | 2 +- System.Web/ThreadContext.cs | 6 +- System.Web/UI/BaseParser.cs | 2 +- System.Web/UI/Control.cs | 4 +- System.Web/UI/ControlBuilder.cs | 4 +- System.Web/UI/HTMLTextWriter.cs | 2 +- System.Web/UI/HtmlForm.cs | 12 +- System.Web/UI/ObjectStateFormatter.cs | 4 +- System.Web/UI/Page.cs | 22 +- System.Web/UI/PartialCachingControl.cs | 6 +- System.Web/UI/TargetFrameworkUtil.cs | 4 +- System.Web/UI/TemplateParser.cs | 2 +- System.Web/UI/TraceContext.cs | 4 +- .../UI/WebControls/Adapters/MenuAdapter.cs | 4 +- System.Web/UI/WebControls/ChangePassword.cs | 12 +- System.Web/UI/WebControls/DataBoundControl.cs | 15 +- System.Web/UI/WebControls/DetailsView.cs | 2 +- System.Web/UI/WebControls/LoginView.cs | 2 +- System.Web/UI/WebControls/MenuItem.cs | 2 +- .../UI/WebControls/ModelDataSourceView.cs | 2 +- System.Web/UI/WebControls/Panel.cs | 2 +- System.Web/UI/WebControls/PasswordRecovery.cs | 4 +- .../WebControls/RegularExpressionValidator.cs | 11 +- System.Web/UI/WebControls/Repeater.cs | 8 +- System.Web/UI/WebControls/TextBox.cs | 10 +- System.Web/UI/WebControls/TreeNode.cs | 17 + System.Web/UI/WebControls/Wizard.cs | 4 +- .../UI/WebControls/basecomparevalidator.cs | 6 +- System.Web/UI/WebParts/CatalogZoneBase.cs | 2 +- System.Web/UI/WebParts/EditorPart.cs | 2 +- System.Web/UI/WebParts/EditorZoneBase.cs | 2 +- .../ProxyWebPartConnectionCollection.cs | 2 +- System.Web/UI/WebParts/WebPartManager.cs | 8 +- System.Web/UI/WebParts/WebPartZoneBase.cs | 4 +- System.Web/UnsafeNativeMethods.cs | 2 +- System.Web/Util/AppVerifier.cs | 31 +- System.Web/Util/BinaryCompatibility.cs | 2 + System.Web/Util/FastPropertyAccessor.cs | 12 +- System.Web/Util/HttpEncoder.cs | 2 +- System.Web/Util/ParseHttpDate.cs | 2 +- System.Web/Util/RegexUtil.cs | 83 ++++ System.Web/Util/SecUtil.cs | 11 + System.Web/Util/UriUtil.cs | 2 +- System.Web/Util/VersionUtil.cs | 1 + System.Web/WebSockets/AspNetWebSocket.cs | 4 +- System.Web/httpserverutility.cs | 2 +- System.Web/misc/SecurityUtils.cs | 6 +- .../Common/BasePropertyDescriptor.cs | 6 +- .../Common/CompModHelpers.cs | 18 +- .../Common/CompilerHelpers.cs | 2 +- .../Common/DelegateTypeInfo.cs | 2 +- .../Common/NativeMethods.cs | 2 +- .../Common/TypeSystemHelpers.cs | 2 +- .../Common/ValidationHelpers.cs | 2 +- System.Workflow.Activities/Common/Walker.cs | 2 +- .../Common/userdatakeys.cs | 2 +- .../CorrelationValidator.cs | 2 +- System.Workflow.Activities/Delay.cs | 4 +- .../LocalService/CorrelationService.cs | 14 +- .../LocalService/FollowerQueueCreator.cs | 2 +- .../AuthoringOM/Activity.cs | 2 +- .../AuthoringOM/ActivityExecutor.cs | 6 +- .../Compiler/TypeSystem/DesignTimeType.cs | 18 +- .../Compiler/TypeSystem/TypeProvider.cs | 12 +- .../AuthoringOM/Compiler/XomlCompiler.cs | 4 +- .../Compiler/XomlCompilerHelpers.cs | 2 +- .../AuthoringOM/DependencyProperty.cs | 2 +- .../AuthoringOM/Design/CommandSet.cs | 4 +- .../Design/CompositeActivityDesigner.cs | 8 +- .../Design/CustomActivityDesigner.cs | 16 +- .../Dialogs/ThemeConfigurationDialog.cs | 2 +- .../Design/Dialogs/TypeBrowserDialog.cs | 2 +- .../Design/Dialogs/WorkflowPageSetupDialog.cs | 2 +- .../AuthoringOM/Design/MenuCommands.cs | 2 +- .../AuthoringOM/Design/ReferenceService.cs | 2 +- .../StructuredCompositeActivityDesigner.cs | 2 +- .../AuthoringOM/Design/WorkflowView.cs | 4 +- .../AuthoringOM/ScheduleChanges.cs | 4 +- .../Shared/BasePropertyDescriptor.cs | 6 +- .../Shared/CompModHelpers.cs | 18 +- .../Shared/CompilerHelpers.cs | 2 +- .../Shared/DelegateTypeInfo.cs | 2 +- .../Shared/NativeMethods.cs | 2 +- .../Shared/TypeSystemHelpers.cs | 2 +- .../Shared/ValidationHelpers.cs | 2 +- .../Shared/Walker.cs | 2 +- .../Shared/XomlSerializationHelpers.cs | 10 +- .../Shared/userdatakeys.cs | 2 +- .../DebugEngine/DebugController.cs | 2 +- .../DebugEngine/DebugControllerThread.cs | 4 +- .../ExecutorLocksHeldException.cs | 2 +- .../Hosting/SqlWorkflowPersistenceService.cs | 6 +- .../Hosting/WorkflowWebHostingModule.cs | 2 +- System.Workflow.Runtime/Scheduler.cs | 2 +- .../System/Activities/Statements/Interop.cs | 2 +- System.Workflow.Runtime/WorkflowEventArgs.cs | 2 +- System.Workflow.Runtime/WorkflowExecutor.cs | 14 +- .../System/ServiceModel/QueueNameHelper.cs | 2 +- .../ServiceModel/WorkflowServiceHost.cs | 2 +- .../Design/OperationPickerDialog.cs | 2 +- ...nizationContextWorkflowSchedulerService.cs | 2 +- .../Clr/inc/AppContextDefaultValues.cs | 1 - .../NDP_Common/inc/Win8Helpers.cs | 2 +- System.Xml/System/Xml/Base64Decoder.cs | 2 +- System.Xml/System/Xml/Base64Encoder.cs | 2 +- System.Xml/System/Xml/BinHexDecoder.cs | 2 +- System.Xml/System/Xml/BinHexEncoder.cs | 2 +- System.Xml/System/Xml/BinaryXml/SqlUtils.cs | 2 +- .../System/Xml/BinaryXml/XmlBinaryReader.cs | 2 +- .../Xml/BinaryXml/XmlBinaryReaderAsync.cs | 2 +- System.Xml/System/Xml/BitStack.cs | 2 +- System.Xml/System/Xml/Bits.cs | 2 +- System.Xml/System/Xml/ByteStack.cs | 2 +- .../System/Xml/Cache/XPathDocumentBuilder.cs | 2 +- .../System/Xml/Cache/XPathDocumentIterator.cs | 2 +- .../Xml/Cache/XPathDocumentNavigator.cs | 2 +- System.Xml/System/Xml/Cache/XPathNode.cs | 2 +- .../System/Xml/Cache/XPathNodeHelper.cs | 2 +- .../System/Xml/Cache/XPathNodeInfoAtom.cs | 2 +- .../Xml/Core/CharEntityEncoderFallback.cs | 10 +- .../Xml/Core/HtmlEncodedRawTextWriter.cs | 4 +- System.Xml/System/Xml/Core/HtmlTernaryTree.cs | 2 +- .../System/Xml/Core/HtmlUtf8RawTextWriter.cs | 4 +- .../Xml/Core/IncrementalReadDecoders.cs | 2 +- .../System/Xml/Core/QueryOutputWriter.cs | 2 +- .../System/Xml/Core/QueryOutputWriterV1.cs | 2 +- .../Xml/Core/ReadContentAsBinaryHelper.cs | 2 +- .../System/Xml/Core/ReadOnlyTernaryTree.cs | 4 +- .../System/Xml/Core/SecureStringHasher.cs | 2 +- .../Xml/Core/TextEncodedRawTextWriter.cs | 2 +- .../System/Xml/Core/TextUtf8RawTextWriter.cs | 2 +- .../Xml/Core/ValidatingReaderNodeData.cs | 2 +- .../System/Xml/Core/XmlAsyncCheckReader.cs | 2 +- .../System/Xml/Core/XmlAsyncCheckWriter.cs | 2 +- .../System/Xml/Core/XmlAutoDetectWriter.cs | 2 +- .../System/Xml/Core/XmlCharCheckingReader.cs | 2 +- .../System/Xml/Core/XmlCharCheckingWriter.cs | 4 +- .../Xml/Core/XmlEncodedRawTextWriter.cs | 6 +- .../Xml/Core/XmlEncodedRawTextWriterAsync.cs | 4 +- System.Xml/System/Xml/Core/XmlEventCache.cs | 2 +- .../System/Xml/Core/XmlParserContext.cs | 2 +- System.Xml/System/Xml/Core/XmlRawWriter.cs | 2 +- System.Xml/System/Xml/Core/XmlReader.cs | 2 +- .../System/Xml/Core/XmlReaderSettings.cs | 2 +- .../System/Xml/Core/XmlSubtreeReader.cs | 2 +- System.Xml/System/Xml/Core/XmlTextEncoder.cs | 2 +- System.Xml/System/Xml/Core/XmlTextReader.cs | 2 +- .../System/Xml/Core/XmlTextReaderImpl.cs | 2 +- .../Xml/Core/XmlTextReaderImplHelpers.cs | 2 +- System.Xml/System/Xml/Core/XmlTextWriter.cs | 8 +- .../System/Xml/Core/XmlUtf8RawTextWriter.cs | 6 +- .../Xml/Core/XmlUtf8RawTextWriterAsync.cs | 4 +- .../System/Xml/Core/XmlValidatingReader.cs | 2 +- .../Xml/Core/XmlValidatingReaderImpl.cs | 2 +- .../System/Xml/Core/XmlWellFormedWriter.cs | 4 +- .../Xml/Core/XmlWellFormedWriterAsync.cs | 2 +- .../Xml/Core/XmlWellFormedWriterHelpers.cs | 2 +- .../System/Xml/Core/XmlWrappingReader.cs | 2 +- .../System/Xml/Core/XmlWrappingWriter.cs | 2 +- System.Xml/System/Xml/Core/XmlWriter.cs | 2 +- System.Xml/System/Xml/Core/XmlWriterAsync.cs | 2 +- .../System/Xml/Core/XmlWriterSettings.cs | 2 +- .../System/Xml/Core/XsdCachingReader.cs | 2 +- .../System/Xml/Core/XsdValidatingReader.cs | 2 +- System.Xml/System/Xml/DiagnosticsSwitches.cs | 2 +- .../System/Xml/Dom/DocumentSchemaValidator.cs | 2 +- .../System/Xml/Dom/DocumentXPathNavigator.cs | 2 +- .../System/Xml/Dom/DocumentXmlWriter.cs | 2 +- System.Xml/System/Xml/Dom/DomNameTable.cs | 2 +- System.Xml/System/Xml/Dom/XPathNodeList.cs | 2 +- System.Xml/System/Xml/Dom/XmlAttribute.cs | 2 +- .../System/Xml/Dom/XmlAttributeCollection.cs | 2 +- System.Xml/System/Xml/Dom/XmlCDataSection.cs | 2 +- System.Xml/System/Xml/Dom/XmlCharacterData.cs | 2 +- .../System/Xml/Dom/XmlChildEnumerator.cs | 2 +- System.Xml/System/Xml/Dom/XmlChildNodes.cs | 2 +- System.Xml/System/Xml/Dom/XmlComment.cs | 2 +- System.Xml/System/Xml/Dom/XmlDeclaration.cs | 2 +- System.Xml/System/Xml/Dom/XmlDocument.cs | 2 +- .../System/Xml/Dom/XmlDocumentFragment.cs | 2 +- System.Xml/System/Xml/Dom/XmlDocumentType.cs | 2 +- System.Xml/System/Xml/Dom/XmlDomTextWriter.cs | 2 +- System.Xml/System/Xml/Dom/XmlElement.cs | 2 +- System.Xml/System/Xml/Dom/XmlElementList.cs | 2 +- System.Xml/System/Xml/Dom/XmlEntity.cs | 2 +- .../System/Xml/Dom/XmlEntityReference.cs | 2 +- .../System/Xml/Dom/XmlImplementation.cs | 2 +- System.Xml/System/Xml/Dom/XmlLinkedNode.cs | 2 +- System.Xml/System/Xml/Dom/XmlLoader.cs | 2 +- System.Xml/System/Xml/Dom/XmlName.cs | 2 +- System.Xml/System/Xml/Dom/XmlNamedNodemap.cs | 2 +- System.Xml/System/Xml/Dom/XmlNode.cs | 2 +- .../System/Xml/Dom/XmlNodeChangedEventArgs.cs | 2 +- System.Xml/System/Xml/Dom/XmlNodeList.cs | 2 +- System.Xml/System/Xml/Dom/XmlNodeReader.cs | 2 +- System.Xml/System/Xml/Dom/XmlNotation.cs | 2 +- .../Xml/Dom/XmlProcessingInstruction.cs | 2 +- .../Xml/Dom/XmlSignificantWhiteSpace.cs | 2 +- System.Xml/System/Xml/Dom/XmlText.cs | 2 +- .../System/Xml/Dom/XmlUnspecifiedAttribute.cs | 2 +- System.Xml/System/Xml/Dom/XmlWhitespace.cs | 2 +- System.Xml/System/Xml/EmptyEnumerator.cs | 2 +- System.Xml/System/Xml/HWStack.cs | 2 +- System.Xml/System/Xml/IXmlLineInfo.cs | 2 +- System.Xml/System/Xml/LineInfo.cs | 2 +- System.Xml/System/Xml/NameTable.cs | 2 +- System.Xml/System/Xml/Ref.cs | 2 +- .../Xml/Resolvers/XmlPreloadedResolver.cs | 2 +- .../Resolvers/XmlPreloadedResolverAsync.cs | 2 +- System.Xml/System/Xml/Schema/Asttree.cs | 2 +- System.Xml/System/Xml/Schema/AutoValidator.cs | 2 +- System.Xml/System/Xml/Schema/BaseProcessor.cs | 2 +- System.Xml/System/Xml/Schema/BaseValidator.cs | 2 +- System.Xml/System/Xml/Schema/BitSet.cs | 2 +- System.Xml/System/Xml/Schema/Chameleonkey.cs | 2 +- .../Xml/Schema/CompiledidEntityConstraint.cs | 2 +- .../System/Xml/Schema/ConstraintStruct.cs | 61 +-- .../System/Xml/Schema/ContentValidator.cs | 2 +- .../Xml/Schema/DataTypeImplementation.cs | 4 +- System.Xml/System/Xml/Schema/DtdParser.cs | 2 +- System.Xml/System/Xml/Schema/DtdValidator.cs | 2 +- System.Xml/System/Xml/Schema/FacetChecker.cs | 2 +- .../System/Xml/Schema/Inference/Infer.cs | 4 +- .../Inference/XmlSchemaInferenceException.cs | 4 +- System.Xml/System/Xml/Schema/NamespaceList.cs | 2 +- System.Xml/System/Xml/Schema/Parser.cs | 2 +- System.Xml/System/Xml/Schema/Preprocessor.cs | 2 +- System.Xml/System/Xml/Schema/SchemaAttDef.cs | 2 +- .../Xml/Schema/SchemaCollectionCompiler.cs | 6 +- .../Schema/SchemaCollectionpreProcessor.cs | 2 +- .../System/Xml/Schema/SchemaDeclBase.cs | 2 +- .../System/Xml/Schema/SchemaElementDecl.cs | 2 +- System.Xml/System/Xml/Schema/SchemaEntity.cs | 2 +- System.Xml/System/Xml/Schema/SchemaInfo.cs | 2 +- System.Xml/System/Xml/Schema/SchemaNames.cs | 2 +- .../Xml/Schema/SchemaNamespacemanager.cs | 2 +- .../System/Xml/Schema/SchemaNotation.cs | 2 +- .../System/Xml/Schema/SchemaSetCompiler.cs | 10 +- .../System/Xml/Schema/ValidationEventArgs.cs | 2 +- .../System/Xml/Schema/ValidationState.cs | 2 +- System.Xml/System/Xml/Schema/XdrBuilder.cs | 2 +- System.Xml/System/Xml/Schema/XdrValidator.cs | 2 +- .../System/Xml/Schema/XmlAtomicValue.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchema.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchemaAll.cs | 2 +- .../System/Xml/Schema/XmlSchemaAnnotated.cs | 2 +- .../System/Xml/Schema/XmlSchemaAnnotation.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchemaAny.cs | 2 +- .../Xml/Schema/XmlSchemaAnyAttribute.cs | 2 +- .../System/Xml/Schema/XmlSchemaAppInfo.cs | 2 +- .../System/Xml/Schema/XmlSchemaAttribute.cs | 2 +- .../Xml/Schema/XmlSchemaAttributeGroup.cs | 2 +- .../Xml/Schema/XmlSchemaAttributeGroupref.cs | 2 +- .../System/Xml/Schema/XmlSchemaChoice.cs | 2 +- .../System/Xml/Schema/XmlSchemaCollection.cs | 2 +- .../Schema/XmlSchemaCompilationSettings.cs | 2 +- .../Xml/Schema/XmlSchemaComplexContent.cs | 2 +- .../XmlSchemaComplexContentExtension.cs | 2 +- .../XmlSchemaComplexContentRestriction.cs | 2 +- .../System/Xml/Schema/XmlSchemaComplexType.cs | 2 +- .../System/Xml/Schema/XmlSchemaDataType.cs | 4 +- .../Xml/Schema/XmlSchemaDocumentation.cs | 2 +- .../System/Xml/Schema/XmlSchemaElement.cs | 2 +- .../System/Xml/Schema/XmlSchemaException.cs | 2 +- .../System/Xml/Schema/XmlSchemaExternal.cs | 2 +- .../System/Xml/Schema/XmlSchemaFacet.cs | 2 +- .../System/Xml/Schema/XmlSchemaGroup.cs | 2 +- .../System/Xml/Schema/XmlSchemaGroupRef.cs | 2 +- .../Xml/Schema/XmlSchemaIdEntityConstraint.cs | 2 +- .../System/Xml/Schema/XmlSchemaImport.cs | 2 +- .../System/Xml/Schema/XmlSchemaInclude.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchemaInfo.cs | 2 +- .../System/Xml/Schema/XmlSchemaNotation.cs | 2 +- .../System/Xml/Schema/XmlSchemaObject.cs | 2 +- .../Xml/Schema/XmlSchemaObjectCollection.cs | 2 +- .../System/Xml/Schema/XmlSchemaObjectTable.cs | 2 +- .../System/Xml/Schema/XmlSchemaParticle.cs | 2 +- .../System/Xml/Schema/XmlSchemaRedefine.cs | 2 +- .../System/Xml/Schema/XmlSchemaSequence.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchemaSet.cs | 24 +- .../Xml/Schema/XmlSchemaSimpleContent.cs | 2 +- .../Schema/XmlSchemaSimpleContentExtension.cs | 2 +- .../XmlSchemaSimpleContentRestriction.cs | 2 +- .../System/Xml/Schema/XmlSchemaSimpleType.cs | 2 +- .../Xml/Schema/XmlSchemaSimpleTypeList.cs | 2 +- .../Schema/XmlSchemaSimpleTypeRestriction.cs | 2 +- .../Xml/Schema/XmlSchemaSimpleTypeUnion.cs | 2 +- .../Xml/Schema/XmlSchemaSubstitutionGroup.cs | 2 +- System.Xml/System/Xml/Schema/XmlSchemaType.cs | 2 +- .../Schema/XmlSchemaValidationException.cs | 2 +- .../System/Xml/Schema/XmlSchemaValidator.cs | 19 +- .../System/Xml/Schema/XmlValueConverter.cs | 2 +- System.Xml/System/Xml/Schema/XsdBuilder.cs | 2 +- System.Xml/System/Xml/Schema/XsdDateTime.cs | 2 +- System.Xml/System/Xml/Schema/XsdDuration.cs | 2 +- System.Xml/System/Xml/Schema/XsdValidator.cs | 2 +- .../Advanced/SchemaImporterExtension.cs | 2 +- .../System/Xml/Serialization/CodeExporter.cs | 2 +- .../System/Xml/Serialization/CodeGenerator.cs | 2 +- .../Xml/Serialization/CodeIdentifier.cs | 2 +- .../Xml/Serialization/CodeIdentifiers.cs | 2 +- .../System/Xml/Serialization/Compilation.cs | 2 +- .../System/Xml/Serialization/Compiler.cs | 2 +- .../Configuration/ConfigurationStrings.cs | 2 +- .../DateTimeSerializationSection.cs | 2 +- .../SchemaImporterExtensionElement.cs | 2 +- ...chemaImporterExtensionElementCollection.cs | 2 +- .../SchemaImporterExtensionsSection.cs | 2 +- .../SerializationSectionGroup.cs | 2 +- .../System/Xml/Serialization/ImportContext.cs | 2 +- .../System/Xml/Serialization/Mappings.cs | 2 +- System.Xml/System/Xml/Serialization/Models.cs | 2 +- .../System/Xml/Serialization/NameTable.cs | 2 +- .../Serialization/PrimitiveXmlSerializers.cs | 2 +- .../Xml/Serialization/SchemaImporter.cs | 2 +- .../Xml/Serialization/SchemaObjectWriter.cs | 2 +- .../Serialization/SoapAttributeAttribute.cs | 2 +- .../Serialization/SoapAttributeOverrides.cs | 2 +- .../Xml/Serialization/SoapAttributes.cs | 2 +- .../Xml/Serialization/SoapCodeExporter.cs | 2 +- .../Xml/Serialization/SoapElementAttribute.cs | 2 +- .../Xml/Serialization/SoapEnumAttribute.cs | 2 +- .../Xml/Serialization/SoapIgnoreAttribute.cs | 2 +- .../Xml/Serialization/SoapIncludeAttribute.cs | 2 +- .../Serialization/SoapReflectionImporter.cs | 2 +- .../Xml/Serialization/SoapSchemaExporter.cs | 2 +- .../Xml/Serialization/SoapSchemaImporter.cs | 2 +- .../Xml/Serialization/SoapSchemamember.cs | 2 +- .../Xml/Serialization/SoapTypeAttribute.cs | 2 +- .../System/Xml/Serialization/SourceInfo.cs | 2 +- System.Xml/System/Xml/Serialization/Types.cs | 4 +- .../Serialization/XmlAnyAttributeAttribute.cs | 2 +- .../Serialization/XmlAnyElementAttribute.cs | 2 +- .../Serialization/XmlAnyElementAttributes.cs | 2 +- .../Xml/Serialization/XmlArrayAttribute.cs | 2 +- .../Serialization/XmlArrayItemAttribute.cs | 2 +- .../Serialization/XmlArrayItemAttributes.cs | 2 +- .../Serialization/XmlAttributeAttribute.cs | 2 +- .../Serialization/XmlAttributeOverrides.cs | 2 +- .../System/Xml/Serialization/XmlAttributes.cs | 2 +- .../XmlChoiceIdentifierAttribute.cs | 2 +- .../Xml/Serialization/XmlCodeExporter.cs | 2 +- .../Xml/Serialization/XmlElementAttribute.cs | 2 +- .../Xml/Serialization/XmlElementAttributes.cs | 2 +- .../Xml/Serialization/XmlEnumAttribute.cs | 2 +- .../Xml/Serialization/XmlIgnoreAttribute.cs | 2 +- .../Xml/Serialization/XmlIncludeAttribute.cs | 2 +- .../System/Xml/Serialization/XmlMapping.cs | 2 +- .../Xml/Serialization/XmlMemberMapping.cs | 2 +- .../Xml/Serialization/XmlMembersMapping.cs | 2 +- .../XmlNamespaceDeclarationsAttribute.cs | 2 +- .../Serialization/XmlReflectionImporter.cs | 2 +- .../Xml/Serialization/XmlReflectionMember.cs | 2 +- .../Xml/Serialization/XmlRootAttribute.cs | 2 +- .../Xml/Serialization/XmlSchemaExporter.cs | 2 +- .../Xml/Serialization/XmlSchemaImporter.cs | 2 +- .../XmlSchemaProviderAttribute.cs | 2 +- .../System/Xml/Serialization/XmlSchemas.cs | 2 +- .../XmlSerializationGeneratedCode.cs | 2 +- .../Serialization/XmlSerializationILGen.cs | 2 +- .../Serialization/XmlSerializationReader.cs | 4 +- .../XmlSerializationReaderILGen.cs | 4 +- .../Serialization/XmlSerializationWriter.cs | 4 +- .../XmlSerializationWriterILGen.cs | 2 +- .../System/Xml/Serialization/XmlSerializer.cs | 2 +- .../XmlSerializerAssemblyAttribute.cs | 2 +- .../Xml/Serialization/XmlSerializerFactory.cs | 2 +- .../Serialization/XmlSerializerNamespaces.cs | 2 +- .../XmlSerializerVersionAttribute.cs | 2 +- .../Xml/Serialization/XmlTextAttribute.cs | 2 +- .../Xml/Serialization/XmlTypeAttribute.cs | 2 +- .../Xml/Serialization/XmlTypeMapping.cs | 2 +- .../Xml/Serialization/Xmlcustomformatter.cs | 2 +- .../System/Xml/Serialization/_Events.cs | 2 +- .../Xml/Serialization/indentedWriter.cs | 2 +- System.Xml/System/Xml/ValidateNames.cs | 2 +- .../Xml/XPath/Internal/AbsoluteQuery.cs | 2 +- .../Xml/XPath/Internal/AttributeQuery.cs | 2 +- System.Xml/System/Xml/XPath/Internal/Axis.cs | 2 +- .../Xml/XPath/Internal/BaseAxisQuery.cs | 2 +- .../System/Xml/XPath/Internal/BooleanExpr.cs | 2 +- .../Xml/XPath/Internal/BooleanFunctions.cs | 2 +- .../Xml/XPath/Internal/CacheAxisQuery.cs | 2 +- .../Xml/XPath/Internal/CacheChildrenQuery.cs | 2 +- .../Xml/XPath/Internal/CacheOutputQuery.cs | 2 +- .../Xml/XPath/Internal/ChildrenQuery.cs | 2 +- .../Xml/XPath/Internal/ClonableStack.cs | 2 +- .../Xml/XPath/Internal/CompiledXPathExpr.cs | 2 +- .../System/Xml/XPath/Internal/ContextQuery.cs | 2 +- .../Xml/XPath/Internal/DescendantBaseQuery.cs | 2 +- .../Xml/XPath/Internal/DescendantQuery.cs | 2 +- .../Internal/DescendantoverDescendantQuery.cs | 2 +- .../Xml/XPath/Internal/DocumentorderQuery.cs | 2 +- .../System/Xml/XPath/Internal/EmptyQuery.cs | 2 +- .../Xml/XPath/Internal/ExtensionQuery.cs | 2 +- .../System/Xml/XPath/Internal/Filter.cs | 2 +- .../System/Xml/XPath/Internal/FilterQuery.cs | 2 +- .../Xml/XPath/Internal/FollowingQuery.cs | 2 +- .../Xml/XPath/Internal/FollowingSibling.cs | 2 +- .../XPath/Internal/ForwardPositionQuery.cs | 2 +- .../System/Xml/XPath/Internal/Function.cs | 2 +- .../Xml/XPath/Internal/FunctionQuery.cs | 4 +- System.Xml/System/Xml/XPath/Internal/Group.cs | 2 +- .../System/Xml/XPath/Internal/GroupQuery.cs | 2 +- .../System/Xml/XPath/Internal/IdQuery.cs | 2 +- .../Xml/XPath/Internal/IteratorFilter.cs | 2 +- .../System/Xml/XPath/Internal/LogicalExpr.cs | 2 +- .../Xml/XPath/Internal/MergeFilterQuery.cs | 2 +- .../Xml/XPath/Internal/NamespaceQuery.cs | 2 +- .../Xml/XPath/Internal/NodeFunctions.cs | 2 +- .../Xml/XPath/Internal/NumberFunctions.cs | 2 +- .../System/Xml/XPath/Internal/NumericExpr.cs | 2 +- .../System/Xml/XPath/Internal/Operand.cs | 2 +- .../System/Xml/XPath/Internal/OperandQuery.cs | 2 +- .../System/Xml/XPath/Internal/Operator.cs | 2 +- .../System/Xml/XPath/Internal/ParentQuery.cs | 2 +- .../Xml/XPath/Internal/PrecedingQuery.cs | 2 +- .../Xml/XPath/Internal/PrecedingSibling.cs | 2 +- System.Xml/System/Xml/XPath/Internal/Query.cs | 2 +- .../System/Xml/XPath/Internal/QueryBuilder.cs | 2 +- .../Xml/XPath/Internal/ResetableIterator.cs | 2 +- .../XPath/Internal/ReversePositionQuery.cs | 2 +- System.Xml/System/Xml/XPath/Internal/Root.cs | 2 +- .../System/Xml/XPath/Internal/SortQuery.cs | 2 +- .../Xml/XPath/Internal/StringFunctions.cs | 2 +- .../System/Xml/XPath/Internal/UnionExpr.cs | 2 +- .../System/Xml/XPath/Internal/ValueQuery.cs | 2 +- .../System/Xml/XPath/Internal/Variable.cs | 2 +- .../Xml/XPath/Internal/VariableQuery.cs | 2 +- .../XPath/Internal/XPathAncestorIterator.cs | 2 +- .../Xml/XPath/Internal/XPathAncestorQuery.cs | 2 +- .../Xml/XPath/Internal/XPathArrayIterator.cs | 2 +- .../Xml/XPath/Internal/XPathAxisIterator.cs | 2 +- .../Xml/XPath/Internal/XPathChildIterator.cs | 2 +- .../XPath/Internal/XPathDescendantIterator.cs | 2 +- .../Xml/XPath/Internal/XPathEmptyIterator.cs | 2 +- .../Xml/XPath/Internal/XPathMultyIterator.cs | 2 +- .../System/Xml/XPath/Internal/XPathParser.cs | 2 +- .../System/Xml/XPath/Internal/XPathScanner.cs | 2 +- .../XPath/Internal/XPathSelectionIterator.cs | 2 +- .../Xml/XPath/Internal/XPathSelfQuery.cs | 2 +- .../XPath/Internal/XPathSingletonIterator.cs | 2 +- System.Xml/System/Xml/XPath/XPathDocument.cs | 4 +- System.Xml/System/Xml/XPath/XPathException.cs | 2 +- System.Xml/System/Xml/XPath/XPathExpr.cs | 2 +- System.Xml/System/Xml/XPath/XPathItem.cs | 2 +- System.Xml/System/Xml/XPath/XPathNavigator.cs | 2 +- .../Xml/XPath/XPathNavigatorKeyComparer.cs | 2 +- .../System/Xml/XPath/XPathNavigatorReader.cs | 2 +- .../System/Xml/XPath/XPathNodeIterator.cs | 2 +- System.Xml/System/Xml/XmlCharType.cs | 2 +- System.Xml/System/Xml/XmlComplianceUtil.cs | 2 +- System.Xml/System/Xml/XmlConvert.cs | 2 +- System.Xml/System/Xml/XmlDownloadManager.cs | 2 +- System.Xml/System/Xml/XmlEncoding.cs | 2 +- System.Xml/System/Xml/XmlException.cs | 2 +- System.Xml/System/Xml/XmlNamespacemanager.cs | 2 +- System.Xml/System/Xml/XmlNullResolver.cs | 2 +- System.Xml/System/Xml/XmlQualifiedName.cs | 2 +- System.Xml/System/Xml/XmlResolver.cs | 2 +- System.Xml/System/Xml/XmlSecureResolver.cs | 2 +- System.Xml/System/Xml/XmlUrlResolver.cs | 2 +- .../System/Xml/Xslt/XslCompiledTransform.cs | 2 +- System.Xml/System/Xml/Xslt/XslTransform.cs | 2 +- .../System/Xml/Xslt/XsltArgumentList.cs | 2 +- System.Xml/System/Xml/Xslt/XsltContext.cs | 2 +- System.Xml/System/Xml/Xslt/XsltException.cs | 2 +- System.Xml/System/Xml/Xslt/XsltSettings.cs | 2 +- .../Clr/inc/AppContextDefaultValues.cs | 1 - .../microsoft/visualbasic/VBCodeProvider.cs | 4 +- .../microsoft/win32/UnsafeNativeMethods.cs | 6 +- .../safehandles/SafeEventLogReadHandle.cs | 2 +- .../safehandles/SafeEventLogWriteHandle.cs | 2 +- .../safehandles/SafeFileMapViewHandle.cs | 2 +- .../safehandles/SafeFileMappingHandle.cs | 2 +- .../win32/safehandles/SafeLibraryHandle.cs | 2 +- .../win32/safehandles/SafeLocalMemHandle.cs | 2 +- .../win32/safehandles/SafeTimerHandle.cs | 2 +- .../win32/safehandles/SafeUserTokenHandle.cs | 2 +- .../CodeArgumentReferenceExpression.cs | 2 +- .../codedom/CodeArrayCreateExpression.cs | 2 +- .../codedom/CodeArrayIndexerExpression.cs | 2 +- .../system/codedom/CodeAssignStatement.cs | 2 +- .../codedom/CodeAttachEventStatement.cs | 2 +- .../system/codedom/CodeAttributeArgument.cs | 2 +- .../CodeAttributeArgumentCollection.cs | 2 +- .../codedom/CodeAttributeDeclaration.cs | 2 +- .../CodeAttributeDeclarationCollection.cs | 2 +- .../codedom/CodeBinaryOperatorExpression.cs | 2 +- .../system/codedom/CodeCastExpression.cs | 2 +- .../compmod/system/codedom/CodeCatchClause.cs | 2 +- .../codedom/CodeCatchClauseCollection.cs | 2 +- .../system/codedom/CodeChecksumPragma.cs | 2 +- System/compmod/system/codedom/CodeComment.cs | 2 +- .../system/codedom/CodeCommentStatement.cs | 2 +- .../codedom/CodeCommentStatementCollection.cs | 2 +- .../compmod/system/codedom/CodeCompileUnit.cs | 2 +- .../system/codedom/CodeConditionStatement.cs | 2 +- .../compmod/system/codedom/CodeConstructor.cs | 2 +- .../codedom/CodeDefaultValueExpression.cs | 2 +- .../codedom/CodeDelegateCreateExpression.cs | 2 +- .../codedom/CodeDelegateInvokeExpression.cs | 2 +- .../system/codedom/CodeDirectionExpression.cs | 2 +- .../system/codedom/CodeDirectiveCollection.cs | 2 +- .../system/codedom/CodeEntryPointMethod.cs | 2 +- .../codedom/CodeEventReferenceExpression.cs | 2 +- .../codedom/CodeExpressionCollection.cs | 2 +- .../system/codedom/CodeExpressionStatement.cs | 2 +- .../codedom/CodeFieldReferenceExpression.cs | 2 +- .../system/codedom/CodeGotoStatement.cs | 2 +- .../system/codedom/CodeIndexerExpression.cs | 2 +- .../system/codedom/CodeIterationStatement.cs | 2 +- .../system/codedom/CodeLabeledStatement.cs | 2 +- .../compmod/system/codedom/CodeLinePragma.cs | 2 +- .../compmod/system/codedom/CodeMemberEvent.cs | 2 +- .../compmod/system/codedom/CodeMemberField.cs | 2 +- .../system/codedom/CodeMemberMethod.cs | 2 +- .../system/codedom/CodeMemberProperty.cs | 2 +- .../codedom/CodeMethodInvokeExpression.cs | 2 +- .../codedom/CodeMethodReturnStatement.cs | 2 +- .../compmod/system/codedom/CodeNamespace.cs | 2 +- .../system/codedom/CodeNamespaceCollection.cs | 2 +- .../system/codedom/CodeNamespaceImport.cs | 2 +- .../codedom/CodeNamespaceImportCollection.cs | 2 +- System/compmod/system/codedom/CodeObject.cs | 2 +- .../codedom/CodeObjectCreateExpression.cs | 2 +- .../CodeParameterDeclarationExpression.cs | 2 +- ...arameterDeclarationExpressionCollection.cs | 2 +- .../system/codedom/CodePrimitiveExpression.cs | 2 +- .../CodePropertyReferenceExpression.cs | 2 +- .../system/codedom/CodeRegionDirective.cs | 2 +- .../codedom/CodeRemoveEventStatement.cs | 2 +- .../system/codedom/CodeSnippetCompileUnit.cs | 2 +- .../system/codedom/CodeSnippetExpression.cs | 2 +- .../system/codedom/CodeSnippetStatement.cs | 2 +- .../system/codedom/CodeSnippetTypeMember.cs | 2 +- .../compmod/system/codedom/CodeStatement.cs | 2 +- .../system/codedom/CodeStatementCollection.cs | 2 +- .../codedom/CodeThrowExceptionStatement.cs | 2 +- .../codedom/CodeTryCatchFinallyStatement.cs | 2 +- .../system/codedom/CodeTypeConstructor.cs | 2 +- .../system/codedom/CodeTypeDeclaration.cs | 2 +- .../codedom/CodeTypeDeclarationCollection.cs | 2 +- .../system/codedom/CodeTypeDelegate.cs | 2 +- .../compmod/system/codedom/CodeTypeMember.cs | 2 +- .../codedom/CodeTypeMemberCollection.cs | 2 +- .../system/codedom/CodeTypeOfExpression.cs | 2 +- .../system/codedom/CodeTypeParameter.cs | 2 +- .../codedom/CodeTypeParameterCollection.cs | 2 +- .../system/codedom/CodeTypeReference.cs | 2 +- .../codedom/CodeTypeReferenceCollection.cs | 2 +- .../codedom/CodeTypeReferenceExpression.cs | 2 +- .../CodeVariableDeclarationStatement.cs | 2 +- .../CodeVariableReferenceExpression.cs | 2 +- .../codedom/codemethodreferenceexpression.cs | 2 +- .../system/codedom/compiler/CodeCompiler.cs | 2 +- .../codedom/compiler/CodeDOMProvider.cs | 2 +- .../compiler/CodeDomConfigurationHandler.cs | 2 +- .../system/codedom/compiler/CodeGenerator.cs | 2 +- .../codedom/compiler/CodeGeneratorOptions.cs | 2 +- .../system/codedom/compiler/CodeValidator.cs | 2 +- .../system/codedom/compiler/CompilerError.cs | 2 +- .../compiler/CompilerErrorCollection.cs | 2 +- .../system/codedom/compiler/CompilerInfo.cs | 2 +- .../codedom/compiler/CompilerParameters.cs | 2 +- .../codedom/compiler/CompilerResults.cs | 2 +- .../system/codedom/compiler/Executor.cs | 2 +- .../compiler/GeneratedCodeAttribute.cs | 2 +- .../codedom/compiler/IndentTextWriter.cs | 2 +- .../codedom/compiler/RedistVersionInfo.cs | 2 +- .../system/codedom/compiler/TempFiles.cs | 2 +- .../system/collections/generic/stack.cs | 2 +- .../objectmodel/observablecollection.cs | 12 +- .../specialized/marshalinghelpers.cs | 2 +- .../specialized/stringdictionary.cs | 2 +- .../system/componentmodel/AsyncOperation.cs | 2 +- .../componentmodel/InstallerTypeAttribute.cs | 2 +- .../LicenseProviderAttribute.cs | 2 +- .../system/componentmodel/MemberDescriptor.cs | 2 +- .../componentmodel/PropertyDescriptor.cs | 2 +- .../componentmodel/design/DesignerVerb.cs | 2 +- .../DesigntimeLicenseContextSerializer.cs | 2 +- .../design/PropertyTabAttribute.cs | 2 +- .../design/ToolboxItemAttribute.cs | 2 +- .../diagnostics/XmlWriterTraceListener.cs | 6 +- .../system/diagnostics/assertwrapper.cs | 8 +- System/misc/ClientUtils.cs | 6 +- System/misc/SecurityUtils.cs | 6 +- .../Net/Cache/HttpRequestCacheValidator.cs | 2 +- System/net/System/Net/Cache/IERequestCache.cs | 2 +- .../System/Net/Cache/RequestCachePolicy.cs | 4 +- System/net/System/Net/Cache/WinInetCache.cs | 80 +-- .../Net/Configuration/DefaultProxySection.cs | 2 +- .../TimeoutValidationAttribute.cs | 4 +- System/net/System/Net/FtpWebRequest.cs | 12 +- System/net/System/Net/HttpListener.cs | 26 +- System/net/System/Net/HttpListenerRequest.cs | 130 ++++- System/net/System/Net/HttpWebRequest.cs | 34 +- System/net/System/Net/HttpWebResponse.cs | 26 +- System/net/System/Net/Internal.cs | 2 +- .../Net/SecureProtocols/NegotiateStream.cs | 10 +- .../Net/SecureProtocols/_FixedSizeReader.cs | 4 +- .../System/Net/SecureProtocols/_NegoStream.cs | 12 +- .../System/Net/SecureProtocols/_SslState.cs | 8 +- .../System/Net/SecureProtocols/_SslStream.cs | 14 +- System/net/System/Net/ServicePoint.cs | 2 +- .../net/System/Net/Sockets/NetworkStream.cs | 14 +- System/net/System/Net/Sockets/Socket.cs | 22 +- System/net/System/Net/Sockets/UDPClient.cs | 2 +- System/net/System/Net/TransportContext.cs | 10 + System/net/System/Net/UnsafeNativeMethods.cs | 171 ++++++- System/net/System/Net/WebRequest.cs | 2 +- .../WebSocketHttpListenerDuplexStream.cs | 82 +++- System/net/System/Net/WebUtility.cs | 4 +- System/net/System/Net/_AuthenticationState.cs | 2 +- .../System/Net/_AutoWebProxyScriptEngine.cs | 2 +- .../System/Net/_AutoWebProxyScriptHelper.cs | 2 +- .../System/Net/_AutoWebProxyScriptWrapper.cs | 18 +- System/net/System/Net/_ChunkParser.cs | 2 +- System/net/System/Net/_CommandStream.cs | 8 +- System/net/System/Net/_ConnectStream.cs | 18 +- System/net/System/Net/_Connection.cs | 20 +- System/net/System/Net/_ContextAwareResult.cs | 2 +- System/net/System/Net/_DigestClient.cs | 2 +- System/net/System/Net/_HTTPDateParse.cs | 4 +- System/net/System/Net/_LazyAsyncResult.cs | 2 +- .../net/System/Net/_ListenerResponseStream.cs | 2 +- System/net/System/Net/_SafeNetHandles.cs | 6 + System/net/System/Net/_SecureChannel.cs | 5 +- System/net/System/Net/_TLSstream.cs | 14 +- System/net/System/Net/_TimerThread.cs | 2 +- System/net/System/Net/mail/MailHeaderInfo.cs | 6 +- System/net/System/Net/mail/SmtpClient.cs | 2 +- System/net/System/Net/mail/SmtpTransport.cs | 2 +- System/net/System/Net/mail/smtpconnection.cs | 4 +- System/net/System/URI.cs | 44 +- System/net/System/_UriSyntax.cs | 4 +- .../system/text/regularexpressions/Regex.cs | 8 +- .../text/regularexpressions/RegexCompiler.cs | 4 +- .../ExtendedProtection/TokenBinding.cs | 37 ++ .../system/security/cryptography/cryptoapi.cs | 7 + .../security/cryptography/x509/x509chain.cs | 197 +++----- .../system/diagnosticts/EventLog.cs | 12 +- .../system/diagnosticts/EventLogEntry.cs | 2 +- .../diagnosticts/EventLogEntryCollection.cs | 2 +- .../system/diagnosticts/EventLogInternal.cs | 22 +- .../monitoring/system/diagnosticts/Process.cs | 11 +- .../system/diagnosticts/ProcessManager.cs | 2 +- .../system/diagnosticts/ProcessStartInfo.cs | 7 + .../system/diagnosticts/SharedUtils.cs | 2 +- System/services/timers/system/timers/Timer.cs | 2 +- System/sys/LocalAppContextSwitches.cs | 14 + .../IO/compression/FastEncoderWindow.cs | 6 +- System/sys/system/IO/ports/SerialStream.cs | 2 +- System/sys/system/Media/SoundPlayer.cs | 4 +- .../concurrent/BlockingCollection.cs | 6 +- .../collections/concurrent/ConcurrentBag.cs | 2 +- System/sys/system/threading/Barrier.cs | 2 +- .../markup/ValueSerializerAttribute.cs | 2 +- .../PartialClassGenerationTaskInternal.cs | 10 +- .../Build/Tasks/Xaml/ResolveAssemblyHelper.cs | 6 +- .../NDP_Common/inc/StrongNameHelpers.cs | 40 +- mscorlib/microsoft/win32/oavariantlib.cs | 2 +- .../win32/safehandles/saferegistryhandle.cs | 2 +- mscorlib/system/AggregateException.cs | 2 +- mscorlib/system/AppContext/AppContext.cs | 4 +- .../AppContext/AppContextDefaultValues.cs | 1 - mscorlib/system/Lazy.cs | 4 +- mscorlib/system/appdomain.cs | 6 +- mscorlib/system/appdomainattributes.cs | 2 +- mscorlib/system/appdomainunloadedexception.cs | 2 +- mscorlib/system/argiterator.cs | 2 +- mscorlib/system/array.cs | 2 +- mscorlib/system/badimageformatexception.cs | 2 +- .../system/cannotunloadappdomainexception.cs | 2 +- .../Concurrent/CDSCollectionETWBCLProvider.cs | 2 +- .../Concurrent/ConcurrentDictionary.cs | 2 +- .../collections/Concurrent/ConcurrentQueue.cs | 2 +- .../collections/Concurrent/ConcurrentStack.cs | 2 +- .../Concurrent/IProducerConsumerCollection.cs | 2 +- .../Concurrent/OrderablePartitioner.cs | 2 +- .../collections/Concurrent/Partitioner.cs | 2 +- .../Concurrent/PartitionerStatic.cs | 2 +- mscorlib/system/collections/arraylist.cs | 2 +- mscorlib/system/collections/bitarray.cs | 2 +- .../collections/caseinsensitivecomparer.cs | 2 +- .../caseinsensitivehashcodeprovider.cs | 2 +- mscorlib/system/collections/collectionbase.cs | 2 +- mscorlib/system/collections/comparer.cs | 2 +- .../system/collections/compatiblecomparer.cs | 2 +- mscorlib/system/collections/dictionarybase.cs | 2 +- .../system/collections/dictionaryentry.cs | 2 +- .../emptyreadonlydictionaryinternal.cs | 2 +- .../collections/generic/arraysorthelper.cs | 2 +- .../system/collections/generic/comparer.cs | 2 +- .../system/collections/generic/debugview.cs | 2 +- .../system/collections/generic/dictionary.cs | 2 +- .../collections/generic/equalitycomparer.cs | 2 +- .../generic/keynotfoundexception.cs | 2 +- .../collections/generic/keyvaluepair.cs | 2 +- mscorlib/system/collections/generic/list.cs | 2 +- mscorlib/system/collections/hashtable.cs | 102 ++-- mscorlib/system/collections/keyvaluepairs.cs | 2 +- .../collections/listdictionaryinternal.cs | 2 +- .../collections/objectmodel/collection.cs | 2 +- .../objectmodel/keyedcollection.cs | 2 +- .../objectmodel/readonlycollection.cs | 2 +- mscorlib/system/collections/queue.cs | 2 +- .../collections/readonlycollectionbase.cs | 2 +- mscorlib/system/collections/sortedlist.cs | 2 +- mscorlib/system/collections/stack.cs | 4 +- .../collections/structuralcomparisons.cs | 2 +- mscorlib/system/delegate.cs | 2 +- mscorlib/system/diagnostics/assert.cs | 18 +- .../system/diagnostics/contracts/contracts.cs | 2 +- .../diagnostics/contracts/contractsbcl.cs | 2 +- .../eventing/TraceLogging/SimpleTypeInfos.cs | 16 +- .../diagnostics/eventing/activitytracker.cs | 2 +- .../diagnostics/eventing/eventdescriptor.cs | 2 +- .../diagnostics/eventing/eventsource.cs | 47 +- .../eventing/frameworkeventsource.cs | 4 +- mscorlib/system/environment.cs | 12 +- mscorlib/system/exception.cs | 2 +- mscorlib/system/executionengineexception.cs | 2 +- .../system/globalization/Persiancalendar.cs | 2 +- mscorlib/system/globalization/calendar.cs | 2 +- mscorlib/system/globalization/calendardata.cs | 2 +- mscorlib/system/globalization/culturedata.cs | 39 +- mscorlib/system/globalization/cultureinfo.cs | 2 +- .../system/globalization/datetimeformat.cs | 10 +- .../system/globalization/datetimeparse.cs | 78 ++- .../eastasianlunisolarcalendar.cs | 2 +- mscorlib/system/globalization/hebrewnumber.cs | 4 +- mscorlib/system/globalization/regioninfo.cs | 2 +- mscorlib/system/globalization/stringinfo.cs | 2 +- .../globalization/textelementenumerator.cs | 2 +- mscorlib/system/globalization/textinfo.cs | 2 +- .../system/globalization/timespanformat.cs | 2 +- .../system/globalization/timespanparse.cs | 2 +- .../system/globalization/umalquracalendar.cs | 2 +- mscorlib/system/io/__consolestream.cs | 2 +- mscorlib/system/io/__error.cs | 2 +- mscorlib/system/io/bufferedstream.cs | 8 +- mscorlib/system/io/directory.cs | 4 +- mscorlib/system/io/directoryinfo.cs | 2 +- .../system/io/directorynotfoundexception.cs | 2 +- mscorlib/system/io/driveinfo.cs | 2 +- mscorlib/system/io/drivenotfoundexception.cs | 2 +- mscorlib/system/io/endofstreamexception.cs | 2 +- mscorlib/system/io/file.cs | 2 +- mscorlib/system/io/fileinfo.cs | 2 +- mscorlib/system/io/fileloadexception.cs | 4 +- mscorlib/system/io/filenotfoundexception.cs | 4 +- mscorlib/system/io/filestream.cs | 24 +- mscorlib/system/io/filesystemenumerable.cs | 2 +- mscorlib/system/io/filesysteminfo.cs | 2 +- mscorlib/system/io/ioexception.cs | 2 +- .../io/isolatedstorage/isolatedstorage.cs | 6 +- .../isolatedstorageexception.cs | 2 +- .../io/isolatedstorage/isolatedstoragefile.cs | 12 +- .../isolatedstoragefilestream.cs | 2 +- mscorlib/system/io/longpath.cs | 2 +- mscorlib/system/io/memorystream.cs | 4 +- mscorlib/system/io/path.cs | 18 +- mscorlib/system/io/pathtoolongexception.cs | 2 +- .../system/io/pinnedbuffermemorystream.cs | 2 +- mscorlib/system/io/stream.cs | 2 +- mscorlib/system/io/streamreader.cs | 2 +- mscorlib/system/io/stringreader.cs | 2 +- mscorlib/system/io/stringwriter.cs | 2 +- mscorlib/system/io/textreader.cs | 2 +- mscorlib/system/io/textwriter.cs | 2 +- mscorlib/system/io/unmanagedmemoryaccessor.cs | 2 +- mscorlib/system/io/unmanagedmemorystream.cs | 6 +- .../system/io/unmanagedmemorystreamwrapper.cs | 4 +- mscorlib/system/object.cs | 2 +- mscorlib/system/progress.cs | 10 +- mscorlib/system/reflection/Associates.cs | 2 +- mscorlib/system/reflection/ConstructorInfo.cs | 2 +- mscorlib/system/reflection/__filters.cs | 2 +- .../reflection/ambiguousmatchexception.cs | 2 +- mscorlib/system/reflection/assembly.cs | 8 +- .../system/reflection/assemblyattributes.cs | 2 +- mscorlib/system/reflection/assemblyname.cs | 4 +- .../system/reflection/assemblynameproxy.cs | 4 +- mscorlib/system/reflection/customattribute.cs | 2 +- .../customattributeformatexception.cs | 4 +- .../reflection/defaultmemberattribute.cs | 2 +- mscorlib/system/reflection/emit/aqnbuilder.cs | 2 +- .../system/reflection/emit/assemblybuilder.cs | 4 +- .../reflection/emit/assemblybuilderdata.cs | 2 +- .../reflection/emit/constructorbuilder.cs | 2 +- .../reflection/emit/customattributebuilder.cs | 2 +- .../reflection/emit/dynamicilgenerator.cs | 4 +- .../system/reflection/emit/dynamicmethod.cs | 2 +- .../system/reflection/emit/enumbuilder.cs | 2 +- .../system/reflection/emit/eventbuilder.cs | 2 +- mscorlib/system/reflection/emit/eventtoken.cs | 2 +- .../system/reflection/emit/fieldbuilder.cs | 2 +- mscorlib/system/reflection/emit/fieldtoken.cs | 2 +- .../emit/generictypeparameterbuilder.cs | 2 +- .../system/reflection/emit/ilgenerator.cs | 2 +- mscorlib/system/reflection/emit/label.cs | 2 +- .../system/reflection/emit/localbuilder.cs | 2 +- .../system/reflection/emit/methodbuilder.cs | 4 +- .../emit/methodbuilderinstantiation.cs | 2 +- .../system/reflection/emit/methodrental.cs | 2 +- .../system/reflection/emit/methodtoken.cs | 2 +- .../system/reflection/emit/modulebuilder.cs | 2 +- .../reflection/emit/modulebuilderdata.cs | 2 +- mscorlib/system/reflection/emit/opcode.cs | 2 +- mscorlib/system/reflection/emit/opcodes.cs | 2 +- .../reflection/emit/parameterbuilder.cs | 2 +- .../system/reflection/emit/parametertoken.cs | 2 +- .../system/reflection/emit/propertybuilder.cs | 2 +- .../system/reflection/emit/propertytoken.cs | 2 +- .../system/reflection/emit/signaturehelper.cs | 2 +- .../system/reflection/emit/signaturetoken.cs | 2 +- .../system/reflection/emit/stringtoken.cs | 2 +- .../system/reflection/emit/symbolmethod.cs | 2 +- mscorlib/system/reflection/emit/symboltype.cs | 2 +- .../system/reflection/emit/typebuilder.cs | 2 +- .../emit/typebuilderinstantiation.cs | 2 +- mscorlib/system/reflection/emit/typetoken.cs | 2 +- .../reflection/emit/unmanagedmarshal.cs | 2 +- .../emit/xxxontypebuilderinstantiation.cs | 2 +- mscorlib/system/reflection/eventinfo.cs | 2 +- mscorlib/system/reflection/fieldinfo.cs | 2 +- .../reflection/introspectionextensions.cs | 2 +- .../invalidfiltercriteriaexception.cs | 2 +- mscorlib/system/reflection/loaderallocator.cs | 2 +- .../system/reflection/manifestresourceinfo.cs | 2 +- mscorlib/system/reflection/mdconstant.cs | 2 +- mscorlib/system/reflection/mdimport.cs | 6 +- mscorlib/system/reflection/memberinfo.cs | 2 +- .../memberinfoserializationholder.cs | 2 +- mscorlib/system/reflection/methodbase.cs | 2 +- mscorlib/system/reflection/methodbody.cs | 2 +- mscorlib/system/reflection/methodinfo.cs | 2 +- mscorlib/system/reflection/missing.cs | 2 +- mscorlib/system/reflection/module.cs | 4 +- .../reflection/obfuscateassemblyattribute.cs | 2 +- .../system/reflection/obfuscationattribute.cs | 2 +- mscorlib/system/reflection/parameterinfo.cs | 2 +- .../system/reflection/parametermodifier.cs | 2 +- mscorlib/system/reflection/pointer.cs | 2 +- mscorlib/system/reflection/propertyinfo.cs | 2 +- .../system/reflection/reflectioncontext.cs | 2 +- .../reflection/reflectiontypeloadexception.cs | 2 +- .../system/reflection/strongnamekeypair.cs | 2 +- mscorlib/system/reflection/targetexception.cs | 2 +- .../reflection/targetinvocationexception.cs | 2 +- .../targetparametercountexception.cs | 2 +- mscorlib/system/reflection/typedelegator.cs | 2 +- mscorlib/system/reflection/typeinfo.cs | 2 +- .../resources/__fastresourcecomparer.cs | 2 +- .../resources/filebasedresourcegroveler.cs | 2 +- .../manifestbasedresourcegroveler.cs | 2 +- .../missingmanifestresourceexception.cs | 2 +- .../missingsatelliteassemblyexception.cs | 2 +- .../neutralresourceslanguageattribute.cs | 2 +- .../resources/resourcefallbackmanager.cs | 38 +- mscorlib/system/resources/resourcemanager.cs | 46 +- mscorlib/system/resources/resourcereader.cs | 12 +- mscorlib/system/resources/resourceset.cs | 2 +- mscorlib/system/resources/resourcewriter.cs | 2 +- .../system/resources/runtimeresourceset.cs | 2 +- .../satellitecontractversionattribute.cs | 2 +- mscorlib/system/rttype.cs | 10 +- .../compilerservices/AsyncMethodBuilder.cs | 4 +- .../compilerservices/ConditionalWeakTable.cs | 2 +- .../runtime/compilerservices/TaskAwaiter.cs | 2 +- .../compilerservices/YieldAwaitable.cs | 2 +- .../compilationrelaxations.cs | 2 +- .../compilerservices/runtimehelpers.cs | 2 +- .../corruptingexceptioncommon.cs | 2 +- .../exceptionnotification.cs | 2 +- .../exceptionservicescommon.cs | 2 +- .../runtime/interopservices/attributes.cs | 2 +- .../runtime/interopservices/gchandle.cs | 2 +- .../windowsruntime/attributes.cs | 6 +- .../bindablevectortocollectionadapter.cs | 4 +- .../bindablevectortolistadapter.cs | 2 +- .../windowsruntime/clrikeyvaluepairimpl.cs | 4 +- .../windowsruntime/clripropertyvalueimpl.cs | 8 +- .../windowsruntime/clrireferenceimpl.cs | 8 +- .../windowsruntime/custompropertyimpl.cs | 2 +- .../windowsruntime/dictionarytomapadapter.cs | 2 +- .../enumeratortoiteratoradapter.cs | 6 +- .../windowsruntime/eventregistrationtoken.cs | 6 +- .../eventregistrationtokentable.cs | 6 +- .../windowsruntime/icustompropertyprovider.cs | 2 +- .../imapviewtoireadonlydictionaryadapter.cs | 4 +- .../ireadonlydictionarytoimapviewadapter.cs | 2 +- .../ireadonlylisttoivectorviewadapter.cs | 2 +- .../iteratortoenumeratoradapter.cs | 4 +- .../ivectorviewtoireadonlylistadapter.cs | 2 +- .../listtobindablevectoradapter.cs | 2 +- .../listtobindablevectorviewadapter.cs | 2 +- .../windowsruntime/listtovectoradapter.cs | 2 +- .../managedactivationfactory.cs | 6 +- .../windowsruntime/maptocollectionadapter.cs | 2 +- .../windowsruntime/maptodictionaryadapter.cs | 2 +- .../mapviewtoreadonlycollectionadapter.cs | 2 +- .../vectortocollectionadapter.cs | 2 +- .../windowsruntime/vectortolistadapter.cs | 2 +- .../vectorviewtoreadonlycollectionadapter.cs | 2 +- .../windowsruntime/windowsruntimemarshal.cs | 6 +- .../windowsruntime/windowsruntimemetadata.cs | 2 +- .../windowsruntime/winrtclassactivator.cs | 2 +- .../runtime/remoting/activationservices.cs | 2 +- .../runtime/remoting/channelservices.cs | 2 +- .../runtime/remoting/channelsinkstacks.cs | 2 +- .../system/runtime/remoting/clientsponsor.cs | 4 +- .../system/runtime/remoting/configuration.cs | 2 +- mscorlib/system/runtime/remoting/context.cs | 2 +- .../runtime/remoting/crossappdomainchannel.cs | 10 +- .../runtime/remoting/crosscontextchannel.cs | 4 +- .../system/runtime/remoting/identityholder.cs | 2 +- mscorlib/system/runtime/remoting/lease.cs | 2 +- .../system/runtime/remoting/leasemanager.cs | 2 +- mscorlib/system/runtime/remoting/message.cs | 6 +- mscorlib/system/runtime/remoting/objref.cs | 8 +- mscorlib/system/runtime/remoting/realproxy.cs | 8 +- .../runtime/remoting/remotingattributes.cs | 2 +- .../system/runtime/remoting/remotingproxy.cs | 2 +- .../runtime/remoting/remotingservices.cs | 4 +- .../runtime/remoting/soapinteroptypes.cs | 2 +- .../runtime/remoting/synchronizeddispatch.cs | 40 +- .../system/runtime/remoting/urlattribute.cs | 4 +- .../serialization/formatters/soapfault.cs | 2 +- .../serialization/objectclonehelper.cs | 2 +- .../serialization/safeserializationmanager.cs | 2 +- .../runtime/serialization/streamingcontext.cs | 2 +- .../runtime/versioning/binarycompatibility.cs | 2 +- .../versioning/multitargetinghelpers.cs | 2 +- mscorlib/system/runtimehandles.cs | 2 +- mscorlib/system/security/accesscontrol/ace.cs | 12 +- mscorlib/system/security/accesscontrol/acl.cs | 24 +- .../accesscontrol/securitydescriptor.cs | 4 +- mscorlib/system/security/attributes.cs | 2 +- .../system/security/builtinpermissionsets.cs | 2 +- mscorlib/system/security/claims/Claim.cs | 2 +- .../system/security/claims/ClaimsIdentity.cs | 2 +- .../system/security/claims/ClaimsPrincipal.cs | 2 +- .../security/claims/RoleClaimProvider.cs | 2 +- .../system/security/codeaccesspermission.cs | 2 +- .../security/codeaccesssecurityengine.cs | 4 +- .../cryptography/asymmetricalgorithm.cs | 2 +- .../asymmetrickeyexchangedeformatter.cs | 2 +- .../asymmetrickeyexchangeformatter.cs | 2 +- .../asymmetricsignaturedeformatter.cs | 2 +- .../asymmetricsignatureformatter.cs | 2 +- .../security/cryptography/base64transforms.cs | 2 +- .../system/security/cryptography/crypto.cs | 4 +- .../cryptography/cryptoapitransform.cs | 2 +- .../security/cryptography/cryptoconfig.cs | 2 +- .../security/cryptography/cryptostream.cs | 2 +- .../security/cryptography/derivebytes.cs | 2 +- mscorlib/system/security/cryptography/des.cs | 2 +- .../cryptography/descryptoserviceprovider.cs | 2 +- mscorlib/system/security/cryptography/dsa.cs | 2 +- .../cryptography/dsacryptoserviceprovider.cs | 2 +- .../cryptography/dsasignaturedeformatter.cs | 2 +- .../cryptography/dsasignatureformatter.cs | 2 +- .../security/cryptography/hashalgorithm.cs | 2 +- mscorlib/system/security/cryptography/hmac.cs | 2 +- .../system/security/cryptography/hmacmd5.cs | 2 +- .../security/cryptography/hmacripemd160.cs | 2 +- .../system/security/cryptography/hmacsha1.cs | 2 +- .../security/cryptography/hmacsha256.cs | 2 +- .../security/cryptography/hmacsha384.cs | 2 +- .../security/cryptography/hmacsha512.cs | 2 +- .../cryptography/icspasymmetricalgorithm.cs | 2 +- .../cryptography/keyedhashalgorithm.cs | 2 +- .../security/cryptography/mactripledes.cs | 2 +- mscorlib/system/security/cryptography/md5.cs | 2 +- .../cryptography/md5cryptoserviceprovider.cs | 2 +- .../cryptography/passwordderivebytes.cs | 2 +- .../cryptography/pkcs1maskgenerationmethod.cs | 2 +- .../cryptography/randomnumbergenerator.cs | 2 +- mscorlib/system/security/cryptography/rc2.cs | 2 +- .../cryptography/rc2cryptoserviceprovider.cs | 2 +- .../cryptography/rfc2898derivebytes.cs | 2 +- .../system/security/cryptography/rijndael.cs | 2 +- .../security/cryptography/rijndaelmanaged.cs | 2 +- .../cryptography/rijndaelmanagedtransform.cs | 2 +- .../system/security/cryptography/ripemd160.cs | 2 +- .../security/cryptography/ripemd160managed.cs | 2 +- .../cryptography/rngcryptoserviceprovider.cs | 2 +- mscorlib/system/security/cryptography/rsa.cs | 2 +- .../cryptography/rsacryptoserviceprovider.cs | 2 +- .../rsaoaepkeyexchangedeformatter.cs | 2 +- .../rsaoaepkeyexchangeformatter.cs | 2 +- .../rsapkcs1keyexchangedeformatter.cs | 2 +- .../rsapkcs1keyexchangeformatter.cs | 2 +- .../rsapkcs1signaturedeformatter.cs | 2 +- .../rsapkcs1signatureformatter.cs | 2 +- .../cryptography/safecryptohandles.cs | 2 +- mscorlib/system/security/cryptography/sha1.cs | 2 +- .../cryptography/sha1cryptoserviceprovider.cs | 2 +- .../security/cryptography/sha1managed.cs | 2 +- .../system/security/cryptography/sha256.cs | 2 +- .../security/cryptography/sha256managed.cs | 2 +- .../system/security/cryptography/sha384.cs | 2 +- .../security/cryptography/sha384managed.cs | 2 +- .../system/security/cryptography/sha512.cs | 2 +- .../security/cryptography/sha512managed.cs | 2 +- .../cryptography/signaturedescription.cs | 2 +- .../cryptography/symmetricalgorithm.cs | 2 +- .../system/security/cryptography/tripledes.cs | 2 +- .../tripledescryptoserviceprovider.cs | 2 +- .../system/security/cryptography/utils.cs | 2 +- .../security/framesecuritydescriptor.cs | 2 +- .../security/hostprotectionexception.cs | 2 +- .../system/security/hostsecuritymanager.cs | 2 +- .../system/security/namedpermissionset.cs | 2 +- mscorlib/system/security/permissionlistset.cs | 4 +- .../permissions/environmentpermission.cs | 2 +- .../permissions/filedialogpermission.cs | 2 +- .../security/permissions/fileiopermission.cs | 2 +- .../permissions/gacidentitypermission.cs | 2 +- .../permissions/hostprotectionpermission.cs | 4 +- .../isolatedstoragefilepermission.cs | 2 +- .../permissions/isolatedstoragepermission.cs | 2 +- .../permissions/keycontainerpermission.cs | 2 +- .../permissions/permissionattributes.cs | 2 +- .../permissions/principalpermission.cs | 2 +- .../publisheridentitypermission.cs | 2 +- .../permissions/reflectionpermission.cs | 2 +- .../permissions/registrypermission.cs | 2 +- .../permissions/securitypermission.cs | 2 +- .../permissions/siteidentitypermission.cs | 2 +- .../strongnameidentitypermission.cs | 2 +- .../permissions/strongnamepublickeyblob.cs | 2 +- .../security/permissions/uipermission.cs | 2 +- .../permissions/urlidentitypermission.cs | 2 +- .../permissions/zoneidentitypermission.cs | 2 +- mscorlib/system/security/permissionset.cs | 2 +- .../security/permissionsetenumerator.cs | 2 +- .../system/security/permissionsettriple.cs | 2 +- mscorlib/system/security/permissiontoken.cs | 2 +- .../security/policy/allmembershipcondition.cs | 2 +- .../security/policy/applicationdirectory.cs | 2 +- ...applicationdirectorymembershipcondition.cs | 2 +- .../policy/applicationsecurityinfo.cs | 2 +- .../policy/applicationsecuritymanager.cs | 2 +- .../security/policy/applicationtrust.cs | 6 +- .../policy/assemblyevidencefactory.cs | 2 +- mscorlib/system/security/policy/codegroup.cs | 2 +- mscorlib/system/security/policy/evidence.cs | 2 +- .../system/security/policy/evidencebase.cs | 4 +- .../security/policy/evidencetypedescriptor.cs | 2 +- .../system/security/policy/filecodegroup.cs | 2 +- .../security/policy/firstmatchcodegroup.cs | 2 +- mscorlib/system/security/policy/gac.cs | 2 +- .../security/policy/gacmembershipcondition.cs | 2 +- mscorlib/system/security/policy/hash.cs | 2 +- .../policy/hashmembershipcondition.cs | 2 +- .../policy/iapplicationtrustmanager.cs | 2 +- .../system/security/policy/netcodegroup.cs | 2 +- .../security/policy/pefileevidencefactory.cs | 4 +- .../policy/permissionrequestevidence.cs | 2 +- .../system/security/policy/policyexception.cs | 2 +- .../system/security/policy/policylevel.cs | 2 +- .../system/security/policy/policystatement.cs | 2 +- mscorlib/system/security/policy/publisher.cs | 2 +- .../policy/publishermembershipcondition.cs | 2 +- mscorlib/system/security/policy/site.cs | 2 +- .../policy/sitemembershipcondition.cs | 2 +- mscorlib/system/security/policy/strongname.cs | 2 +- .../policy/strongnamemembershipcondition.cs | 2 +- .../system/security/policy/unioncodegroup.cs | 2 +- mscorlib/system/security/policy/url.cs | 2 +- .../security/policy/urlmembershipcondition.cs | 2 +- mscorlib/system/security/policy/zone.cs | 2 +- .../policy/zonemembershipcondition.cs | 2 +- mscorlib/system/security/policymanager.cs | 4 +- .../security/principal/genericidentity.cs | 2 +- .../security/principal/genericprincipal.cs | 4 +- .../principal/identitynotmappedexception.cs | 2 +- .../security/principal/identityreference.cs | 2 +- .../system/security/principal/ircollection.cs | 20 +- .../system/security/principal/ntaccount.cs | 2 +- mscorlib/system/security/principal/sid.cs | 2 +- mscorlib/system/security/principal/win32.cs | 2 +- .../security/principal/windowsidentity.cs | 14 +- .../principal/windowsimpersonationcontext.cs | 2 +- .../security/principal/windowsprincipal.cs | 2 +- .../system/security/readonlypermissionset.cs | 2 +- .../system/security/safesecurityhandles.cs | 2 +- mscorlib/system/security/securestring.cs | 2 +- mscorlib/system/security/securitycontext.cs | 4 +- mscorlib/system/security/securitydocument.cs | 2 +- mscorlib/system/security/securityelement.cs | 2 +- mscorlib/system/security/securityexception.cs | 2 +- mscorlib/system/security/securitymanager.cs | 2 +- mscorlib/system/security/securityruntime.cs | 2 +- mscorlib/system/security/securitystate.cs | 2 +- mscorlib/system/security/util/config.cs | 2 +- mscorlib/system/security/util/hex.cs | 2 +- mscorlib/system/security/util/parser.cs | 2 +- mscorlib/system/security/util/sitestring.cs | 2 +- .../security/util/stringexpressionset.cs | 2 +- .../system/security/util/tokenbasedset.cs | 2 +- .../security/util/tokenbasedsetenumerator.cs | 2 +- mscorlib/system/security/util/tokenizer.cs | 2 +- mscorlib/system/security/util/urlstring.cs | 2 +- mscorlib/system/security/util/xmlutil.cs | 2 +- .../system/security/verificationexception.cs | 2 +- .../system/security/xmlsyntaxexception.cs | 2 +- mscorlib/system/string.cs | 10 +- mscorlib/system/stubhelpers.cs | 4 +- mscorlib/system/text/asciiencoding.cs | 2 +- mscorlib/system/text/decoder.cs | 4 +- mscorlib/system/text/encoder.cs | 2 +- mscorlib/system/text/encoding.cs | 6 +- mscorlib/system/text/gb18030encoding.cs | 144 +++--- mscorlib/system/text/iso2022encoding.cs | 2 +- mscorlib/system/text/unicodeencoding.cs | 2 +- mscorlib/system/text/utf32encoding.cs | 2 +- mscorlib/system/text/utf7encoding.cs | 2 +- mscorlib/system/text/utf8encoding.cs | 2 +- .../system/threading/CDSsyncETWBCLProvider.cs | 10 +- .../system/threading/CancellationToken.cs | 6 +- .../CancellationTokenRegistration.cs | 2 +- .../threading/CancellationTokenSource.cs | 8 +- mscorlib/system/threading/CountdownEvent.cs | 4 +- mscorlib/system/threading/LazyInitializer.cs | 2 +- .../system/threading/ManualResetEventSlim.cs | 4 +- mscorlib/system/threading/SemaphoreSlim.cs | 2 +- mscorlib/system/threading/SpinLock.cs | 2 +- mscorlib/system/threading/SpinWait.cs | 2 +- .../Tasks/BeginEndAwaitableAdapter.cs | 2 +- .../Tasks/ConcurrentExclusiveSchedulerPair.cs | 6 +- mscorlib/system/threading/Tasks/Future.cs | 2 +- .../system/threading/Tasks/FutureFactory.cs | 2 +- mscorlib/system/threading/Tasks/Parallel.cs | 6 +- .../threading/Tasks/ParallelLoopState.cs | 2 +- .../threading/Tasks/ParallelRangeManager.cs | 2 +- .../threading/Tasks/ProducerConsumerQueues.cs | 4 +- .../system/threading/Tasks/TPLETWProvider.cs | 2 +- mscorlib/system/threading/Tasks/Task.cs | 2 +- .../threading/Tasks/TaskCanceledException.cs | 2 +- .../threading/Tasks/TaskCompletionSource.cs | 2 +- .../threading/Tasks/TaskContinuation.cs | 4 +- .../threading/Tasks/TaskExceptionHolder.cs | 2 +- .../system/threading/Tasks/TaskFactory.cs | 2 +- .../system/threading/Tasks/TaskScheduler.cs | 2 +- .../threading/Tasks/TaskSchedulerException.cs | 2 +- mscorlib/system/threading/Tasks/TaskToApm.cs | 2 +- .../Tasks/ThreadPoolTaskScheduler.cs | 2 +- mscorlib/system/threading/ThreadLocal.cs | 2 +- .../threading/abandonedmutexexception.cs | 2 +- mscorlib/system/threading/asynclocal.cs | 2 +- mscorlib/system/threading/autoresetevent.cs | 2 +- mscorlib/system/threading/compressedstack.cs | 4 +- mscorlib/system/threading/eventwaithandle.cs | 2 +- mscorlib/system/threading/executioncontext.cs | 6 +- .../threading/hostexecutioncontextmanager.cs | 2 +- mscorlib/system/threading/interlocked.cs | 2 +- mscorlib/system/threading/lockcookie.cs | 4 +- .../threading/lockrecursionexception.cs | 4 +- mscorlib/system/threading/manualresetevent.cs | 2 +- mscorlib/system/threading/monitor.cs | 2 +- mscorlib/system/threading/mutex.cs | 2 +- mscorlib/system/threading/overlapped.cs | 2 +- mscorlib/system/threading/readerwriterlock.cs | 2 +- .../threading/semaphorefullexception.cs | 2 +- .../threading/synchronizationcontext.cs | 16 +- .../threading/synchronizationlockexception.cs | 2 +- mscorlib/system/threading/thread.cs | 14 +- .../system/threading/threadabortexception.cs | 2 +- .../threading/threadinterruptedexception.cs | 2 +- mscorlib/system/threading/threadpool.cs | 4 +- .../system/threading/threadstartexception.cs | 2 +- .../system/threading/threadstateexception.cs | 2 +- mscorlib/system/threading/timeout.cs | 2 +- mscorlib/system/threading/timer.cs | 4 +- mscorlib/system/threading/volatile.cs | 2 +- mscorlib/system/threading/waithandle.cs | 4 +- .../waithandlecannotbeopenedexception.cs | 2 +- mscorlib/system/type.cs | 2 +- 3285 files changed, 10462 insertions(+), 7213 deletions(-) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/AssemblyInfo.cs (90%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/SR.Designer.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ArgumentIdentifierTrimConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/AssignDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CancellationScopeDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseKeyBox.ViewInterface.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseKeyBox.ViewModel.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseKeyBox.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseKeyBoxIsEnabledConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CaseLabelVisibilityConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CatchDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ComboBoxHelper.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/CompensableActivityDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ConnectionPointType.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DelegateArgumentsValueEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DesignerMetadata.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DisplayNameConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DoWhileDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DynamicActivityPropertyChooser.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DynamicActivityPropertyChooserViewModel.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/DynamicActivityPropertyToTooltipConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ExpandableItemShowExpandedMultiValueConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ExpandableItemWrapper.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ExpressionToExpressionTextConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Factories/GenericForEachWithBodyFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Factories/GenericParallelForEachWithBodyFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Factories/PickWithTwoBranchesFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Factories/StateMachineWithInitialStateFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FakeRoot.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FinalState.cs (99%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowDecisionDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowDecisionLabelFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchCaseEditorDialog.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchDefaultLinkFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchLabelFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchLink.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchLinkCasePropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowSwitchLinkMultiValueConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartConnectionPointsAdorner.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesigner.Container.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesigner.Helpers.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesigner.ModelChangeReactions.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesigner.ModelChanges.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartDesignerCommands.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartExpressionAdorner.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartExpressionAutomationPeer.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartFreeFormPanel.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartResizeGrip.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FlowchartSizeFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ForEachDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/FreeFormPanelUtilities.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/GenericFlowSwitchHelper.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/GenericTypeArgumentConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/HintTextConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/HintTextMaxWidthConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/IFlowSwitch.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/IfElseDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/InteropDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/InvokeDelegateDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/InvokeDelegateValidationFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/InvokeMethodDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/IsLastSelectedItemConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/IsStateRootDesignerConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/LocationChangedEventArgs.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/MaxValueConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/MorphHelpers.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/NoPersistScopeDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/NotConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ParallelDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ParallelSeparator.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/PickBranchDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/PickDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/PickValidationErrorSourceLocator.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/PickValidationErrorSourceLocatorFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/PropertyNames.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/RegisterMetadataDelayedWorker.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/ReorderableListEditor.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/SelectedPropertyNameChangedEventArgs.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/SequenceDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StartNode.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StartSymbol.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateConnectionPointToolTip.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerEditor.CompositeView.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerEditor.ModelChangeReactions.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerEditor.ModelChanges.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerEditor.Utilities.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerEditor.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateContainerResizeGrip.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateLinkButtonToolTipConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateMachineConnetionPointsAdorner.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateMachineDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateMachineFreeFormPanel.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocator.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocatorFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/SwitchDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/SwitchTryCatchDesignerHelper.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Themes/DesignerStyleDictionary.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Themes/EditorCategoryTemplateDictionary.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/Themes/StringResourceDictionary.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/TransactionScopeDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/TransitionDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/TransitionReorderChange.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/TryCatchDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/VerticalConnector.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/WhileDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Core/Presentation/WriteLineDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/ActivityDesignerHelper.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/ActivityXRefPropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/ArgumentCollectionPropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/DynamicArgumentDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/DynamicArgumentDesignerOptions.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/DynamicArgumentDialog.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/TypeCollectionDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/Activities/Presentation/TypeCollectionPropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ActivityXRefConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/BindingEditor.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/BindingPropertyValueEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ContentButtonTitleConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ContentCorrelationTypeExpander.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ContentDialogViewModel.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Converters/ReceiveMessageContentSearchableStringConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Converters/ReceiveParametersContentSearchableStringConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Converters/SendMessageContentSearchableStringConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Converters/SendParametersContentSearchableStringConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Converters/XPathMessageQuerySearchableStringConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/CorrelatesOnValueEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/CorrelationDataDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/CorrelationInitializerDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/CorrelationInitializerValueEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/CorrelationScopeDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/EndpointDesigner.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Factories/ReceiveAndSendReplyFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/Factories/SendAndReceiveReplyFactory.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/InitializeCorrelationDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/MessageQueryEditor.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/MessageQuerySetDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/MessagingContentPropertyEditorResources.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ReceiveContentDialog.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ReceiveContentPropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ReceiveDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ReceiveReplyDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ReceiveReplyValidationFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/SendContentDialog.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/SendContentPropertyEditor.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/SendDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/SendReplyDesigner.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/SendReplyValidationFeature.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/ServiceContractImporter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/TransactedReceiveScope.xaml.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Activities/Presentation/TypeToTreeConverter.cs (100%) rename {System.Activities.Presentation/System.Activities.Core.Presentation => System.Activities.Core.Presentation}/System/ServiceModel/Presentation/ServiceDesigner.xaml.cs (100%) create mode 100644 System.ComponentModel.DataAnnotations/DataAnnotations/AppContextDefaultValues.Default.cs create mode 100644 System.ComponentModel.DataAnnotations/DataAnnotations/AppSettings.cs create mode 100644 System.ComponentModel.DataAnnotations/DataAnnotations/LocalAppContextSwitches.cs create mode 100644 System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/AppContextDefaultValues.cs create mode 100644 System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/LocalAppContext.cs create mode 100644 System.Core/System/Security/Cryptography/X509Certificates/ECDsaCertificateExtensions.cs create mode 100644 System.Data/System/Data/SqlClient/SqlColumnEncryptionCngProvider.cs create mode 100644 System.Data/System/Data/SqlClient/SqlColumnEncryptionCspProvider.cs create mode 100644 System.Web/Util/RegexUtil.cs create mode 100644 System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs diff --git a/SMDiagnostics/System/ServiceModel/Diagnostics/Utility.cs b/SMDiagnostics/System/ServiceModel/Diagnostics/Utility.cs index 9bdec4c12..71fd837a3 100644 --- a/SMDiagnostics/System/ServiceModel/Diagnostics/Utility.cs +++ b/SMDiagnostics/System/ServiceModel/Diagnostics/Utility.cs @@ -28,7 +28,7 @@ internal Utility(ExceptionUtility exceptionUtility) [SuppressMessage(FxCop.Category.Security, FxCop.Rule.TransparentMethodsMustNotReferenceCriticalCode)] // we got APTCA approval with no requirement to fix this transparency warning internal static void CloseInvalidOutSafeHandle(SafeHandle handle) { - // Workaround for 64-bit CLR + // Workaround for 64-bit CLR bug VSWhidbey 546830 - sometimes invalid SafeHandles come back null. if (handle != null) { #pragma warning disable 618 diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/AssemblyInfo.cs b/System.Activities.Core.Presentation/AssemblyInfo.cs similarity index 90% rename from System.Activities.Presentation/System.Activities.Core.Presentation/AssemblyInfo.cs rename to System.Activities.Core.Presentation/AssemblyInfo.cs index 7c865848a..5919b7862 100644 --- a/System.Activities.Presentation/System.Activities.Core.Presentation/AssemblyInfo.cs +++ b/System.Activities.Core.Presentation/AssemblyInfo.cs @@ -2,4 +2,4 @@ using System.Diagnostics.CodeAnalysis; [assembly: InternalsVisibleTo("CIT.System.Activities.Core.Design, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] -[assembly: SuppressMessage("Microsoft.MSInternal", "CA904:DeclareTypesInMicrosoftOrSystemNamespace", Scope = "namespace", Target = "XamlGeneratedNamespace", Justification = "Xaml Generated")] +[assembly: SuppressMessage("Microsoft.MSInternal", "CA904:DeclareTypesInMicrosoftOrSystemNamespace", Scope = "namespace", Target = "XamlGeneratedNamespace", Justification = "Xaml Generated")] \ No newline at end of file diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/SR.Designer.cs b/System.Activities.Core.Presentation/SR.Designer.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/SR.Designer.cs rename to System.Activities.Core.Presentation/SR.Designer.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ArgumentIdentifierTrimConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ArgumentIdentifierTrimConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ArgumentIdentifierTrimConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ArgumentIdentifierTrimConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/AssignDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/AssignDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/AssignDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/AssignDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CancellationScopeDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CancellationScopeDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CancellationScopeDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CancellationScopeDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewInterface.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewInterface.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewInterface.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewInterface.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewModel.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewModel.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewModel.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.ViewModel.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBox.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBoxIsEnabledConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBoxIsEnabledConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBoxIsEnabledConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseKeyBoxIsEnabledConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseLabelVisibilityConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseLabelVisibilityConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseLabelVisibilityConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CaseLabelVisibilityConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CatchDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CatchDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CatchDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CatchDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ComboBoxHelper.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ComboBoxHelper.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ComboBoxHelper.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ComboBoxHelper.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CompensableActivityDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CompensableActivityDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/CompensableActivityDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/CompensableActivityDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ConnectionPointType.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ConnectionPointType.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ConnectionPointType.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ConnectionPointType.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DelegateArgumentsValueEditor.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DelegateArgumentsValueEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DelegateArgumentsValueEditor.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DelegateArgumentsValueEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DesignerMetadata.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DesignerMetadata.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DesignerMetadata.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DesignerMetadata.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DisplayNameConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DisplayNameConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DisplayNameConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DisplayNameConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DoWhileDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DoWhileDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DoWhileDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DoWhileDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooser.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooser.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooser.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooser.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooserViewModel.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooserViewModel.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooserViewModel.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyChooserViewModel.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyToTooltipConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyToTooltipConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyToTooltipConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/DynamicActivityPropertyToTooltipConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemShowExpandedMultiValueConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemShowExpandedMultiValueConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemShowExpandedMultiValueConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemShowExpandedMultiValueConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemWrapper.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemWrapper.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemWrapper.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpandableItemWrapper.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpressionToExpressionTextConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpressionToExpressionTextConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpressionToExpressionTextConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ExpressionToExpressionTextConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericForEachWithBodyFactory.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericForEachWithBodyFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericForEachWithBodyFactory.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericForEachWithBodyFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericParallelForEachWithBodyFactory.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericParallelForEachWithBodyFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericParallelForEachWithBodyFactory.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/GenericParallelForEachWithBodyFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/PickWithTwoBranchesFactory.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/PickWithTwoBranchesFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/PickWithTwoBranchesFactory.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/PickWithTwoBranchesFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/StateMachineWithInitialStateFactory.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/StateMachineWithInitialStateFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/StateMachineWithInitialStateFactory.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Factories/StateMachineWithInitialStateFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FakeRoot.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FakeRoot.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FakeRoot.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FakeRoot.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs similarity index 99% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs index 681ede84f..4cbffae1b 100644 --- a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs +++ b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FinalState.cs @@ -12,4 +12,4 @@ namespace System.Activities.Core.Presentation public sealed class FinalState { } -} +} \ No newline at end of file diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionLabelFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionLabelFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionLabelFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowDecisionLabelFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchCaseEditorDialog.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchCaseEditorDialog.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchCaseEditorDialog.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchCaseEditorDialog.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDefaultLinkFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDefaultLinkFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDefaultLinkFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDefaultLinkFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLabelFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLabelFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLabelFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLabelFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLink.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLink.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLink.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLink.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkCasePropertyEditor.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkCasePropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkCasePropertyEditor.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkCasePropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkMultiValueConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkMultiValueConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkMultiValueConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowSwitchLinkMultiValueConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartConnectionPointsAdorner.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartConnectionPointsAdorner.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartConnectionPointsAdorner.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartConnectionPointsAdorner.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Container.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Container.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Container.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Container.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Helpers.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Helpers.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Helpers.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.Helpers.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChangeReactions.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChangeReactions.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChangeReactions.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChangeReactions.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChanges.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChanges.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChanges.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.ModelChanges.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesignerCommands.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesignerCommands.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesignerCommands.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartDesignerCommands.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAdorner.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAdorner.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAdorner.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAdorner.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAutomationPeer.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAutomationPeer.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAutomationPeer.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartExpressionAutomationPeer.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartFreeFormPanel.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartFreeFormPanel.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartFreeFormPanel.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartFreeFormPanel.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartResizeGrip.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartResizeGrip.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartResizeGrip.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartResizeGrip.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartSizeFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartSizeFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartSizeFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FlowchartSizeFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ForEachDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ForEachDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ForEachDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ForEachDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FreeFormPanelUtilities.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FreeFormPanelUtilities.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/FreeFormPanelUtilities.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/FreeFormPanelUtilities.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericFlowSwitchHelper.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericFlowSwitchHelper.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericFlowSwitchHelper.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericFlowSwitchHelper.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericTypeArgumentConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericTypeArgumentConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericTypeArgumentConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/GenericTypeArgumentConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextMaxWidthConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextMaxWidthConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextMaxWidthConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/HintTextMaxWidthConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IFlowSwitch.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IFlowSwitch.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IFlowSwitch.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/IFlowSwitch.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IfElseDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IfElseDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IfElseDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/IfElseDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InteropDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InteropDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InteropDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/InteropDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateValidationFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateValidationFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateValidationFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeDelegateValidationFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeMethodDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeMethodDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeMethodDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/InvokeMethodDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsLastSelectedItemConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsLastSelectedItemConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsLastSelectedItemConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsLastSelectedItemConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsStateRootDesignerConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsStateRootDesignerConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsStateRootDesignerConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/IsStateRootDesignerConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/LocationChangedEventArgs.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/LocationChangedEventArgs.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/LocationChangedEventArgs.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/LocationChangedEventArgs.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MaxValueConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MaxValueConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MaxValueConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/MaxValueConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MorphHelpers.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MorphHelpers.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/MorphHelpers.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/MorphHelpers.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NoPersistScopeDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NoPersistScopeDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NoPersistScopeDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/NoPersistScopeDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NotConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NotConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/NotConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/NotConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelSeparator.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelSeparator.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelSeparator.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ParallelSeparator.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickBranchDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickBranchDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickBranchDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickBranchDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocator.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocator.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocator.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocator.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocatorFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocatorFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocatorFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/PickValidationErrorSourceLocatorFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PropertyNames.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PropertyNames.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/PropertyNames.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/PropertyNames.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/RegisterMetadataDelayedWorker.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/RegisterMetadataDelayedWorker.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/RegisterMetadataDelayedWorker.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/RegisterMetadataDelayedWorker.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ReorderableListEditor.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ReorderableListEditor.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/ReorderableListEditor.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/ReorderableListEditor.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SelectedPropertyNameChangedEventArgs.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SelectedPropertyNameChangedEventArgs.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SelectedPropertyNameChangedEventArgs.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/SelectedPropertyNameChangedEventArgs.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SequenceDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SequenceDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SequenceDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/SequenceDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartNode.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartNode.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartNode.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartNode.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartSymbol.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartSymbol.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartSymbol.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StartSymbol.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateConnectionPointToolTip.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateConnectionPointToolTip.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateConnectionPointToolTip.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateConnectionPointToolTip.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.CompositeView.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.CompositeView.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.CompositeView.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.CompositeView.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChangeReactions.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChangeReactions.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChangeReactions.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChangeReactions.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChanges.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChanges.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChanges.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.ModelChanges.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.Utilities.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.Utilities.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.Utilities.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.Utilities.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerEditor.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerResizeGrip.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerResizeGrip.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerResizeGrip.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateContainerResizeGrip.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateLinkButtonToolTipConverter.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateLinkButtonToolTipConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateLinkButtonToolTipConverter.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateLinkButtonToolTipConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineConnetionPointsAdorner.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineConnetionPointsAdorner.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineConnetionPointsAdorner.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineConnetionPointsAdorner.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineFreeFormPanel.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineFreeFormPanel.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineFreeFormPanel.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineFreeFormPanel.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocator.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocator.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocator.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocator.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocatorFeature.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocatorFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocatorFeature.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/StateMachineValidationErrorSourceLocatorFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchTryCatchDesignerHelper.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchTryCatchDesignerHelper.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchTryCatchDesignerHelper.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/SwitchTryCatchDesignerHelper.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/DesignerStyleDictionary.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/DesignerStyleDictionary.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/DesignerStyleDictionary.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/DesignerStyleDictionary.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/EditorCategoryTemplateDictionary.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/EditorCategoryTemplateDictionary.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/EditorCategoryTemplateDictionary.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/EditorCategoryTemplateDictionary.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/StringResourceDictionary.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/StringResourceDictionary.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/StringResourceDictionary.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/Themes/StringResourceDictionary.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransactionScopeDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransactionScopeDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransactionScopeDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransactionScopeDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionReorderChange.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionReorderChange.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionReorderChange.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/TransitionReorderChange.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TryCatchDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TryCatchDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/TryCatchDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/TryCatchDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/VerticalConnector.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/VerticalConnector.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/VerticalConnector.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/VerticalConnector.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WhileDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WhileDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WhileDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/WhileDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WriteLineDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WriteLineDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Core/Presentation/WriteLineDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Core/Presentation/WriteLineDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityDesignerHelper.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityDesignerHelper.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityDesignerHelper.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/ActivityDesignerHelper.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityXRefPropertyEditor.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityXRefPropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ActivityXRefPropertyEditor.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/ActivityXRefPropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ArgumentCollectionPropertyEditor.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/ArgumentCollectionPropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/ArgumentCollectionPropertyEditor.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/ArgumentCollectionPropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesignerOptions.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesignerOptions.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesignerOptions.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDesignerOptions.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDialog.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDialog.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDialog.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/DynamicArgumentDialog.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionDesigner.xaml.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionPropertyEditor.cs b/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionPropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionPropertyEditor.cs rename to System.Activities.Core.Presentation/System/Activities/Presentation/TypeCollectionPropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ActivityXRefConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ActivityXRefConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ActivityXRefConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ActivityXRefConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingEditor.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingEditor.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingEditor.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingEditor.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingPropertyValueEditor.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingPropertyValueEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingPropertyValueEditor.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/BindingPropertyValueEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentButtonTitleConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentButtonTitleConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentButtonTitleConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentButtonTitleConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentCorrelationTypeExpander.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentCorrelationTypeExpander.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentCorrelationTypeExpander.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentCorrelationTypeExpander.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentDialogViewModel.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentDialogViewModel.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentDialogViewModel.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ContentDialogViewModel.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveMessageContentSearchableStringConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveMessageContentSearchableStringConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveMessageContentSearchableStringConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveMessageContentSearchableStringConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveParametersContentSearchableStringConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveParametersContentSearchableStringConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveParametersContentSearchableStringConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/ReceiveParametersContentSearchableStringConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendMessageContentSearchableStringConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendMessageContentSearchableStringConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendMessageContentSearchableStringConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendMessageContentSearchableStringConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendParametersContentSearchableStringConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendParametersContentSearchableStringConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendParametersContentSearchableStringConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/SendParametersContentSearchableStringConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/XPathMessageQuerySearchableStringConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/XPathMessageQuerySearchableStringConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/XPathMessageQuerySearchableStringConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Converters/XPathMessageQuerySearchableStringConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelatesOnValueEditor.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelatesOnValueEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelatesOnValueEditor.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelatesOnValueEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationDataDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationDataDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationDataDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationDataDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerValueEditor.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerValueEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerValueEditor.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationInitializerValueEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationScopeDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationScopeDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationScopeDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/CorrelationScopeDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/EndpointDesigner.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/EndpointDesigner.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/EndpointDesigner.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/EndpointDesigner.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/ReceiveAndSendReplyFactory.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/ReceiveAndSendReplyFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/ReceiveAndSendReplyFactory.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/ReceiveAndSendReplyFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/SendAndReceiveReplyFactory.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/SendAndReceiveReplyFactory.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/SendAndReceiveReplyFactory.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/Factories/SendAndReceiveReplyFactory.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/InitializeCorrelationDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/InitializeCorrelationDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/InitializeCorrelationDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/InitializeCorrelationDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQueryEditor.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQueryEditor.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQueryEditor.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQueryEditor.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQuerySetDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQuerySetDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQuerySetDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessageQuerySetDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessagingContentPropertyEditorResources.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessagingContentPropertyEditorResources.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessagingContentPropertyEditorResources.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/MessagingContentPropertyEditorResources.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentDialog.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentDialog.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentDialog.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentDialog.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentPropertyEditor.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentPropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentPropertyEditor.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveContentPropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyValidationFeature.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyValidationFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyValidationFeature.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ReceiveReplyValidationFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentDialog.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentDialog.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentDialog.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentDialog.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentPropertyEditor.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentPropertyEditor.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentPropertyEditor.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendContentPropertyEditor.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyDesigner.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyValidationFeature.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyValidationFeature.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyValidationFeature.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/SendReplyValidationFeature.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ServiceContractImporter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ServiceContractImporter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ServiceContractImporter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/ServiceContractImporter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TransactedReceiveScope.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TransactedReceiveScope.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TransactedReceiveScope.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TransactedReceiveScope.xaml.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TypeToTreeConverter.cs b/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TypeToTreeConverter.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TypeToTreeConverter.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Activities/Presentation/TypeToTreeConverter.cs diff --git a/System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Presentation/ServiceDesigner.xaml.cs b/System.Activities.Core.Presentation/System/ServiceModel/Presentation/ServiceDesigner.xaml.cs similarity index 100% rename from System.Activities.Presentation/System.Activities.Core.Presentation/System/ServiceModel/Presentation/ServiceDesigner.xaml.cs rename to System.Activities.Core.Presentation/System/ServiceModel/Presentation/ServiceDesigner.xaml.cs diff --git a/System.Activities.DurableInstancing/System/Activities/DurableInstancing/SqlCommandAsyncResult.cs b/System.Activities.DurableInstancing/System/Activities/DurableInstancing/SqlCommandAsyncResult.cs index b7b1bcd90..8335154ac 100644 --- a/System.Activities.DurableInstancing/System/Activities/DurableInstancing/SqlCommandAsyncResult.cs +++ b/System.Activities.DurableInstancing/System/Activities/DurableInstancing/SqlCommandAsyncResult.cs @@ -35,6 +35,8 @@ sealed class SqlCommandAsyncResult : TransactedAsyncResult new RetryErrorCode(10054, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // Severed tcp connection drawn from the pool new RetryErrorCode(10060, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // The server was not found or was not accessible. new RetryErrorCode(10061, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Server not started + new RetryErrorCode(10928, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - The limit for the database resource has been reached. + new RetryErrorCode(10929, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - The server is currently too busy to support requests up to the maximum limit. new RetryErrorCode(40143, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server encountered error processing the request. new RetryErrorCode(40197, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server encountered error processing the request. new RetryErrorCode(40501, RetryErrorOptions.RetryBeginOrEnd | RetryErrorOptions.RetryWhenTransaction), // SQL Azure error - server is currently busy. @@ -116,7 +118,7 @@ static void StartCommandCallback(object state) SqlCommandAsyncResult thisPtr = (SqlCommandAsyncResult) state; try { - // this can throw on the sync path - we need to signal the callback + // this can throw on the [....] path - we need to signal the callback thisPtr.StartCommandInternal(false); } catch (Exception e) @@ -169,7 +171,7 @@ bool CompleteExecuteReader(IAsyncResult result) this.sqlCommand.Connection.Close(); } - // If we completed sync then any retry is done by the original caller. + // If we completed [....] then any retry is done by the original caller. if (!result.CompletedSynchronously) { if (this.CheckRetryCountAndTimer() && ShouldRetryForSqlError(exception.Number, RetryErrorOptions.RetryOnEnd)) diff --git a/System.Activities.Presentation/Microsoft.Tools.Common/Microsoft/Activities/Presentation/Xaml/XamlWriterExtensions.cs b/System.Activities.Presentation/Microsoft.Tools.Common/Microsoft/Activities/Presentation/Xaml/XamlWriterExtensions.cs index 8728eccd0..8b73e31c7 100644 --- a/System.Activities.Presentation/Microsoft.Tools.Common/Microsoft/Activities/Presentation/Xaml/XamlWriterExtensions.cs +++ b/System.Activities.Presentation/Microsoft.Tools.Common/Microsoft/Activities/Presentation/Xaml/XamlWriterExtensions.cs @@ -26,7 +26,7 @@ public static void PropagateLineInfo(XamlWriter targetWriter, int lineNumber, in consumer.SetLineInfo(lineNumber, linePosition); } - // This method is a workaround for TFS + // This method is a workaround for TFS bug #788190, since XamlReader.ReadSubtree() should (but doesn't) preserve IXamlLineInfo on the subreader public static void Transform(XamlReader reader, XamlWriter writer, IXamlLineInfo readerLineInfo, bool closeWriter) { IXamlLineInfoConsumer consumer = writer as IXamlLineInfoConsumer; diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/NotifyArgumentVariableAnnotationTextChanged.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/NotifyArgumentVariableAnnotationTextChanged.cs index c1c10b8bf..d4ff80cfa 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/NotifyArgumentVariableAnnotationTextChanged.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Annotations/NotifyArgumentVariableAnnotationTextChanged.cs @@ -10,7 +10,7 @@ namespace System.Activities.Presentation.Annotations using System.Activities.Presentation.Model; using System.Activities.Presentation.View; - // This is to workaround a + // This is to workaround a bug that updating ModelItem from outside of ArgumentDesigner/VariableDesigner will not update it. internal class NotifyArgumentVariableAnnotationTextChanged : Change { public ArgumentDesigner ArgumentDesigner { get; set; } diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/CategoryList.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/CategoryList.cs index a8e8f2083..cd5a3a478 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/CategoryList.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/CategoryList.cs @@ -582,7 +582,7 @@ protected override void OnIsKeyboardFocusWithinChanged(DependencyPropertyChanged if (hasKeyboardFocus) { - // We just gained keyboard focus. Make sure we sync up the current property selection + // We just gained keyboard focus. Make sure we [....] up the current property selection // with the keyboard focus, so that navigation works. SynchronizeSelectionFocus(StealFocusMode.OnlyIfCurrentSelectionDoesNotHaveFocusWithin); } diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/EditModeSwitchButtonKeyboardFix.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/EditModeSwitchButtonKeyboardFix.cs index 6a8084d44..c77f41ffa 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/EditModeSwitchButtonKeyboardFix.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/EditModeSwitchButtonKeyboardFix.cs @@ -15,21 +15,21 @@ namespace System.Activities.Presentation.Internal.PropertyEditing using System.Activities.Presentation; // - // This is a fix for a - - - - - - - - - - - - - - + // This is a fix for a bug in EditModeSwitchButton which lives in System.Activities.Presentation and + // which has already been locked as an assembly. EditModeSwitchButton only responds to MouseDown + // events to make sure that the opening of the popup extended editor works correctly. However, + // that means that it will never respond to keyboard or automation events. To fix it, this class + // offers up an attached DP that, when used, hooks into events offered by EditModeSwitchButton + // to correct this issue and still have the button do the right thing even if mouse is not involved + // in invoking the button. + // + // This class is associated with every instance of EditModeSwitchButton using a setter in the + // EditModeSwitchButton style: + // + // <Style TargetType="{x:Type PropertyEditing:EditModeSwitchButton}" BasedOn="{StaticResource {x:Type Button}}"> + // ... + // <Setter Property="Internal:EditModeSwitchButtonKeyboardFix.ApplyFix" Value="True" /> + // class EditModeSwitchButtonKeyboardFix { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/Editors/EditorUtilities.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/Editors/EditorUtilities.cs index efa004b05..a9e9e78a4 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/Editors/EditorUtilities.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/Editors/EditorUtilities.cs @@ -24,15 +24,15 @@ internal static class EditorUtilities // That information if both returned and cached for future reference. // // NOTE: This method does not handle structs correctly because it will return FALSE - // for struct types, which is incorrect. However, this - - - - - - - - + // for struct types, which is incorrect. However, this bug has its counter-part in + // System.Activities.Presentation.dll where the default NewItemFactory only instantiates + // non-struct classes. Both of these need to be fixed at the same time because + // they are used in conjunction. However, MWD is currently locked. + // + // + // Type to verify + // True if the specified type is concrete and has a default constructor, + // false otherwise. public static bool IsConcreteWithDefaultCtor(Type type) { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/ExtensibilityAccessor.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/ExtensibilityAccessor.cs index 7f7d788b4..002837b49 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/ExtensibilityAccessor.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/ExtensibilityAccessor.cs @@ -711,7 +711,7 @@ public static bool IsEditorReusable(IEnumerable properties) // Hack to deal with {x:Static ...} extensions. The Cider Markup code currently // replaces all StaticExtensions with internal versions of the same class. - // Once + // Once bug 100647 is fixed this code can go away. private static bool IsStaticExtension(Type type) { return type != null && ( diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/Controls/WorkaroundPopup.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/Controls/WorkaroundPopup.cs index 4278b7356..0b4cf1b4b 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/Controls/WorkaroundPopup.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/Controls/WorkaroundPopup.cs @@ -13,14 +13,14 @@ namespace System.Activities.Presentation.Internal.PropertyEditing.FromExpression // // This class contains specific behavior for the Popup associated with PropertyContainer. - // Basically, it is a workaround for Windows OS - - - - - - - + // Basically, it is a workaround for Windows OS bug #1745919. The "StaysOpen = false" setting + // on a Popup does not function as we expect when the Popup is created within another + // "StaysOpen = false" popup (or if anything has capture). What happens is the Popup first + // checks if anything has capture, and only takes capture if nothing else has taken it. But the + // StaysOpen behavior is implemented using the capture, so we lose that. Also, related to that + // the Closed event will not be called, so to workaround both of those issues we essentially + // re-implement the popup capture grabbing code, except we take capture no matter what. + // internal class WorkaroundPopup : Popup { private bool releasingCapture = false; diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/CategoryContainer.xaml.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/CategoryContainer.xaml.cs index c6d3d6d2a..efdb0b6da 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/CategoryContainer.xaml.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/CategoryContainer.xaml.cs @@ -54,11 +54,11 @@ internal partial class CategoryContainer : ContentControl // Data for managing expanded state based on a filter. private FilterState filterIsEmpty = FilterState.Unknown; - // garylins 11/15/2006 - This variable has been added to fix - - - - + // garylins 11/15/2006 - This variable has been added to fix bug 29740. The real fix is to find + // a way to update CategoryContainers expansion state when the Category changes. The bug comes about + // because when UpdateFilter is called from the PI, it fires the FilterUpdated event. At this time + // the CategoryContainer is not yet built out, so it hasn't hooked up to listen to the event and hence + // never gets it's filter state related variables updated. private bool haveCachedExpanded = false; private bool wasAdvancedPinnedBeforeFilter = false; private bool wasExpandedBeforeFilter = true; @@ -375,7 +375,7 @@ private static object CoerceShowAdvancedHeader(DependencyObject d, object value) // ################################################### // Bugfix: this condition used to reference editor.Category.AdvancedProperties.Count instead of - // editor.unconsumedAdvancedProperties, which is a + // editor.unconsumedAdvancedProperties, which is a bug. if ((editor.unconsumedAdvancedProperties.Count <= 0 && editor.advancedCategoryEditors.Count == 0) || !editor.AdvancedPropertyMatchesFilter) // ################################################### @@ -518,8 +518,8 @@ private void UpdateUnconsumedProperties(CategoryEditor newEditor, ObservableColl // CIDER-SPECIFIC CHANGE IN NEED OF PORTING - BEGIN // ################################################### - // This change is a result of - + // This change is a result of bug 88870. Blend has this issue + // as well and will need to address it soon. // Original code: diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/PropertyContainerPopupHelper.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/PropertyContainerPopupHelper.cs index acb18836f..f4591eff4 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/PropertyContainerPopupHelper.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/PropertyInspector/PropertyContainerPopupHelper.cs @@ -21,7 +21,7 @@ namespace System.Activities.Presentation.Internal.PropertyEditing.FromExpression internal class PropertyContainerPopup : WorkaroundPopup { // these events allow Acrylic to implement its workaround for Avalon/MFC interop - // focus issues (WinOS + // focus issues (WinOS bug # 1713206) public static readonly RoutedCommand OnBeginExtendedEdit = new RoutedCommand("OnBeginExtendedEdit", typeof(PropertyContainerPopup)); public static readonly RoutedCommand OnEndExtendedEdit = new RoutedCommand("OnEndExtendedEdit", typeof(PropertyContainerPopup)); @@ -52,10 +52,10 @@ protected override void OnClosed(EventArgs e) DependencyObject potentialDescendant = Mouse.Captured as DependencyObject; if (potentialDescendant != null && owningPropertyContainer.IsAncestorOf(potentialDescendant)) { - // v1 38479: This is a mitigation for Windows OS - - - + // v1 38479: This is a mitigation for Windows OS Bug 1965872. + // Here we force any control which has capture to lose it, though + // this situation can occur in other cases (e.g. via extensibility) but this covers the most + // common cases and is a safe fix. Mouse.Capture(null); } diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/ValueEditors/ChoiceEditor.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/ValueEditors/ChoiceEditor.cs index 9807223c0..92992285f 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/ValueEditors/ChoiceEditor.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/FromExpression/Framework/ValueEditors/ChoiceEditor.cs @@ -70,7 +70,7 @@ internal class ChoiceEditor : Control, INotifyPropertyChanged, IIconProvider public static readonly DependencyProperty ComboBoxLoadingCursorProperty = DependencyProperty.Register("ComboBoxLoadingCursor", typeof(Cursor), typeof(ChoiceEditor), new PropertyMetadata(null)); - // WORKAROUND this property is used in combination with a trigger to kick the combobox when it clears its bindings Avalon + // WORKAROUND this property is used in combination with a trigger to kick the combobox when it clears its bindings Avalon bug: 1756023 public static readonly DependencyProperty ForceBindingProperty = DependencyProperty.Register("ForceBinding", typeof(bool), typeof(ChoiceEditor), new FrameworkPropertyMetadata(false)); @@ -924,7 +924,7 @@ protected override void OnRender(DrawingContext drawingContext) protected override void OnTemplateChanged(ControlTemplate oldTemplate, ControlTemplate newTemplate) { this.BeginNoCommitInternalValueChangeBlock(); - // WORKAROUND Turn off bindings on the internal combo while the template is udpating. This works around Avalon + // WORKAROUND Turn off bindings on the internal combo while the template is udpating. This works around Avalon bug: 1756023 this.ForceBinding = false; base.OnTemplateChanged(oldTemplate, newTemplate); } @@ -932,7 +932,7 @@ protected override void OnTemplateChanged(ControlTemplate oldTemplate, ControlTe public override void OnApplyTemplate() { base.OnApplyTemplate(); - // WORKAROUND Force the bindings on our internal combo (if there is one) to update. This works around Avalon + // WORKAROUND Force the bindings on our internal combo (if there is one) to update. This works around Avalon bug: 1756023 this.ForceBinding = true; this.EndNoCommitInternalValueChangeBlock(); @@ -992,7 +992,7 @@ private void OnFinishEditing() private void ItemsSourceChanged() { - // The collection just changed, so we need to make sure that things are in sync + // The collection just changed, so we need to make sure that things are in [....] // ################################################### // CIDER-SPECIFIC CHANGE IN NEED OF PORTING - BEGIN @@ -1131,7 +1131,7 @@ protected bool UpdateValueFromInternalValues() this.Value = newValue; - // At this point it is possible that the value that we just set is out of sync with the internal value + // At this point it is possible that the value that we just set is out of [....] with the internal value if (newValue != this.InternalValue) { this.UpdateInternalValuesFromValue(); diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/PropertyValueDialogHost.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/PropertyValueDialogHost.cs index 4fc58c4b9..d0d06ddf4 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/PropertyValueDialogHost.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/PropertyValueDialogHost.cs @@ -22,7 +22,7 @@ namespace System.Activities.Presentation.Internal.PropertyEditing using Microsoft.Win32; // - // Helper class that is responsible for opening a Microsoft Form that hosts the WPF + // Helper class that is responsible for opening a [....] Form that hosts the WPF // PropertyValueDialogControl that ultimately hosts a DialogPropertyValueEditor. // Both PropertyInspector control as well as PropertyValueDialogControl use this class. // @@ -71,7 +71,7 @@ public void OnCanOpenDialogWindow(object sender, CanExecuteRoutedEventArgs e) // // Called in response to OpenDialogWindow command firing. The method opens a - // Microsoft Form that contains an ElementHost that, in turn, contains + // [....] Form that contains an ElementHost that, in turn, contains // PropertyValueDialogControl. // // diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/VisualTreeUtils.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/VisualTreeUtils.cs index 3d7712e3b..a9d683bd5 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/VisualTreeUtils.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Internal/PropertyEditing/VisualTreeUtils.cs @@ -22,7 +22,7 @@ internal static class VisualTreeUtils private const int MaxSearchDepth = 5; // The maxium wpf visual tree depth - // this value should be kept in sync with WPF's limit + // this value should be kept in [....] with WPF's limit private const int MaxAllowedTreeDepth = 250; // diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Metadata/MetadataStore.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Metadata/MetadataStore.cs index e779c0c25..036e3cf88 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Metadata/MetadataStore.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/Metadata/MetadataStore.cs @@ -288,17 +288,17 @@ private static Attribute[] GetRawAttributes(Type objectType, string member, Memb Fx.Assert(objectType != null, "objectType parameter should not be null"); Type reflectType = TypeDescriptor.GetReflectionType(objectType); - // There is a - - - - - - - - - - + // There is a bug in CLR reflection that does not respect the "inherit" + // flag for event or property infos. Our custom metadata type does respect + // this flag and correctly does the right thing. If the object type we + // are passed is not a metadata type, just use the default behavior of the + // parent member descriptor. It will be right, and since we're not a metadata + // type that means we have no overrides anyway. + // + // The reason we have to call our type with inherit, instead of just using + // one code path is we need to support the interleaving of CLR and + // metadata table attributes up the inheritance hierarchy. MetadataType + // does that for us. if (parentDescriptor != null && !(reflectType is MetadataType)) { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/PropertyEditing/EditModeSwitchButton.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/PropertyEditing/EditModeSwitchButton.cs index 14cc52fea..68652bc26 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/PropertyEditing/EditModeSwitchButton.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Base/Core/PropertyEditing/EditModeSwitchButton.cs @@ -61,7 +61,7 @@ private static object OnCoerceEditModeProperty(DependencyObject obj, object valu EditModeSwitchButton theThis = (EditModeSwitchButton) obj; - // Sync to the owning PropertyContainer only if requested to do so + // [....] to the owning PropertyContainer only if requested to do so if (!theThis.SyncModeToOwningContainer) return value; diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/CachedResourceDictionaryExtension.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/CachedResourceDictionaryExtension.cs index cffc80573..34aa3df23 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/CachedResourceDictionaryExtension.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/CachedResourceDictionaryExtension.cs @@ -21,7 +21,7 @@ public class CachedResourceDictionaryExtension : MarkupExtension public override object ProvideValue(IServiceProvider serviceProvider) { ResourceDictionary resourceDictionary = null; - // disable caching till the wpf mergedictionaries in theme dictionary + // disable caching till the wpf mergedictionaries in theme dictionary bug is fixed. if (!Cache.TryGetValue(this.Source, out resourceDictionary)) { resourceDictionary = new ResourceDictionary(); diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Hosting/WindowHelperService.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Hosting/WindowHelperService.cs index 4a6104361..a4b11aaf0 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Hosting/WindowHelperService.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Hosting/WindowHelperService.cs @@ -159,7 +159,7 @@ void HookupMessageProcessing() { this.hwndSource = HwndSource.FromHwnd(this.ParentWindowHwnd); } - //if didn't succeed - (either handle is null or we are hosted in Microsoft app) + //if didn't succeed - (either handle is null or we are hosted in [....] app) //try to create hwnd source out of designer's view if (null == this.hwndSource) { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelItemDictionaryImpl.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelItemDictionaryImpl.cs index 4b4ca979b..8be4b9043 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelItemDictionaryImpl.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelItemDictionaryImpl.cs @@ -751,7 +751,7 @@ private void AddCore(ModelItem key, ModelItem value, bool updateInstance) if (updateInstance) { - //no need to sync if the ItemsCollection is not DictionaryItemsCollection wrapped by ModelItemCollectionImpl + //no need to [....] if the ItemsCollection is not DictionaryItemsCollection wrapped by ModelItemCollectionImpl ModelItemCollectionImpl itemsCollectionImpl = this.ItemsCollectionModelItemCollection as ModelItemCollectionImpl; if (ItemsCollectionObject != null && itemsCollectionImpl != null) { @@ -810,7 +810,7 @@ private void ClearCore(bool updateInstance) IList removed = this.modelItems.ToList>(); if (updateInstance) { - //no need to sync if the ItemsCollection is not DictionaryItemsCollection wrapped by ModelItemCollectionImpl + //no need to [....] if the ItemsCollection is not DictionaryItemsCollection wrapped by ModelItemCollectionImpl ModelItemCollectionImpl itemsCollectionImpl = this.ItemsCollectionModelItemCollection as ModelItemCollectionImpl; if (ItemsCollectionObject != null && itemsCollectionImpl != null) { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelPropertyImpl.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelPropertyImpl.cs index a2d7921da..d3237f8b0 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelPropertyImpl.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Model/ModelPropertyImpl.cs @@ -10,7 +10,7 @@ namespace System.Activities.Presentation.Model // This class provides the implementation for a model property. // this intercepts sets /gets to the property and works with modeltreemanager - // to keep the xaml in sync. + // to keep the xaml in [....]. class ModelPropertyImpl : ModelProperty { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ArgumentDesigner.xaml.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ArgumentDesigner.xaml.cs index 693ff4dd5..9298aff97 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ArgumentDesigner.xaml.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ArgumentDesigner.xaml.cs @@ -556,7 +556,7 @@ void OnEditingControlUnloaded(object sender, RoutedEventArgs args) DataGridHelper.OnEditingControlUnloaded(sender, args); } - // This is to workaround a + // This is to workaround a bug that updating ModelItem from outside of ArgumentDesigner will not update ArgumentDesigner. internal void NotifyAnnotationTextChanged() { foreach (object item in this.argumentsDataGrid.Items) diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/DataGridHelper.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/DataGridHelper.cs index 87a7e2377..f2db4694f 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/DataGridHelper.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/DataGridHelper.cs @@ -185,7 +185,7 @@ void OnDataGridSorting(object sender, DataGridSortingEventArgs e) e.Handled = true; } - //Hook KeyDown event on DataGrid row to workaround DataGrid + //Hook KeyDown event on DataGrid row to workaround DataGrid bug with customized NewItemPlaceHolder void OnDataGridRowKeyDown(object sender, KeyEventArgs e) { if (e.Handled) @@ -519,8 +519,8 @@ void OnAddNewRowClick(object sender, RoutedEventArgs args) void OnAddNewRowGotFocus(object sender, RoutedEventArgs e) { - //When tab over the last row, the last column won't get commit by default, which is a - + //When tab over the last row, the last column won't get commit by default, which is a bug of DataGrid with + //customized new place holder template. Call commit explicitly here to workaround this issue this.CommitDataGrid(); this.dataGrid.SelectedItem = null; } diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ExpressionTextBox.xaml.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ExpressionTextBox.xaml.cs index 012a9c67a..e6497e158 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ExpressionTextBox.xaml.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/ExpressionTextBox.xaml.cs @@ -176,7 +176,7 @@ public bool ExplicitCommit set { SetValue(ExplicitCommitProperty, value); } } - //Microsoft + //[....] public IExpressionEditorService ExpressionEditorService { [TargetedPatchingOptOut("Performance critical to inline this type of method across NGen image boundaries")] diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VBIdentifierName.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VBIdentifierName.cs index 75c8e441c..fb36c50cf 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VBIdentifierName.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VBIdentifierName.cs @@ -105,7 +105,7 @@ internal static bool IsValidXamlName(string name) if (isValid) { - //Work around TFS + //Work around TFS bug #825815, in some cases, XamlMember.IsNameValid returns true but it's not valid Xml Name. try { XmlConvert.VerifyName(name); diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VariableDesigner.xaml.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VariableDesigner.xaml.cs index 39209221c..91dc3737a 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VariableDesigner.xaml.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/View/VariableDesigner.xaml.cs @@ -566,7 +566,7 @@ void OnEditingControlUnloaded(object sender, RoutedEventArgs args) DataGridHelper.OnEditingControlUnloaded(sender, args); } - // This is to workaround a + // This is to workaround a bug that updating ModelItem from outside of VariableDesigner will not update VariableDesigner. internal void NotifyAnnotationTextChanged() { foreach (object item in this.variableDataGrid.Items) @@ -1232,7 +1232,7 @@ void SetVariableType(Type type) { variable.Default = morphedExpression; } - //Microsoft + //[....] } } diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/WorkflowItemPresenter.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/WorkflowItemPresenter.cs index 2f6a69db2..e76ba7c02 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/WorkflowItemPresenter.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/WorkflowItemPresenter.cs @@ -446,9 +446,9 @@ void OnItemChanged(DependencyPropertyChangedEventArgs e) { this.Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, (Action)(() => { - // check for Item == null, we found an interesting - - + // check for Item == null, we found an interesting bug, where the user + // could drop something in here, and undo the change before the code below + // could execute if (this.Item != null) { UIElement view = (UIElement)(this.Item.View); @@ -817,9 +817,9 @@ private static ModelItem AutoWrapInSequenceHandler(EditingContext editingContext // NOTE: This wrapper method is exclusively called by TransitionDesigner, because // WIP of Transition.Action would handle the event if the dragged source comes from - // WIP of Transition.Trigger (see - - + // WIP of Transition.Trigger (see Bug 201342). However, Auto-Surround spacer is usually + // handled in DragEnter handler of WIP, and other ActivityDesigner should not need to + // access this method directly. internal void ShowSpacerHelperOnDraggedItems(DragEventArgs arg) { this.spacerHelper.OnWfItemPresenterPreviewDragEnter(this, arg); diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ErrorTolerantObjectWriter.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ErrorTolerantObjectWriter.cs index e3c674e4d..19dd93267 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ErrorTolerantObjectWriter.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ErrorTolerantObjectWriter.cs @@ -195,7 +195,7 @@ public void SetLineInfo(int lineNumber, int linePosition) this.lineNumber = lineNumber; this.linePosition = linePosition; - // But we also need to keep it in sync with the nodestream, for XOW errors + // But we also need to keep it in [....] with the nodestream, for XOW errors // XOW and XamlNodeQueue.Writer both implement IXamlLineInfoConsumer, so we can do a straight cast if (this.rootFragment.HasError) { diff --git a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ObjectToSourceLocationMapping.cs b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ObjectToSourceLocationMapping.cs index 8e14dae3e..7f024e602 100644 --- a/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ObjectToSourceLocationMapping.cs +++ b/System.Activities.Presentation/System.Activities.Presentation/System/Activities/Presentation/Xaml/ObjectToSourceLocationMapping.cs @@ -82,7 +82,7 @@ private void UpdateSourceLocationToModelItemMapping(IEnumerable model if (viewStateSrcLocation != null) { // In some cases duplicated key is possible, use indexer instead of Add() to avoid throw. - // See TFS + // See TFS bug 523908 for detailed information viewStateSourceLocationToModelItemMapping[viewStateSrcLocation] = modelItem; } } diff --git a/System.Activities/System/Activities/Debugger/StateManager.cs b/System.Activities/System/Activities/Debugger/StateManager.cs index 87412dd83..367172448 100644 --- a/System.Activities/System/Activities/Debugger/StateManager.cs +++ b/System.Activities/System/Activities/Debugger/StateManager.cs @@ -681,7 +681,7 @@ MethodBuilder CreateIsland(TypeBuilder typeBuilder, State state, bool withPrimin [SecurityCritical] void InitDynamicModule(string asmName) { - // See http://blogs.msdn.com/Microsoft/archive/2005/02/03/366429.aspx for a simple example + // See http://blogs.msdn.com/[....]/archive/2005/02/03/366429.aspx for a simple example // of debuggable reflection-emit. Fx.Assert(dynamicModule == null, "can only be initialized once"); diff --git a/System.Activities/System/Activities/Runtime/ActivityExecutor.cs b/System.Activities/System/Activities/Runtime/ActivityExecutor.cs index 417960427..b9cf8fe7e 100644 --- a/System.Activities/System/Activities/Runtime/ActivityExecutor.cs +++ b/System.Activities/System/Activities/Runtime/ActivityExecutor.cs @@ -1921,7 +1921,7 @@ internal Scheduler.RequestedAction OnExecuteWorkItem(WorkItem workItem) return Scheduler.Continue; } - // We only check this in the sync path because there are no ways of changing the keys collections from the work items that can + // We only check this in the [....] path because there are no ways of changing the keys collections from the work items that can // go async. There's an assert to this effect in FinishWorkItem. if (this.bookmarkScopeManager != null && this.bookmarkScopeManager.HasKeysToUpdate) { diff --git a/System.Activities/System/Activities/Runtime/ActivityInstanceMap.cs b/System.Activities/System/Activities/Runtime/ActivityInstanceMap.cs index c4983a022..7c4cae273 100644 --- a/System.Activities/System/Activities/Runtime/ActivityInstanceMap.cs +++ b/System.Activities/System/Activities/Runtime/ActivityInstanceMap.cs @@ -599,7 +599,7 @@ public void LoadActivityTree(Activity rootActivity, ActivityInstance rootInstanc } // We need to null this out once we've recreated the dictionary to avoid - // having out of sync data + // having out of [....] data this.rawDeserializedLists = null; // then walk our instance list, fixup parent references, and perform basic validation diff --git a/System.Activities/System/Activities/Statements/MethodExecutor.cs b/System.Activities/System/Activities/Statements/MethodExecutor.cs index 432dd9efc..3819a0e64 100644 --- a/System.Activities/System/Activities/Statements/MethodExecutor.cs +++ b/System.Activities/System/Activities/Statements/MethodExecutor.cs @@ -114,12 +114,12 @@ public IAsyncResult BeginExecuteMethod(AsyncCodeActivityContext context, AsyncCa } } - return BeginMakeMethodCall(context, targetInstance, callback, state); // defer to concrete instance for sync/async variations + return BeginMakeMethodCall(context, targetInstance, callback, state); // defer to concrete instance for [....]/async variations } public void EndExecuteMethod(AsyncCodeActivityContext context, IAsyncResult result) { - EndMakeMethodCall(context, result); // defer to concrete instance for sync/async variations + EndMakeMethodCall(context, result); // defer to concrete instance for [....]/async variations } [SuppressMessage("Reliability", "Reliability108:IsFatalRule", diff --git a/System.Activities/System/Activities/Statements/MethodResolver.cs b/System.Activities/System/Activities/Statements/MethodResolver.cs index 5181f4f2a..2a7b1084b 100644 --- a/System.Activities/System/Activities/Statements/MethodResolver.cs +++ b/System.Activities/System/Activities/Statements/MethodResolver.cs @@ -355,7 +355,7 @@ MethodInfo Resolve(Type targetType, string methodName, BindingFlags bindingFlags { return null; } - else // For a regular sync method, ambiguity is distinct from no match and gets an explicit error message + else // For a regular [....] method, ambiguity is distinct from no match and gets an explicit error message { throw; } diff --git a/System.Activities/System/Activities/WorkflowApplication.cs b/System.Activities/System/Activities/WorkflowApplication.cs index b2b16a305..209006325 100644 --- a/System.Activities/System/Activities/WorkflowApplication.cs +++ b/System.Activities/System/Activities/WorkflowApplication.cs @@ -367,7 +367,7 @@ static void EventFrame(IAsyncResult result) try { - // The "false" is to notify that we are not still sync + // The "false" is to notify that we are not still [....] done = data.NextCallback(result, thisPtr, false); } catch (Exception e) @@ -1100,7 +1100,7 @@ public void EndTerminate(IAsyncResult result) TerminateAsyncResult.End(result); } - // called from the sync and async paths + // called from the [....] and async paths void CancelCore() { // We only actually do any work if we haven't completed and we aren't @@ -3867,7 +3867,7 @@ bool DeleteOwner() if (this.instance.HasPersistenceProvider && this.instance.persistenceManager.OwnerWasCreated && (this.operation == PersistenceOperation.Unload || this.operation == PersistenceOperation.Complete)) { - // This call uses the ambient transaction directly if there was one, to mimic the sync case. + // This call uses the ambient transaction directly if there was one, to mimic the [....] case. // IAsyncResult deleteOwnerResult = null; using (PrepareTransactionalCall(this.dependentTransaction)) diff --git a/System.Activities/System/Activities/WorkflowPersistenceContext.cs b/System.Activities/System/Activities/WorkflowPersistenceContext.cs index 78f8b6127..d056669a4 100644 --- a/System.Activities/System/Activities/WorkflowPersistenceContext.cs +++ b/System.Activities/System/Activities/WorkflowPersistenceContext.cs @@ -74,7 +74,7 @@ public bool TryBeginComplete(AsyncCallback callback, object state, out IAsyncRes { // In the interest of allocating less objects we don't implement // the full async pattern here. Instead, we've flattened it to - // do the sync part and then optionally delegate down to the inner + // do the [....] part and then optionally delegate down to the inner // BeginCommit. if (this.contextOwnedTransaction != null) diff --git a/System.Activities/System/Activities/XamlIntegration/ActivityWithResultConverter.cs b/System.Activities/System/Activities/XamlIntegration/ActivityWithResultConverter.cs index 6ca7f69ec..9334dd3bd 100644 --- a/System.Activities/System/Activities/XamlIntegration/ActivityWithResultConverter.cs +++ b/System.Activities/System/Activities/XamlIntegration/ActivityWithResultConverter.cs @@ -158,7 +158,7 @@ public override Activity ConvertFromString(string text, ITypeDescriptorContex { literalValue = (T)(object)text; } - else if (text == string.Empty) // workaround for System.Runtime.Xaml + else if (text == string.Empty) // workaround for System.Runtime.Xaml bug { literalValue = default(T); } diff --git a/System.Activities/System/Activities/XamlIntegration/DynamicActivityXamlReader.cs b/System.Activities/System/Activities/XamlIntegration/DynamicActivityXamlReader.cs index 7c6c97de6..fbee8ee31 100644 --- a/System.Activities/System/Activities/XamlIntegration/DynamicActivityXamlReader.cs +++ b/System.Activities/System/Activities/XamlIntegration/DynamicActivityXamlReader.cs @@ -566,8 +566,8 @@ bool IsXClassName(XamlType xamlType) } // GetXamlNamespaces is a superset of PreferredXamlNamespace, it's not a must for the above code - // to check for preferredXamlNamespace, but since the old code uses .Contains(), which was a minor - + // to check for preferredXamlNamespace, but since the old code uses .Contains(), which was a minor bug, + // we decide to use StartsWith in new code and keep the old code for back compatible reason. IList namespaces = xamlType.GetXamlNamespaces(); foreach (string ns in namespaces) { diff --git a/System.Activities/System/Activities/XamlIntegration/XamlWriterExtensions.cs b/System.Activities/System/Activities/XamlIntegration/XamlWriterExtensions.cs index 93e08a349..900d81509 100644 --- a/System.Activities/System/Activities/XamlIntegration/XamlWriterExtensions.cs +++ b/System.Activities/System/Activities/XamlIntegration/XamlWriterExtensions.cs @@ -27,7 +27,7 @@ public static void PropagateLineInfo(XamlWriter targetWriter, int lineNumber, in consumer.SetLineInfo(lineNumber, linePosition); } - // This method is a workaround for TFS + // This method is a workaround for TFS bug #788190, since XamlReader.ReadSubtree() should (but doesn't) preserve IXamlLineInfo on the subreader public static void Transform(XamlReader reader, XamlWriter writer, IXamlLineInfo readerLineInfo, bool closeWriter) { IXamlLineInfoConsumer consumer = writer as IXamlLineInfoConsumer; diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/AppContextDefaultValues.Default.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/AppContextDefaultValues.Default.cs new file mode 100644 index 000000000..118df8bde --- /dev/null +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/AppContextDefaultValues.Default.cs @@ -0,0 +1,35 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +namespace System +{ + using System; + using System.ComponentModel.DataAnnotations; + + internal static partial class AppContextDefaultValues + { + static partial void PopulateDefaultValuesPartial(string platformIdentifier, string profile, int version) + { + // When defining a new switch you should add it to the last known version. + // For instance, if you are adding a switch in .NET 4.6 (the release after 4.5.2) you should defined your switch + // like this: + // if (version <= 40502) ... + // This ensures that all previous versions of that platform (up-to 4.5.2) will get the old behavior by default + // NOTE: When adding a default value for a switch please make sure that the default value is added to ALL of the existing platforms! + // NOTE: When adding a new if statement for the version please ensure that ALL previous switches are enabled (ie. don't use else if) + switch (platformIdentifier) + { + case ".NETCore": + case ".NETFramework": + { + if (version <= 40600) + { + LocalAppContextSwitches.SetDefaultsLessOrEqual_46(); + } + + break; + } + } + } + } +} diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/AppSettings.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/AppSettings.cs new file mode 100644 index 000000000..9ad899a6c --- /dev/null +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/AppSettings.cs @@ -0,0 +1,48 @@ +//------------------------------------------------------------------------------ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +//------------------------------------------------------------------------------ + +// AppSettings.cs +// + +using System; +using System.Collections.Specialized; +using System.Configuration; +using System.Diagnostics.CodeAnalysis; + +namespace System.ComponentModel.DataAnnotations { + internal static class AppSettings { + private static volatile bool _settingsInitialized = false; + private static object _appSettingsLock = new object(); + private static void EnsureSettingsLoaded() { + if (!_settingsInitialized) { + lock (_appSettingsLock) { + if (!_settingsInitialized) { + NameValueCollection settings = null; + + try { + settings = ConfigurationManager.AppSettings; + } + catch (ConfigurationErrorsException) { } + finally { + if (settings == null || !Boolean.TryParse(settings["dataAnnotations:dataTypeAttribute:disableRegEx"], out _disableRegEx)) + _disableRegEx = false; + + _settingsInitialized = true; + } + } + } + } + } + + private static bool _disableRegEx; + internal static bool DisableRegEx { + get { + EnsureSettingsLoaded(); + return _disableRegEx; + } + } + } +} diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs index 745a00398..1e809619d 100644 --- a/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs @@ -8,7 +8,7 @@ public sealed class EmailAddressAttribute : DataTypeAttribute { // This attribute provides server-side email validation equivalent to jquery validate, // and therefore shares the same regular expression. See unit tests for examples. - private static Regex _regex = new Regex(@"^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); + private static Regex _regex = CreateRegEx(); public EmailAddressAttribute() : base(DataType.EmailAddress) { @@ -24,7 +24,51 @@ public override bool IsValid(object value) { } string valueAsString = value as string; - return valueAsString != null && _regex.Match(valueAsString).Length > 0; + + // Use RegEx implementation if it has been created, otherwise use a non RegEx version. + if (_regex != null) { + return valueAsString != null && _regex.Match(valueAsString).Length > 0; + } + else { + int atCount = 0; + + foreach (char c in valueAsString) { + if (c == '@') { + atCount++; + } + } + + return (valueAsString != null + && atCount == 1 + && valueAsString[0] != '@' + && valueAsString[valueAsString.Length - 1] != '@'); + } + } + + private static Regex CreateRegEx() { + // We only need to create the RegEx if this switch is enabled. + if (AppSettings.DisableRegEx) { + return null; + } + + const string pattern = @"^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$"; + const RegexOptions options = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture; + + // Set explicit regex match timeout, sufficient enough for email parsing + // Unless the global REGEX_DEFAULT_MATCH_TIMEOUT is already set + TimeSpan matchTimeout = TimeSpan.FromSeconds(2); + + try { + if (AppDomain.CurrentDomain.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") == null) { + return new Regex(pattern, options, matchTimeout); + } + } + catch { + // Fallback on error + } + + // Legacy fallback (without explicit match timeout) + return new Regex(pattern, options); } } } diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/LocalAppContextSwitches.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/LocalAppContextSwitches.cs new file mode 100644 index 000000000..20b80cfde --- /dev/null +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/LocalAppContextSwitches.cs @@ -0,0 +1,28 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +namespace System.ComponentModel.DataAnnotations { + using System; + using System.Runtime.CompilerServices; + + // When adding a quirk, name it such that false is new behavior and true is old behavior. + // You are opting IN to old behavior. The new behavior is default. + // For example, we don't want to use legacy regex timeout for RegularExpressionAttribute in 4.6.1+. + // So we set UseLegacyRegExTimeout to true if running 4.6 or less. + internal static class LocalAppContextSwitches { + private const string UseLegacyRegExTimeoutString = "Switch.System.ComponentModel.DataAnnotations.RegularExpressionAttribute.UseLegacyRegExTimeout"; + private static int useLegacyRegExTimeout; + + public static bool UseLegacyRegExTimeout { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get { + return LocalAppContext.GetCachedSwitchValue(UseLegacyRegExTimeoutString, ref useLegacyRegExTimeout); + } + } + + public static void SetDefaultsLessOrEqual_46() { + // Define the switches that should be true for 4.6 or less, false for 4.6.1+. + LocalAppContext.DefineSwitchDefault(UseLegacyRegExTimeoutString, true); + } + } +} diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataPropertyDescriptorWrapper.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataPropertyDescriptorWrapper.cs index 95e7db7f2..eaeb3ba5e 100644 --- a/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataPropertyDescriptorWrapper.cs +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/MetadataPropertyDescriptorWrapper.cs @@ -26,9 +26,9 @@ public MetadataPropertyDescriptorWrapper(PropertyDescriptor descriptor, Attribut public override bool IsReadOnly { get { - // Dev10 - - + // Dev10 Bug 594083 + // It's not enough to call the wrapped _descriptor because it does not know anything about + // new attributes passed into the constructor of this class. return _isReadOnly || _descriptor.IsReadOnly; } } diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/PhoneAttribute.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/PhoneAttribute.cs index bbd8c9759..597862d7b 100644 --- a/System.ComponentModel.DataAnnotations/DataAnnotations/PhoneAttribute.cs +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/PhoneAttribute.cs @@ -6,7 +6,8 @@ [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)] public sealed class PhoneAttribute : DataTypeAttribute { // see unit tests for examples - private static Regex _regex = new Regex(@"^(\+\s?)?((? 0; + + // Use RegEx implementation if it has been created, otherwise use a non RegEx version. + if (_regex != null) { + return valueAsString != null && _regex.Match(valueAsString).Length > 0; + } + else { + if (valueAsString == null) { + return false; + } + + valueAsString = valueAsString.Replace("+", string.Empty).TrimEnd(); + valueAsString = RemoveExtension(valueAsString); + + bool digitFound = false; + foreach (char c in valueAsString) { + if (Char.IsDigit(c)) { + digitFound = true; + break; + } + } + + if (!digitFound) { + return false; + } + + foreach (char c in valueAsString) + { + if (!(Char.IsDigit(c) + || Char.IsWhiteSpace(c) + || _additionalPhoneNumberCharacters.IndexOf(c) != -1)) { + return false; + } + } + return true; + } + } + + private static Regex CreateRegEx() { + // We only need to create the RegEx if this switch is enabled. + if (AppSettings.DisableRegEx) { + return null; + } + + const string pattern = @"^(\+\s?)?((?= 0) { + string extension = potentialPhoneNumber.Substring(lastIndexOfExtension + 4); + if (MatchesExtension(extension)) { + return potentialPhoneNumber.Substring(0, lastIndexOfExtension); + } + } + + lastIndexOfExtension = potentialPhoneNumber + .LastIndexOf("ext", StringComparison.InvariantCultureIgnoreCase); + if (lastIndexOfExtension >= 0) { + string extension = potentialPhoneNumber.Substring(lastIndexOfExtension + 3); + if (MatchesExtension(extension)) { + return potentialPhoneNumber.Substring(0, lastIndexOfExtension); + } + } + + + lastIndexOfExtension = potentialPhoneNumber + .LastIndexOf("x", StringComparison.InvariantCultureIgnoreCase); + if (lastIndexOfExtension >= 0) { + string extension = potentialPhoneNumber.Substring(lastIndexOfExtension + 1); + if (MatchesExtension(extension)) { + return potentialPhoneNumber.Substring(0, lastIndexOfExtension); + } + } + + return potentialPhoneNumber; + } + + private static bool MatchesExtension(string potentialExtension) { + potentialExtension = potentialExtension.TrimStart(); + if (potentialExtension.Length == 0) { + return false; + } + + foreach (char c in potentialExtension) { + if (!Char.IsDigit(c)) { + return false; + } + } + + return true; } } } diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/RegularExpressionAttribute.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/RegularExpressionAttribute.cs index 482df8552..fc5c061b7 100644 --- a/System.ComponentModel.DataAnnotations/DataAnnotations/RegularExpressionAttribute.cs +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/RegularExpressionAttribute.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations.Resources; +using System.ComponentModel.DataAnnotations.Resources; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Text.RegularExpressions; @@ -15,6 +15,12 @@ public class RegularExpressionAttribute : ValidationAttribute { /// public string Pattern { get; private set; } + /// + /// Gets or sets the timeout to use when matching the regular expression pattern (in milliseconds) + /// (-1 means never timeout). + /// + public int MatchTimeoutInMilliseconds { get; set; } = GetDefaultTimeout(); + private Regex Regex { get; set; } /// @@ -77,13 +83,30 @@ public override string FormatErrorMessage(string name) { /// /// is thrown if the current cannot be parsed /// is thrown if the current attribute is ill-formed. + /// thrown if is negative (except -1), + /// zero or greater than approximately 24 days private void SetupRegex() { if (this.Regex == null) { if (string.IsNullOrEmpty(this.Pattern)) { throw new InvalidOperationException(DataAnnotationsResources.RegularExpressionAttribute_Empty_Pattern); } - this.Regex = new Regex(this.Pattern); + Regex = MatchTimeoutInMilliseconds == -1 + ? new Regex(Pattern) + : Regex = new Regex(Pattern, default(RegexOptions), TimeSpan.FromMilliseconds((double)MatchTimeoutInMilliseconds)); + } + } + + /// + /// Returns the default MatchTimeout based on UseLegacyRegExTimeout switch. + /// + private static int GetDefaultTimeout() { + if (LocalAppContextSwitches.UseLegacyRegExTimeout) { + return -1; } + else { + return 2000; + } + } } } diff --git a/System.ComponentModel.DataAnnotations/DataAnnotations/UrlAttribute.cs b/System.ComponentModel.DataAnnotations/DataAnnotations/UrlAttribute.cs index b77395d10..a6e061042 100644 --- a/System.ComponentModel.DataAnnotations/DataAnnotations/UrlAttribute.cs +++ b/System.ComponentModel.DataAnnotations/DataAnnotations/UrlAttribute.cs @@ -8,7 +8,7 @@ public sealed class UrlAttribute : DataTypeAttribute { // This attribute provides server-side url validation equivalent to jquery validate, // and therefore shares the same regular expression. See unit tests for examples. - private static Regex _regex = new Regex(@"^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture); + private static Regex _regex = CreateRegEx(); public UrlAttribute() : base(DataType.Url) { @@ -24,7 +24,44 @@ public override bool IsValid(object value) { } string valueAsString = value as string; - return valueAsString != null && _regex.Match(valueAsString).Length > 0; + + // Use RegEx implementation if it has been created, otherwise use a non RegEx version. + if (_regex != null) { + return valueAsString != null && _regex.Match(valueAsString).Length > 0; + } + else { + return valueAsString != null && + (valueAsString.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) + || valueAsString.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase) + || valueAsString.StartsWith("ftp://", StringComparison.InvariantCultureIgnoreCase)); + } + } + + private static Regex CreateRegEx() { + // We only need to create the RegEx if this switch is enabled. + if (AppSettings.DisableRegEx) { + return null; + } + + const string pattern = @"^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$"; + + const RegexOptions options = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture; + + // Set explicit regex match timeout, sufficient enough for url parsing + // Unless the global REGEX_DEFAULT_MATCH_TIMEOUT is already set + TimeSpan matchTimeout = TimeSpan.FromSeconds(2); + + try { + if (AppDomain.CurrentDomain.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") == null) { + return new Regex(pattern, options, matchTimeout); + } + } + catch { + // Fallback on error + } + + // Legacy fallback (without explicit match timeout) + return new Regex(pattern, options); } } } diff --git a/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/AppContextDefaultValues.cs b/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/AppContextDefaultValues.cs new file mode 100644 index 000000000..8a130a0f3 --- /dev/null +++ b/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/AppContextDefaultValues.cs @@ -0,0 +1,169 @@ +// ==++== +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// ==--== +using System; +using System.Collections.Generic; + +namespace System +{ + internal static partial class AppContextDefaultValues + { + public static void PopulateDefaultValues() + { + string platformIdentifier, profile; + int version; + + ParseTargetFrameworkName(out platformIdentifier, out profile, out version); + + // Call into each library to populate their default switches + PopulateDefaultValuesPartial(platformIdentifier, profile, version); + } + + /// + /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can + /// more easily support this on other platforms. + /// + private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) + { + string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; + + // If we don't have a TFM then we should default to the 4.0 behavior where all quirks are turned on. + if (!TryParseFrameworkName(targetFrameworkMoniker, out identifier, out version, out profile)) + { +#if FEATURE_CORECLR + if (CompatibilitySwitches.UseLatestBehaviorWhenTFMNotSpecified) + { + // If we want to use the latest behavior it is enough to set the value of the switch to string.Empty. + // When the get to the caller of this method (PopulateDefaultValuesPartial) we are going to use the + // identifier we just set to decide which switches to turn on. By having an empty string as the + // identifier we are simply saying -- don't turn on any switches, and we are going to get the latest + // behavior for all the switches + identifier = string.Empty; + } + else +#endif + { + identifier = ".NETFramework"; + version = 40000; + profile = string.Empty; + } + } + } + + // This code was a constructor copied from the FrameworkName class, which is located in System.dll. + // Parses strings in the following format: ", Version=[v|V], Profile=" + // - The identifier and version is required, profile is optional + // - Only three components are allowed. + // - The version string must be in the System.Version format; an optional "v" or "V" prefix is allowed + private static bool TryParseFrameworkName(String frameworkName, out String identifier, out int version, out String profile) + { + // For parsing a target Framework moniker, from the FrameworkName class + const char c_componentSeparator = ','; + const char c_keyValueSeparator = '='; + const char c_versionValuePrefix = 'v'; + const String c_versionKey = "Version"; + const String c_profileKey = "Profile"; + + identifier = profile = string.Empty; + version = 0; + + if (frameworkName == null || frameworkName.Length == 0) + { + return false; + } + + String[] components = frameworkName.Split(c_componentSeparator); + version = 0; + + // Identifer and Version are required, Profile is optional. + if (components.Length < 2 || components.Length > 3) + { + return false; + } + + // + // 1) Parse the "Identifier", which must come first. Trim any whitespace + // + identifier = components[0].Trim(); + + if (identifier.Length == 0) + { + return false; + } + + bool versionFound = false; + profile = null; + + // + // The required "Version" and optional "Profile" component can be in any order + // + for (int i = 1; i < components.Length; i++) + { + // Get the key/value pair separated by '=' + string[] keyValuePair = components[i].Split(c_keyValueSeparator); + + if (keyValuePair.Length != 2) + { + return false; + } + + // Get the key and value, trimming any whitespace + string key = keyValuePair[0].Trim(); + string value = keyValuePair[1].Trim(); + + // + // 2) Parse the required "Version" key value + // + if (key.Equals(c_versionKey, StringComparison.OrdinalIgnoreCase)) + { + versionFound = true; + + // Allow the version to include a 'v' or 'V' prefix... + if (value.Length > 0 && (value[0] == c_versionValuePrefix || value[0] == 'V')) + { + value = value.Substring(1); + } + Version realVersion = new Version(value); + // The version class will represent some unset values as -1 internally (instead of 0). + version = realVersion.Major * 10000; + if (realVersion.Minor > 0) + version += realVersion.Minor * 100; + if (realVersion.Build > 0) + version += realVersion.Build; + } + // + // 3) Parse the optional "Profile" key value + // + else if (key.Equals(c_profileKey, StringComparison.OrdinalIgnoreCase)) + { + if (!String.IsNullOrEmpty(value)) + { + profile = value; + } + } + else + { + return false; + } + } + + if (!versionFound) + { + return false; + } + + return true; + } + + // This is a partial method. Platforms (such as Desktop) can provide an implementation of it that will read override value + // from whatever mechanism is available on that platform. If no implementation is provided, the compiler is going to remove the calls + // to it from the code + static partial void TryGetSwitchOverridePartial(string switchName, ref bool overrideFound, ref bool overrideValue); + + /// This is a partial method. This method is responsible for populating the default values based on a TFM. + /// It is partial because each library should define this method in their code to contain their defaults. + static partial void PopulateDefaultValuesPartial(string platformIdentifier, string profile, int version); + } +} diff --git a/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/LocalAppContext.cs b/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/LocalAppContext.cs new file mode 100644 index 000000000..f05b599ed --- /dev/null +++ b/System.ComponentModel.DataAnnotations/InternalApis/Clr/inc/LocalAppContext.cs @@ -0,0 +1,128 @@ +// ==++== +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// ==--== + +// NOTE: This file should not be included in mscorlib. This should only be included in FX libraries that need to provide switches +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Threading; + +namespace System +{ + internal static partial class LocalAppContext + { + private delegate bool TryGetSwitchDelegate(string switchName, out bool value); + + private static TryGetSwitchDelegate TryGetSwitchFromCentralAppContext; + private static bool s_canForwardCalls; + + private static Dictionary s_switchMap = new Dictionary(); + private static readonly object s_syncLock = new object(); + + private static bool DisableCaching { get; set; } + + static LocalAppContext() + { + // Try to setup the callback into the central AppContext + s_canForwardCalls = SetupDelegate(); + + // Populate the default values of the local app context + AppContextDefaultValues.PopulateDefaultValues(); + + // Cache the value of the switch that help with testing + DisableCaching = IsSwitchEnabled(@"TestSwitch.LocalAppContext.DisableCaching"); + } + + public static bool IsSwitchEnabled(string switchName) + { + if (s_canForwardCalls) + { + bool isEnabledCentrally; + if (TryGetSwitchFromCentralAppContext(switchName, out isEnabledCentrally)) + { + // we found the switch, so return whatever value it has + return isEnabledCentrally; + } + // if we could not get the value from the central authority, try the local storage. + } + + return IsSwitchEnabledLocal(switchName); + } + + private static bool IsSwitchEnabledLocal(string switchName) + { + // read the value from the set of local defaults + bool isEnabled, isPresent; + lock (s_switchMap) + { + isPresent = s_switchMap.TryGetValue(switchName, out isEnabled); + } + + // If the value is in the set of local switches, reutrn the value + if (isPresent) + { + return isEnabled; + } + + // if we could not find the switch name, we should return 'false' + // This will preserve the concept of switches been 'off' unless explicitly set to 'on' + return false; + } + + private static bool SetupDelegate() + { + Type appContextType = typeof(object).Assembly.GetType("System.AppContext"); + if (appContextType == null) + return false; + + MethodInfo method = appContextType.GetMethod( + "TryGetSwitch", // the method name + BindingFlags.Static | BindingFlags.Public, // binding flags + null, // use the default binder + new Type[] { typeof(string), typeof(bool).MakeByRefType() }, + null); // parameterModifiers - this is ignored by the default binder + if (method == null) + return false; + + // Create delegate if we found the method. + TryGetSwitchFromCentralAppContext = (TryGetSwitchDelegate)Delegate.CreateDelegate(typeof(TryGetSwitchDelegate), method); + + return true; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + internal static bool GetCachedSwitchValue(string switchName, ref int switchValue) + { + if (switchValue < 0) return false; + if (switchValue > 0) return true; + + return GetCachedSwitchValueInternal(switchName, ref switchValue); + } + + private static bool GetCachedSwitchValueInternal(string switchName, ref int switchValue) + { + if (LocalAppContext.DisableCaching) + { + return LocalAppContext.IsSwitchEnabled(switchName); + } + + bool isEnabled = LocalAppContext.IsSwitchEnabled(switchName); + switchValue = isEnabled ? 1 /*true*/ : -1 /*false*/; + return isEnabled; + } + + /// + /// This method is going to be called from the AppContextDefaultValues class when setting up the + /// default values for the switches. !!!! This method is called during the static constructor so it does not + /// take a lock !!!! If you are planning to use this outside of that, please ensure proper locking. + /// + internal static void DefineSwitchDefault(string switchName, bool initialValue) + { + s_switchMap[switchName] = initialValue; + } + } +} diff --git a/System.Configuration/System/Configuration/BaseConfigurationRecord.cs b/System.Configuration/System/Configuration/BaseConfigurationRecord.cs index b816d03ed..c378f1d68 100644 --- a/System.Configuration/System/Configuration/BaseConfigurationRecord.cs +++ b/System.Configuration/System/Configuration/BaseConfigurationRecord.cs @@ -3143,17 +3143,17 @@ private void ScanLocationSection(XmlUtil xmlUtil) { locationSubPath = NormalizeLocationSubPath(locationSubPath, xmlUtil); // VSWhidbey 535595 - // See attached email in the - - - - - - - - - - + // See attached email in the bug. Basically, we decided to throw if we see one of these + // in machine.config or root web.config: + // + // + // + // To detect whetherewe're machine.config or root web.config, the current fix is to use + // Host.IsDefinitionAllowed. Instead of this we should invent a new method in + // IInternalConfigHost to return whether a configPath can be part of an app or not. + // But since it's Whidbey RC "Ask Mode" I chose not to do it due to bigger code churn. + // + // if (locationSubPath == null && !inheritInChildApp && Host.IsDefinitionAllowed(_configPath, ConfigurationAllowDefinition.MachineToWebRoot, ConfigurationAllowExeDefinition.MachineOnly)) { diff --git a/System.Configuration/System/Configuration/Internal/InternalConfigHost.cs b/System.Configuration/System/Configuration/Internal/InternalConfigHost.cs index 128702ad5..962ac400d 100644 --- a/System.Configuration/System/Configuration/Internal/InternalConfigHost.cs +++ b/System.Configuration/System/Configuration/Internal/InternalConfigHost.cs @@ -69,7 +69,7 @@ string IInternalConfigHost.GetStreamName(string configPath) { [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "The callers don't leak this information.")] static internal string StaticGetStreamNameForConfigSource(string streamName, string configSource) { // - // Note (Microsoft 7/08/05): + // Note ([....] 7/08/05): // RemoteWebConfigurationHost also redirects GetStreamNameForConfigSource to this // method, and that means streamName is referring to a path that's on the remote // machine. The problem is that Path.GetFullPath will demand FileIOPermission on diff --git a/System.Configuration/System/Configuration/MgmtConfigurationRecord.cs b/System.Configuration/System/Configuration/MgmtConfigurationRecord.cs index 2d5054736..748bf3a8a 100644 --- a/System.Configuration/System/Configuration/MgmtConfigurationRecord.cs +++ b/System.Configuration/System/Configuration/MgmtConfigurationRecord.cs @@ -1212,8 +1212,8 @@ internal void SaveAs(string filename, ConfigurationSaveMode saveMode, bool force reader.Read(); } - // Dev10 - + // Dev10 bug 687017 - Handle only UTF-16 explicitly, so that handling of other + // encodings are not affected. if (reader.CurrentEncoding is UnicodeEncoding) { encoding = reader.CurrentEncoding; } @@ -1776,7 +1776,7 @@ private void GetConfigDefinitionUpdates( // VSWhidbey 580658: When a section is to be removed, its corresponding file // input should be cleared as well so this section will be indicated as "moved" // next time something is added back to the section. Without marking it as "moved", - // adding new content to a removed section fails as the + // adding new content to a removed section fails as the bug describes. sectionRecord.RemoveFileInput(); } } diff --git a/System.Configuration/System/Configuration/RSAProtectedConfigurationProvider.cs b/System.Configuration/System/Configuration/RSAProtectedConfigurationProvider.cs index 44812b087..33fd93ca8 100644 --- a/System.Configuration/System/Configuration/RSAProtectedConfigurationProvider.cs +++ b/System.Configuration/System/Configuration/RSAProtectedConfigurationProvider.cs @@ -164,7 +164,7 @@ private RSACryptoServiceProvider GetCryptoServiceProvider(bool exportable, bool CspParameters csp = new CspParameters(); csp.KeyContainerName = KeyContainerName; csp.KeyNumber = 1; - csp.ProviderType = 1; // Dev10 + csp.ProviderType = 1; // Dev10 Bug #548719: Explicitly require "RSA Full (Signature and Key Exchange)" if (CspProviderName != null && CspProviderName.Length > 0) csp.ProviderName = CspProviderName; diff --git a/System.Core/Microsoft/Scripting/Ast/TypeBinaryExpression.cs b/System.Core/Microsoft/Scripting/Ast/TypeBinaryExpression.cs index 2a1989b76..ef5ba7de9 100644 --- a/System.Core/Microsoft/Scripting/Ast/TypeBinaryExpression.cs +++ b/System.Core/Microsoft/Scripting/Ast/TypeBinaryExpression.cs @@ -127,10 +127,10 @@ private Expression ByValParameterTypeEqual(ParameterExpression value) { Expression getType = Expression.Call(value, typeof(object).GetMethod("GetType")); // In remoting scenarios, obj.GetType() can return an interface. - // But there's a - - - + // But there's a bug in the JIT32's optimized "obj.GetType() == + // typeof(ISomething)" codegen, causing it to always return false. + // We workaround the bug by generating different, less optimal IL + // if TypeOperand is an interface. if (_typeOperand.IsInterface) { var temp = Expression.Parameter(typeof(Type)); getType = Expression.Block(new[] { temp }, Expression.Assign(temp, getType), temp); diff --git a/System.Core/Microsoft/Scripting/Compiler/AssemblyGen.cs b/System.Core/Microsoft/Scripting/Compiler/AssemblyGen.cs index 17e79e1bc..b908bcfad 100644 --- a/System.Core/Microsoft/Scripting/Compiler/AssemblyGen.cs +++ b/System.Core/Microsoft/Scripting/Compiler/AssemblyGen.cs @@ -110,9 +110,9 @@ private TypeBuilder DefineType(string name, Type parent, TypeAttributes attr) { sb.Append("$"); sb.Append(index); - // There is a - - + // There is a bug in Reflection.Emit that leads to + // Unhandled Exception: System.Runtime.InteropServices.COMException (0x80131130): Record not found on lookup. + // if there is any of the characters []*&+,\ in the type name and a method defined on the type is called. sb.Replace('+', '_').Replace('[', '_').Replace(']', '_').Replace('*', '_').Replace('&', '_').Replace(',', '_').Replace('\\', '_'); name = sb.ToString(); diff --git a/System.Core/Microsoft/Scripting/Compiler/LambdaCompiler.Unary.cs b/System.Core/Microsoft/Scripting/Compiler/LambdaCompiler.Unary.cs index e7e9dc172..cb8ef7da1 100644 --- a/System.Core/Microsoft/Scripting/Compiler/LambdaCompiler.Unary.cs +++ b/System.Core/Microsoft/Scripting/Compiler/LambdaCompiler.Unary.cs @@ -291,12 +291,12 @@ private void EmitConvert(UnaryExpression node, CompilationFlags flags) { // if it is null, and then call the conversion. // // We cannot fix this in C# but there is no reason why we need to - // propagate this - - - - - + // propagate this bug into the expression tree API. Unfortunately + // this means that when the C# compiler generates the lambda + // (int? i)=>(MyClass)i, we will get different results for converting + // that lambda to a delegate directly and converting that lambda to + // an expression tree and then compiling it. We can live with this + // discrepancy however. if (node.IsLifted && (!node.Type.IsValueType || !node.Operand.Type.IsValueType)) { ParameterInfo[] pis = node.Method.GetParametersCached(); diff --git a/System.Core/Microsoft/Win32/SafeHandles/BCryptSafeHandles.cs b/System.Core/Microsoft/Win32/SafeHandles/BCryptSafeHandles.cs index 638e9ca81..adcfe75a0 100644 --- a/System.Core/Microsoft/Win32/SafeHandles/BCryptSafeHandles.cs +++ b/System.Core/Microsoft/Win32/SafeHandles/BCryptSafeHandles.cs @@ -73,4 +73,22 @@ protected override bool ReleaseHandle() { return success; } } + + /// + /// SafeHandle for a native BCRYPT_KEY_HANDLE. + /// + [SecuritySafeCritical] + internal sealed class SafeBCryptKeyHandle : SafeHandleZeroOrMinusOneIsInvalid { + internal SafeBCryptKeyHandle(): base(true){ } + + [DllImport("bcrypt.dll")] + [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] + [SuppressUnmanagedCodeSecurity] + internal static extern BCryptNative.ErrorCode BCryptDestroyKey(IntPtr hKey); + + [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] + protected override bool ReleaseHandle() { + return BCryptDestroyKey(handle) == BCryptNative.ErrorCode.Success; + } + } } diff --git a/System.Core/Microsoft/Win32/SafeHandles/NCryptSafeHandles.cs b/System.Core/Microsoft/Win32/SafeHandles/NCryptSafeHandles.cs index ab3a042e0..9e09c9feb 100644 --- a/System.Core/Microsoft/Win32/SafeHandles/NCryptSafeHandles.cs +++ b/System.Core/Microsoft/Win32/SafeHandles/NCryptSafeHandles.cs @@ -263,7 +263,7 @@ private bool IsValidOpenState { T duplicate = new T(); // We need to do this operation in a CER in order to ensure that everybody's state stays consistent - // with the current view of the world. If the state of the various handles gets out of sync, then + // with the current view of the world. If the state of the various handles gets out of [....], then // we'll end up leaking since reference counts will not be set up properly. RuntimeHelpers.PrepareConstrainedRegions(); try { } diff --git a/System.Core/System/Diagnostics/Eventing/EventDescriptor.cs b/System.Core/System/Diagnostics/Eventing/EventDescriptor.cs index cfe9bd24a..767fdd4cd 100644 --- a/System.Core/System/Diagnostics/Eventing/EventDescriptor.cs +++ b/System.Core/System/Diagnostics/Eventing/EventDescriptor.cs @@ -28,7 +28,7 @@ public struct EventDescriptor [FieldOffset(8)] private long m_keywords; - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public EventDescriptor( int id, byte version, @@ -98,7 +98,7 @@ public byte Level } } - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public byte Opcode { get diff --git a/System.Core/System/Diagnostics/Eventing/EventProvider.cs b/System.Core/System/Diagnostics/Eventing/EventProvider.cs index 4ec838987..fe72df707 100644 --- a/System.Core/System/Diagnostics/Eventing/EventProvider.cs +++ b/System.Core/System/Diagnostics/Eventing/EventProvider.cs @@ -753,7 +753,7 @@ public bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid related { // If relatedActivityId is Guid.Empty, this is not a real transfer: just call EventWrite(). // For pre-Win7 platforms we cannot set the activityId from CorrelationManager - // because we cannot set relatedActivityId to null (Win7 + // because we cannot set relatedActivityId to null (Win7 bug 116784) status = UnsafeNativeMethods.EventWrite (m_regHandle, ref eventDescriptor, (uint)argCount, diff --git a/System.Core/System/Diagnostics/Eventing/Reader/EventLogSession.cs b/System.Core/System/Diagnostics/Eventing/Reader/EventLogSession.cs index 408bce798..6515e3d87 100644 --- a/System.Core/System/Diagnostics/Eventing/Reader/EventLogSession.cs +++ b/System.Core/System/Diagnostics/Eventing/Reader/EventLogSession.cs @@ -52,7 +52,7 @@ public class EventLogSession : IDisposable { internal EventLogHandle renderContextHandleSystem = EventLogHandle.Zero; internal EventLogHandle renderContextHandleUser = EventLogHandle.Zero; - //the dummy sync object for the two contextes. + //the dummy [....] object for the two contextes. private object syncObject = null; private string server; diff --git a/System.Core/System/Diagnostics/Eventing/Reader/EventMetadata.cs b/System.Core/System/Diagnostics/Eventing/Reader/EventMetadata.cs index ce3f4c8d0..4aa1910d9 100644 --- a/System.Core/System/Diagnostics/Eventing/Reader/EventMetadata.cs +++ b/System.Core/System/Diagnostics/Eventing/Reader/EventMetadata.cs @@ -86,7 +86,7 @@ public EventLevel Level { } } - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public EventOpcode Opcode { get { return new EventOpcode(this.opcode, this.pmReference); diff --git a/System.Core/System/Diagnostics/Eventing/Reader/EventOpcode.cs b/System.Core/System/Diagnostics/Eventing/Reader/EventOpcode.cs index f930037c3..c597a47c2 100644 --- a/System.Core/System/Diagnostics/Eventing/Reader/EventOpcode.cs +++ b/System.Core/System/Diagnostics/Eventing/Reader/EventOpcode.cs @@ -20,7 +20,7 @@ namespace System.Diagnostics.Eventing.Reader { [System.Security.Permissions.HostProtection(MayLeakOnAbort = true)] - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public sealed class EventOpcode { private int value; private string name; diff --git a/System.Core/System/Diagnostics/Eventing/Reader/EventRecord.cs b/System.Core/System/Diagnostics/Eventing/Reader/EventRecord.cs index c81eb96bf..e50e1f0e4 100644 --- a/System.Core/System/Diagnostics/Eventing/Reader/EventRecord.cs +++ b/System.Core/System/Diagnostics/Eventing/Reader/EventRecord.cs @@ -30,7 +30,7 @@ public abstract class EventRecord : IDisposable { public abstract byte? Level { get; } public abstract int? Task { get; } - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public abstract short? Opcode { get; } public abstract long? Keywords { get; } @@ -55,7 +55,7 @@ public abstract class EventRecord : IDisposable { public abstract string LevelDisplayName { get; } - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcode", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public abstract string OpcodeDisplayName { get; } public abstract string TaskDisplayName { get; } public abstract IEnumerable KeywordsDisplayNames { get; } diff --git a/System.Core/System/Diagnostics/Eventing/Reader/ProviderMetadata.cs b/System.Core/System/Diagnostics/Eventing/Reader/ProviderMetadata.cs index b1cf7fc07..fc82c7058 100644 --- a/System.Core/System/Diagnostics/Eventing/Reader/ProviderMetadata.cs +++ b/System.Core/System/Diagnostics/Eventing/Reader/ProviderMetadata.cs @@ -440,7 +440,7 @@ public IList Levels { } } - [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcodes", Justification = "Microsoft: Shipped public in 3.5, breaking change to fix now.")] + [SuppressMessage("Microsoft.Naming", "CA1702:CompoundWordsShouldBeCasedCorrectly", MessageId = "Opcodes", Justification = "[....]: Shipped public in 3.5, breaking change to fix now.")] public IList Opcodes { get { List eo; diff --git a/System.Core/System/IO/BufferedStream2.cs b/System.Core/System/IO/BufferedStream2.cs index ba1e49453..d95846011 100644 --- a/System.Core/System/IO/BufferedStream2.cs +++ b/System.Core/System/IO/BufferedStream2.cs @@ -265,7 +265,7 @@ public override IAsyncResult BeginRead(byte[] array, int offset, int numBytes, A // (either synchronously or asynchronously) before the first one // returns. This would involve some sort of complex buffer locking // that we probably don't want to get into, at least not in V1. - // If we did a sync read to fill the buffer, we could avoid the + // If we did a [....] read to fill the buffer, we could avoid the // problem, and any async read less than 64K gets turned into a // synchronous read by NT anyways... -- @@ -508,7 +508,7 @@ public override void Flush() // Reading is done by blocks from the file, but someone could read // 1 byte from the buffer then write. At that point, the OS's file - // pointer is out of sync with the stream's position. All write + // pointer is out of [....] with the stream's position. All write // functions should call this function to preserve the position in the file. [MethodImplAttribute(MethodImplOptions.Synchronized)] protected void FlushRead() { diff --git a/System.Core/System/IO/LogStream.cs b/System.Core/System/IO/LogStream.cs index 37b0623d3..69179635a 100644 --- a/System.Core/System/IO/LogStream.cs +++ b/System.Core/System/IO/LogStream.cs @@ -278,7 +278,7 @@ unsafe private int WriteFileNative(byte[] bytes, int offset, int count, NativeOv } if (r == 0) { - // We should never silently swallow an error here without some + // We should never silently ---- an error here without some // extra work. We must make sure that BeginWriteCore won't return an // IAsyncResult that will cause EndWrite to block, since the OS won't // call AsyncFSCallback for us. diff --git a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedView.cs b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedView.cs index a88b941d0..98e30f009 100644 --- a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedView.cs +++ b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedView.cs @@ -167,7 +167,7 @@ internal unsafe static MemoryMappedView CreateView(SafeMemoryMappedFileHandle me } - // Flushes the changes such that they are in sync with the FileStream bits (ones obtained + // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained // with the win32 ReadFile and WriteFile functions). Need to call FileStream's Flush to // flush to the disk. // NOTE: This will flush all bytes before and after the view up until an offset that is a multiple diff --git a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewAccessor.cs b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewAccessor.cs index c79b81dfe..3df123c55 100644 --- a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewAccessor.cs +++ b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewAccessor.cs @@ -76,7 +76,7 @@ protected override void Dispose(bool disposing) { } } - // Flushes the changes such that they are in sync with the FileStream bits (ones obtained + // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained // with the win32 ReadFile and WriteFile functions). Need to call FileStream's Flush to // flush to the disk. // NOTE: This will flush all bytes before and after the view up until an offset that is a diff --git a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewStream.cs b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewStream.cs index c531a45d5..283048b06 100644 --- a/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewStream.cs +++ b/System.Core/System/IO/MemoryMappedFiles/MemoryMappedViewStream.cs @@ -78,7 +78,7 @@ protected override void Dispose(bool disposing) { } } - // Flushes the changes such that they are in sync with the FileStream bits (ones obtained + // Flushes the changes such that they are in [....] with the FileStream bits (ones obtained // with the win32 ReadFile and WriteFile functions). Need to call FileStream's Flush to // flush to the disk. // NOTE: This will flush all bytes before and after the view up until an offset that is a diff --git a/System.Core/System/IO/Pipes/PipeStream.cs b/System.Core/System/IO/Pipes/PipeStream.cs index 02018024c..d3b913c00 100644 --- a/System.Core/System/IO/Pipes/PipeStream.cs +++ b/System.Core/System/IO/Pipes/PipeStream.cs @@ -256,7 +256,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy CheckReadOperations(); if (!m_isAsync) { - // special case when this is called for sync broken pipes because otherwise Stream's + // special case when this is called for [....] broken pipes because otherwise Stream's // Begin/EndRead hang. Reads return 0 bytes in this case so we can call the user's // callback immediately if (m_state == PipeState.Broken) { @@ -645,7 +645,7 @@ private unsafe int ReadFileNative(SafePipeHandle handle, byte[] buffer, int offs } if (r == 0) { - // We should never silently swallow an error here without some + // We should never silently ---- an error here without some // extra work. We must make sure that BeginReadCore won't return an // IAsyncResult that will cause EndRead to block, since the OS won't // call AsyncPSCallback for us. @@ -695,7 +695,7 @@ private unsafe int WriteFileNative(SafePipeHandle handle, byte[] buffer, int off } if (r == 0) { - // We should never silently swallow an error here without some + // We should never silently ---- an error here without some // extra work. We must make sure that BeginWriteCore won't return an // IAsyncResult that will cause EndWrite to block, since the OS won't // call AsyncPSCallback for us. diff --git a/System.Core/System/Linq/Enumerable.cs b/System.Core/System/Linq/Enumerable.cs index 66e864ef0..f062ca5e6 100644 --- a/System.Core/System/Linq/Enumerable.cs +++ b/System.Core/System/Linq/Enumerable.cs @@ -2128,7 +2128,7 @@ IEnumerator IEnumerable.GetEnumerator() { internal int InternalGetHashCode(TKey key) { - //Microsoft DevDivBugs 171937. work around comparer implementations that throw when passed null + //[....] DevDivBugs 171937. work around comparer implementations that throw when passed null return (key == null) ? 0 : comparer.GetHashCode(key) & 0x7FFFFFFF; } @@ -2346,7 +2346,7 @@ void Resize() { internal int InternalGetHashCode(TElement value) { - //Microsoft DevDivBugs 171937. work around comparer implementations that throw when passed null + //[....] DevDivBugs 171937. work around comparer implementations that throw when passed null return (value == null) ? 0 : comparer.GetHashCode(value) & 0x7FFFFFFF; } diff --git a/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs b/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs index 0024bf3c9..d249e8749 100644 --- a/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs +++ b/System.Core/System/Linq/Parallel/Channels/AsynchronousChannel.cs @@ -7,7 +7,7 @@ // // AsynchronousOneToOneChannel.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs b/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs index 79cdc7a9b..ac27781a0 100644 --- a/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs +++ b/System.Core/System/Linq/Parallel/Channels/SynchronousChannel.cs @@ -7,7 +7,7 @@ // // SynchronousChannel.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs b/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs index 3d560db8c..af69de8aa 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/AggregationMinMaxHelpers.cs @@ -7,7 +7,7 @@ // // AggregationMinMaxHelpers.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs b/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs index 0d3335d7d..56c3c621c 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/EmptyEnumerable.cs @@ -7,7 +7,7 @@ // // EmptyEnumerable.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs b/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs index 6d7ec46c7..95dbb1e0e 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/EnumerableWrapperWeakToStrong.cs @@ -7,7 +7,7 @@ // // EnumerableWrapperWeakToStrong.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs b/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs index 70167618e..07e4c2a1f 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/OrderedParallelQuery.cs @@ -7,7 +7,7 @@ // // OrderedParallelQuery.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs b/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs index 31d072f3b..8c5fb1912 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/ParallelEnumerableWrapper.cs @@ -7,7 +7,7 @@ // // ParallelEnumerableWrapper.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs b/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs index b9a9477a7..9503c3043 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/ParallelQuery.cs @@ -7,7 +7,7 @@ // // ParallelQuery.cs // -// Microsoft +// [....] // // ParallelQuery is an abstract class that represents a PLINQ query. // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs b/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs index 8c5808446..1bb58a81f 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/RangeEnumerable.cs @@ -7,7 +7,7 @@ // // RangeEnumerable.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs b/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs index 6951c939b..1998eabb0 100644 --- a/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs +++ b/System.Core/System/Linq/Parallel/Enumerables/RepeatEnumerable.cs @@ -7,7 +7,7 @@ // // RepeatEnumerable.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs b/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs index feebc57bf..97559c5fd 100644 --- a/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs +++ b/System.Core/System/Linq/Parallel/Merging/ArrayMergeHelper.cs @@ -7,7 +7,7 @@ // // ArrayMergeHelper.cs // -// Microsoft +// [....] // // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs b/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs index b76d1e427..599f13ae4 100644 --- a/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs +++ b/System.Core/System/Linq/Parallel/Merging/AsynchronousChannelMergeEnumerator.cs @@ -7,7 +7,7 @@ // // AsynchronousChannelMergeEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs b/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs index b288fffec..d1115094a 100644 --- a/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs +++ b/System.Core/System/Linq/Parallel/Merging/DefaultMergeHelper.cs @@ -7,7 +7,7 @@ // // DefaultMergeHelper.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -32,7 +32,7 @@ internal class DefaultMergeHelper : IMergeHelper m_partitions; // Source partitions. private AsynchronousChannel[] m_asyncChannels; // Destination channels (async). - private SynchronousChannel[] m_syncChannels; // Destination channels (sync). + private SynchronousChannel[] m_syncChannels; // Destination channels ([....]). private IEnumerator m_channelEnumerator; // Output enumerator. private TaskScheduler m_taskScheduler; // The task manager to execute the query. private bool m_ignoreOutput; // Whether we're enumerating "for effect". diff --git a/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs b/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs index da0298ce1..8fac0d62c 100644 --- a/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs +++ b/System.Core/System/Linq/Parallel/Merging/MergeEnumerator.cs @@ -7,7 +7,7 @@ // // MergeEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs b/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs index 2e0d8d901..f3136f12e 100644 --- a/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs +++ b/System.Core/System/Linq/Parallel/Merging/MergeExecutor.cs @@ -7,7 +7,7 @@ // // MergeExecutor.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs b/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs index b7015a48d..d45653452 100644 --- a/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs +++ b/System.Core/System/Linq/Parallel/Merging/OrderPreservingMergeHelper.cs @@ -7,7 +7,7 @@ // // OrderPreservingMergeHelper.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs b/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs index 5da2671db..f9fc2bc49 100644 --- a/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs +++ b/System.Core/System/Linq/Parallel/Merging/OrderPreservingPipeliningMergeHelper.cs @@ -7,7 +7,7 @@ // // OrderPreservingPipeliningMergeHelper.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs b/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs index 0bdc6ea7c..ba302d416 100644 --- a/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs +++ b/System.Core/System/Linq/Parallel/Merging/SynchronousChannelMergeEnumerator.cs @@ -7,7 +7,7 @@ // // SynchronousChannelMergeEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs b/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs index 001eb1b31..5f8cd482e 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionEnumerator.cs @@ -7,7 +7,7 @@ // // HashRepartitionEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs b/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs index 949e4f419..96aaf2d4c 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/HashRepartitionStream.cs @@ -7,7 +7,7 @@ // // HashPartitionedStream.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs b/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs index 35865feb9..39ca3fb03 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionEnumerator.cs @@ -7,7 +7,7 @@ // // OrderedHashRepartitionEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs b/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs index dfd79fd68..f12862e8f 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/OrderedHashRepartitionStream.cs @@ -7,7 +7,7 @@ // // OrderedHashRepartitionStream.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs b/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs index 2f661a9e3..e9f639c79 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/PartitionedDataSource.cs @@ -7,7 +7,7 @@ // // PartitionedDataSource.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs b/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs index fc7477fe3..dd6c687fe 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/PartitionedStream.cs @@ -7,7 +7,7 @@ // // PartitionedStream.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs b/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs index 7edc4d07d..b8d1e6be9 100644 --- a/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs +++ b/System.Core/System/Linq/Parallel/Partitioning/UnorderedHashRepartitionStream.cs @@ -7,7 +7,7 @@ // // UnorderedHashRepartitionStream.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs index add046683..6df8e3e6c 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/AssociativeAggregationOperator.cs @@ -7,7 +7,7 @@ // // AssociativeAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs index c8a8d2206..d84be6b56 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/ExceptQueryOperator.cs @@ -7,7 +7,7 @@ // // ExceptQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs index 60b6befd6..a56fe2f67 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/GroupJoinQueryOperator.cs @@ -7,7 +7,7 @@ // // GroupJoinQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs index e09d4d92b..88196b526 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/HashJoinQueryOperatorEnumerator.cs @@ -7,7 +7,7 @@ // // HashJoinQueryOperatorEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs index 3ce35c451..869795154 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/IntersectQueryOperator.cs @@ -7,7 +7,7 @@ // // IntersectQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs index 9dbd672ec..a80990550 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/JoinQueryOperator.cs @@ -7,7 +7,7 @@ // // JoinQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs index 8251ef549..c2d07020d 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs @@ -7,7 +7,7 @@ // // UnionQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs index 3465f80d4..3b2d74cfd 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Binary/ZipQueryOperator.cs @@ -7,7 +7,7 @@ // // ZipQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs index 3beed03e1..f159f1c25 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/BinaryQueryOperator.cs @@ -7,7 +7,7 @@ // // BinaryQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs index 95b660b22..84ae158c3 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/CountAggregationOperator.cs @@ -7,7 +7,7 @@ // // CountAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs index d321018d7..f7e86aaa2 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // DecimalAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs index eaa22795f..55e2f78e8 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // DecimalMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs index 30560fecc..17d0658b9 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DecimalSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // DecimalSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs index dba1e1021..5d6aa8e41 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // DoubleAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs index a7cd5df65..85c2e84cc 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // DoubleMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs index b2477cfd7..c464be095 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/DoubleSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // DoubleSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs index d2d294f1f..8d310b488 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // FloatAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs index 10be7b55e..1cc5d0d25 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // FloatMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs index ecf0656a9..03949d7aa 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/FloatSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // FloatSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs index 865ccaac7..31ba533d8 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperator.cs @@ -7,7 +7,7 @@ // // InlinedAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs index b53d200df..416844cfb 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/InlinedAggregationOperatorEnumerator.cs @@ -7,7 +7,7 @@ // // InlinedAggregationOperatorEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs index 88a779aeb..9733071e8 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // IntAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs index 469a90346..5bd686ab5 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // IntMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs index 28b5048b0..f57f4ec52 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/IntSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // IntSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs index 3de0feed3..61478be33 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // LongAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs index 1c1ecc3a3..4332cee83 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongCountAggregationOperator.cs @@ -7,7 +7,7 @@ // // CountAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs index bb45b5b83..0c7bdfbd8 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // LongMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs index bc29d47ba..df856cc34 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/LongSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // LongSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs index cdaf0301e..246aa40dc 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDecimalAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs index abbacb4e2..8d78b129d 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDecimalMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs index 5c32e0cc8..2602c9eb2 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDecimalSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDecimalSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs index 44eb13ad6..69b52aaa3 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDoubleAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs index a2a7fcb3e..7b4427764 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDoubleMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs index f1ced299f..9f92f75d1 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableDoubleSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableDoubleSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs index b33baf58a..2b7c0d452 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableFloatAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs index 8180ef534..b1b8064e0 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableFloatMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs index d4aa289c0..d2ea8a423 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableFloatSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableFloatSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs index ea9bcd10d..4604a595f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableIntAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs index 6ff77bd7e..5c57d26b0 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableIntMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs index 14389d8fc..c00fdb01d 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableIntSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableIntSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs index bacb98750..ddf75c89f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongAverageAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableLongAverageAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs index 824bb98a4..7d4e369d9 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongMinMaxAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableLongMinMaxAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs index 313e7c182..97e53a64e 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Inlined/NullableLongSumAggregationOperator.cs @@ -7,7 +7,7 @@ // // NullableLongSumAggregationOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs b/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs index e55d313c0..55069c3b3 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/ListQueryResults.cs @@ -7,7 +7,7 @@ // // ListQueryResults.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs index 27f7bf886..33baf3f80 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs @@ -7,7 +7,7 @@ // // OrderingQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs b/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs index 8ddc79645..1bef24bed 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Options/QueryExecutionOption.cs @@ -7,7 +7,7 @@ // // QueryExecutionOption.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs b/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs index 77682f695..282c6cd90 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/PartitionedStreamMerger.cs @@ -7,7 +7,7 @@ // // PartitionedStreamMerger.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs index 62ed43dba..c239cb7e4 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/PartitionerQueryOperator.cs @@ -7,7 +7,7 @@ // // PartitionerQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs b/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs index c268cf512..570b9e4ab 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/QueryOpeningEnumerator.cs @@ -7,7 +7,7 @@ // // QueryOpeningEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -110,7 +110,7 @@ public bool MoveNext() { // To keep the MoveNext method body small, the code that executes first time only is in a separate method. // It appears that if the method becomes too large, we observe a performance regression. This may have - // to do with method inlining. See + // to do with method inlining. See bug 706485. OpenQuery(); } diff --git a/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs index 60d656c1e..c83015bb3 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/QueryOperator.cs @@ -7,7 +7,7 @@ // // QueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs b/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs index 6f78b8177..db776f878 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/QueryOperatorEnumerator.cs @@ -7,7 +7,7 @@ // // QueryOperatorEnumerator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs b/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs index d062a698e..cee66591f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/QueryResults.cs @@ -7,7 +7,7 @@ // // QueryResults.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs b/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs index 8782d8fd0..08f410f98 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/QuerySettings.cs @@ -7,7 +7,7 @@ // // QuerySettings.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -149,8 +149,8 @@ internal QuerySettings WithPerExecutionSettings(CancellationTokenSource topLevel //Initialize a new QuerySettings structure and copy in the current settings. //Note: this has the very important effect of newing a fresh CancellationSettings, // and _not_ copying in the current internalCancellationSource or topLevelDisposedFlag which should not be - // propogated to internal query executions. (This affects SelectMany execution and specifically fixes - + // propogated to internal query executions. (This affects SelectMany execution and specifically fixes bug:535510) + // The fresh toplevel parameters are used instead. QuerySettings settings = new QuerySettings(TaskScheduler, DegreeOfParallelism, CancellationState.ExternalCancellationToken, ExecutionMode, MergeOptions); Contract.Assert(topLevelCancellationTokenSource != null, "There should always be a top-level cancellation signal specified."); diff --git a/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs index 1310302c2..e70b13e18 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/ScanQueryOperator.cs @@ -7,7 +7,7 @@ // // ScanQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs index 2dc5b284f..fd4b201e7 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/AnyAllSearchOperator.cs @@ -7,7 +7,7 @@ // // AnyAllSearchOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs index 4f07a9f2e..d55436aff 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs @@ -7,7 +7,7 @@ // // ConcatQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs index b41748052..78de10051 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ContainsSearchOperator.cs @@ -7,7 +7,7 @@ // // ContainsSearchOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs index 6611cc280..9a0346995 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/DefaultIfEmptyQueryOperator.cs @@ -7,7 +7,7 @@ // // DefaultIfEmptyQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs index fc5ecd5f7..4de47cea4 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/DistinctQueryOperator.cs @@ -7,7 +7,7 @@ // // DistinctQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs index 70660e9fc..0560b753f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ElementAtQueryOperator.cs @@ -7,7 +7,7 @@ // // ElementAtQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs index 8181237ca..38c143c5f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/FirstQueryOperator.cs @@ -7,7 +7,7 @@ // // FirstQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs index 825d755f4..867610402 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ForAllOperator.cs @@ -7,7 +7,7 @@ // // ForAllQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs index ab4d27254..ed3b2f440 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/GroupByQueryOperator.cs @@ -7,7 +7,7 @@ // // GroupByQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs index 1a304e459..f1d0e5ef3 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedSelectQueryOperator.cs @@ -7,7 +7,7 @@ // // IndexedSelectQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs index fddb99260..a4d65f3cf 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/IndexedWhereQueryOperator.cs @@ -7,7 +7,7 @@ // // IndexedWhereQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs index f4a74d0c7..8b354de11 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/LastQueryOperator.cs @@ -7,7 +7,7 @@ // // LastQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs index 9f4a4eece..d66add119 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/ReverseQueryOperator.cs @@ -7,7 +7,7 @@ // // ReverseQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs index 8a4c0f3e7..741bb24cd 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectManyQueryOperator.cs @@ -7,7 +7,7 @@ // // SelectManyQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs index 7eaa46765..2301c1d06 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SelectQueryOperator.cs @@ -7,7 +7,7 @@ // // SelectQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs index c2cb9d451..d5539ceaf 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SingleQueryOperator.cs @@ -7,7 +7,7 @@ // // SingleQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs index af64f227a..b73b8bd08 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs @@ -7,7 +7,7 @@ // // SortQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs index 67a70ce8f..c0c708a7c 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipQueryOperator.cs @@ -7,7 +7,7 @@ // // TakeOrSkipQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs index 64f089adc..a04bf2bfb 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/TakeOrSkipWhileQueryOperator.cs @@ -7,7 +7,7 @@ // // TakeOrSkipWhileQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs index d447915d8..3ec343a9f 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/Unary/WhereQueryOperator.cs @@ -7,7 +7,7 @@ // // WhereQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs b/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs index 0baa5ad62..b66aa49f7 100644 --- a/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs +++ b/System.Core/System/Linq/Parallel/QueryOperators/UnaryQueryOperator.cs @@ -7,7 +7,7 @@ // // UnaryQueryOperator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs b/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs index e84bced81..c084abb4b 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/CancellationState.cs @@ -7,7 +7,7 @@ // // CancellationState.cs // -// Microsoft +// [....] // // A bag of cancellation-related items that are passed around as a group. // diff --git a/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs b/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs index a402e317e..f1e99baed 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs @@ -7,7 +7,7 @@ // // OrderPreservingPipeliningSpoolingTask.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs b/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs index 20c751571..478533db2 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingSpoolingTask.cs @@ -7,7 +7,7 @@ // // OrderPreservingSpoolingTask.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs b/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs index 3f0e70731..92ead1bfb 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/QueryLifecycle.cs @@ -7,7 +7,7 @@ // // QueryLifecycle.cs // -// Microsoft +// [....] // // A convenient place to put things associated with entire queries and their lifecycle events. // diff --git a/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs b/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs index 7ca188a35..97dc14d53 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/QueryTask.cs @@ -7,7 +7,7 @@ // // QueryTask.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -88,7 +88,7 @@ internal Task RunAsynchronously(TaskScheduler taskScheduler) } //----------------------------------------------------------------------------------- - // Common function called regardless of sync or async execution. Just wraps some + // Common function called regardless of [....] or async execution. Just wraps some // amount of tracing around the call to the real work API. // diff --git a/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs b/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs index 9dbc359a7..f3666afb0 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/QueryTaskGroupState.cs @@ -7,7 +7,7 @@ // // QueryTaskGroupState.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -98,9 +98,9 @@ internal void QueryEnd(bool userInitiatedDispose) // There are four cases: // Case #1: Wait produced an exception that is not OCE(ct), or an AggregateException which is not full of OCE(ct) ==> We rethrow. // Case #2: External cancellation has been requested ==> we'll manually throw OCE(externalToken). - // Case #3a: We are servicing a call to Dispose() (and possibly also external cancellation has been requested).. simply return. See - - + // Case #3a: We are servicing a call to Dispose() (and possibly also external cancellation has been requested).. simply return. See bug 695173 + // Case #3b: The enumerator has already been disposed (and possibly also external cancellation was requested). Throw an ODE. + // Case #4: No exceptions or explicit call to Dispose() by this caller ==> we just return. // See also "InlinedAggregationOperator" which duplicates some of this logic for the aggregators. // See also "QueryOpeningEnumerator" which duplicates some of this logic. @@ -153,7 +153,7 @@ internal void QueryEnd(bool userInitiatedDispose) // 2. tokenCancellationRequested is backed by a volatile field, hence the reads below // won't get reordered about the read of token.IsCancellationRequested. - // If the query has already been disposed, we don't want to throw an OCE (this is a fix for + // If the query has already been disposed, we don't want to throw an OCE (this is a fix for bug 695173.) if (!m_cancellationState.TopLevelDisposedFlag.Value) { CancellationState.ThrowWithStandardMessageIfCanceled(m_cancellationState.ExternalCancellationToken); // Case #2 diff --git a/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs b/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs index 306b5411b..f43d3fdd5 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/Scheduling.cs @@ -7,7 +7,7 @@ // // Scheduling.cs // -// Microsoft +// [....] // // Infrastructure for setting up concurrent work, marshaling exceptions, determining // the recommended degree-of-parallelism, and so forth. diff --git a/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs b/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs index a80160150..ab614a047 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/SpoolingTask.cs @@ -7,7 +7,7 @@ // // SpoolingTask.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs b/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs index 26d878fe0..fdbe37adf 100644 --- a/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs +++ b/System.Core/System/Linq/Parallel/Scheduling/SpoolingTaskBase.cs @@ -7,7 +7,7 @@ // // SpoolingTaskBase.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs b/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs index 8eb45c4ba..fc3855ea7 100644 --- a/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs +++ b/System.Core/System/Linq/Parallel/Utils/CancellableEnumerable.cs @@ -7,7 +7,7 @@ // // CancellableEnumerable.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs b/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs index 1a9b354fe..7423b7eda 100644 --- a/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs +++ b/System.Core/System/Linq/Parallel/Utils/ExceptionAggregator.cs @@ -7,7 +7,7 @@ // // ExceptionAggregator.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs b/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs index c52cec2fa..7df87b5a4 100644 --- a/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs +++ b/System.Core/System/Linq/Parallel/Utils/ExchangeUtilities.cs @@ -7,7 +7,7 @@ // // ExchangeUtilities.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs b/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs index 43547483f..74f4f6fb6 100644 --- a/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs +++ b/System.Core/System/Linq/Parallel/Utils/FixedMaxHeap.cs @@ -7,7 +7,7 @@ // // FixedMaxHeap.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs b/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs index ccb3d1f97..7e431a8d2 100644 --- a/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs +++ b/System.Core/System/Linq/Parallel/Utils/GrowingArray.cs @@ -7,7 +7,7 @@ // // GrowingArray.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/HashLookup.cs b/System.Core/System/Linq/Parallel/Utils/HashLookup.cs index 8251e6c6b..5cbd0bb5e 100644 --- a/System.Core/System/Linq/Parallel/Utils/HashLookup.cs +++ b/System.Core/System/Linq/Parallel/Utils/HashLookup.cs @@ -7,7 +7,7 @@ // // HashLookup.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/ListChunk.cs b/System.Core/System/Linq/Parallel/Utils/ListChunk.cs index 8ae361044..2b0b099c6 100644 --- a/System.Core/System/Linq/Parallel/Utils/ListChunk.cs +++ b/System.Core/System/Linq/Parallel/Utils/ListChunk.cs @@ -7,7 +7,7 @@ // // ListChunk.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/Lookup.cs b/System.Core/System/Linq/Parallel/Utils/Lookup.cs index 4b7a65c5c..e3b1561f6 100644 --- a/System.Core/System/Linq/Parallel/Utils/Lookup.cs +++ b/System.Core/System/Linq/Parallel/Utils/Lookup.cs @@ -7,7 +7,7 @@ // // Lookup.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/PLINQETWProvider.cs b/System.Core/System/Linq/Parallel/Utils/PLINQETWProvider.cs index bbfec3cd6..294a86d54 100644 --- a/System.Core/System/Linq/Parallel/Utils/PLINQETWProvider.cs +++ b/System.Core/System/Linq/Parallel/Utils/PLINQETWProvider.cs @@ -7,7 +7,7 @@ // // PlinqEtwProvider.cs // -// Microsoft +// [....] // // EventSource for PLINQ. // diff --git a/System.Core/System/Linq/Parallel/Utils/Pair.cs b/System.Core/System/Linq/Parallel/Utils/Pair.cs index 0c8ed3672..57ed99389 100644 --- a/System.Core/System/Linq/Parallel/Utils/Pair.cs +++ b/System.Core/System/Linq/Parallel/Utils/Pair.cs @@ -7,7 +7,7 @@ // // Pair.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/PairComparer.cs b/System.Core/System/Linq/Parallel/Utils/PairComparer.cs index ea0cc96ad..99cf8fd1d 100644 --- a/System.Core/System/Linq/Parallel/Utils/PairComparer.cs +++ b/System.Core/System/Linq/Parallel/Utils/PairComparer.cs @@ -7,7 +7,7 @@ // // PairComparer.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs b/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs index e8e81bd32..b9ad3cced 100644 --- a/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs +++ b/System.Core/System/Linq/Parallel/Utils/ReverseComparer.cs @@ -7,7 +7,7 @@ // // ReverseComparer.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/Shared.cs b/System.Core/System/Linq/Parallel/Utils/Shared.cs index 28da58a61..ebe195311 100644 --- a/System.Core/System/Linq/Parallel/Utils/Shared.cs +++ b/System.Core/System/Linq/Parallel/Utils/Shared.cs @@ -7,7 +7,7 @@ // // Shared.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/Sorting.cs b/System.Core/System/Linq/Parallel/Utils/Sorting.cs index dba1de364..fb3559972 100644 --- a/System.Core/System/Linq/Parallel/Utils/Sorting.cs +++ b/System.Core/System/Linq/Parallel/Utils/Sorting.cs @@ -7,7 +7,7 @@ // // Sorting.cs // -// Microsoft +// [....] // // Support for sorting. // diff --git a/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs b/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs index 00202eb30..5c1ad9f45 100644 --- a/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs +++ b/System.Core/System/Linq/Parallel/Utils/TraceHelpers.cs @@ -7,7 +7,7 @@ // // TraceHelpers.cs // -// Microsoft +// [....] // // Common routines used to trace information about execution, the state of things, etc. // diff --git a/System.Core/System/Linq/Parallel/Utils/Util.cs b/System.Core/System/Linq/Parallel/Utils/Util.cs index 7ccdf8f5e..b877250e9 100644 --- a/System.Core/System/Linq/Parallel/Utils/Util.cs +++ b/System.Core/System/Linq/Parallel/Utils/Util.cs @@ -7,7 +7,7 @@ // // Util.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -33,12 +33,12 @@ internal static int Sign(int x) } //----------------------------------------------------------------------------------- - // This is a temporary workaround for a VSWhidbey - - - - - + // This is a temporary workaround for a VSWhidbey bug 601998 in the X64 JIT compiler. + // Unlike the X86 JIT, null checks on value types aren't optimized away in Whidbey. + // That means using the GenericComparer infrastructure results in boxing value + // types. This kills performance all over the place. This bug has been fixed in + // Orcas (2.0 SP1), so once we're on the SP1 runtime, this can be removed. + // internal static Comparer GetDefaultComparer() { diff --git a/System.Core/System/Linq/Parallel/Utils/Wrapper.cs b/System.Core/System/Linq/Parallel/Utils/Wrapper.cs index 4878dedf2..c96085b02 100644 --- a/System.Core/System/Linq/Parallel/Utils/Wrapper.cs +++ b/System.Core/System/Linq/Parallel/Utils/Wrapper.cs @@ -7,7 +7,7 @@ // // Wrapper.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs b/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs index 38fa75ba4..c2cb403ce 100644 --- a/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs +++ b/System.Core/System/Linq/Parallel/Utils/WrapperEqualityComparer.cs @@ -7,7 +7,7 @@ // // WrapperEqualityComparer.cs // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/System.Core/System/Linq/ParallelEnumerable.cs b/System.Core/System/Linq/ParallelEnumerable.cs index daa567abe..89dd8d769 100644 --- a/System.Core/System/Linq/ParallelEnumerable.cs +++ b/System.Core/System/Linq/ParallelEnumerable.cs @@ -7,7 +7,7 @@ // // ParallelEnumerable.cs // -// Microsoft +// [....] // // The standard IEnumerable-based LINQ-to-Objects query provider. This class basically // mirrors the System.Linq.Enumerable class, but (1) takes as input a special "parallel diff --git a/System.Core/System/Linq/SequenceQuery.cs b/System.Core/System/Linq/SequenceQuery.cs index ebcd614d3..c26925aae 100644 --- a/System.Core/System/Linq/SequenceQuery.cs +++ b/System.Core/System/Linq/SequenceQuery.cs @@ -96,7 +96,7 @@ IQueryable IQueryProvider.CreateQuery(Expression expression){ // critical (which was the original annotation when porting to silverlight) would violate // fxcop security rules if the interface isn't also critical. However, transparent code // can't access this anyway for Mix since we're not exposing AsQueryable(). - // Microsoft: the above assertion no longer holds. Now making AsQueryable() public again + // [....]: the above assertion no longer holds. Now making AsQueryable() public again // the security fallout of which will need to be re-examined. object IQueryProvider.Execute(Expression expression){ if (expression == null) diff --git a/System.Core/System/Security/Cryptography/BCryptNative.cs b/System.Core/System/Security/Cryptography/BCryptNative.cs index b4cc86876..48a846796 100644 --- a/System.Core/System/Security/Cryptography/BCryptNative.cs +++ b/System.Core/System/Security/Cryptography/BCryptNative.cs @@ -13,6 +13,7 @@ using System.Diagnostics.Contracts; using Microsoft.Win32; using Microsoft.Win32.SafeHandles; +using System.Security.Cryptography.X509Certificates; namespace System.Security.Cryptography { @@ -146,6 +147,9 @@ internal static class KeyDerivationFunction { public const string Tls = "TLS_PRF"; // BCRYPT_KDF_TLS_PRF } + internal const string BCRYPT_ECCPUBLIC_BLOB = "ECCPUBLICBLOB"; + internal const string BCRYPT_ECCPRIVATE_BLOB = "ECCPRIVATEBLOB"; + /// /// Well known BCrypt provider names /// @@ -236,6 +240,22 @@ internal static extern ErrorCode BCryptOpenAlgorithmProvider([Out] out SafeBCryp string pszAlgId, // BCryptAlgorithm string pszImplementation, // ProviderNames int dwFlags); + + [DllImport("bcrypt.dll", SetLastError = true)] + internal static extern ErrorCode BCryptExportKey([In]SafeBCryptKeyHandle hKey, + [In]IntPtr hExportKey, + [In][MarshalAs(UnmanagedType.LPWStr)] string pszBlobType, + [Out, MarshalAs(UnmanagedType.LPArray)] byte[] pbOutput, + [In]int cbOutput, + [In]ref int pcbResult, + [In] int dwFlags); + + [DllImport("Crypt32.dll", SetLastError = true)] + internal static extern int CryptImportPublicKeyInfoEx2([In] uint dwCertEncodingType, + [In] ref X509Native.CERT_PUBLIC_KEY_INFO pInfo, + [In] int dwFlags, + [In] IntPtr pvAuxInfo, + [Out] out SafeBCryptKeyHandle phKey); } // @@ -399,5 +419,40 @@ internal static SafeBCryptAlgorithmHandle OpenAlgorithm(string algorithm, string return algorithmHandle; } + + [SecuritySafeCritical] + internal static SafeBCryptKeyHandle ImportAsymmetricPublicKey(X509Native.CERT_PUBLIC_KEY_INFO certPublicKeyInfo, int dwFlag) { + SafeBCryptKeyHandle keyHandle = null; + int error = UnsafeNativeMethods.CryptImportPublicKeyInfoEx2( + X509Native.X509_ASN_ENCODING, + ref certPublicKeyInfo, + dwFlag, + IntPtr.Zero, + out keyHandle); + if (error == 0) { + throw new CryptographicException(Marshal.GetLastWin32Error()); + } + return keyHandle; + } + + [SecuritySafeCritical] + internal static byte[] ExportBCryptKey(SafeBCryptKeyHandle hKey, string blobType) { + byte[] keyBlob = null; + int length = 0; + + ErrorCode error = UnsafeNativeMethods.BCryptExportKey(hKey, IntPtr.Zero, blobType, null, 0, ref length, 0); + + if (error != ErrorCode.BufferToSmall && error != ErrorCode.Success) + { + throw new CryptographicException(Marshal.GetLastWin32Error()); + } + + keyBlob = new byte[length]; + error = UnsafeNativeMethods.BCryptExportKey(hKey, IntPtr.Zero, blobType, keyBlob, length, ref length, 0); + if (error != ErrorCode.Success) { + throw new CryptographicException(Marshal.GetLastWin32Error()); + } + return keyBlob; + } } } diff --git a/System.Core/System/Security/Cryptography/ECDsa.cs b/System.Core/System/Security/Cryptography/ECDsa.cs index 6bd7201ce..114729dfd 100644 --- a/System.Core/System/Security/Cryptography/ECDsa.cs +++ b/System.Core/System/Security/Cryptography/ECDsa.cs @@ -5,6 +5,7 @@ // ==--== using System; +using System.IO; namespace System.Security.Cryptography { /// @@ -40,7 +41,97 @@ public override string SignatureAlgorithm { // Signature operations // + // ECDsa does not encode the algorithm identifier into the signature blob, therefore SignHash and VerifyHash + // do not need the HashAlgorithmName value, only SignData and VerifyData do. public abstract byte[] SignHash(byte[] hash); public abstract bool VerifyHash(byte[] hash, byte[] signature); + + protected virtual byte[] HashData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) { + throw DerivedClassMustOverride(); + } + + protected virtual byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) { + throw DerivedClassMustOverride(); + } + + public virtual byte[] SignData(byte[] data, HashAlgorithmName hashAlgorithm) { + if (data == null) { + throw new ArgumentNullException("data"); + } + return SignData(data, 0, data.Length, hashAlgorithm); + } + + public virtual byte[] SignData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) { + if (data == null) { throw new ArgumentNullException("data"); } + if (offset < 0 || offset > data.Length) { throw new ArgumentOutOfRangeException("offset"); } + if (count < 0 || count > data.Length - offset) { throw new ArgumentOutOfRangeException("count"); } + if (String.IsNullOrEmpty(hashAlgorithm.Name)) { throw HashAlgorithmNameNullOrEmpty(); } + + byte[] hash = HashData(data, offset, count, hashAlgorithm); + return SignHash(hash); + } + + public virtual byte[] SignData(Stream data, HashAlgorithmName hashAlgorithm) { + if (data == null) { + throw new ArgumentNullException("data"); + } + if (String.IsNullOrEmpty(hashAlgorithm.Name)) { + throw HashAlgorithmNameNullOrEmpty(); + } + + byte[] hash = HashData(data, hashAlgorithm); + return SignHash(hash); + } + + public bool VerifyData(byte[] data, byte[] signature, HashAlgorithmName hashAlgorithm) { + if (data == null) { + throw new ArgumentNullException("data"); + } + return VerifyData(data, 0, data.Length, signature, hashAlgorithm); + } + + public virtual bool VerifyData(byte[] data, int offset, int count, byte[] signature, HashAlgorithmName hashAlgorithm) { + if (data == null) { + throw new ArgumentNullException("data"); + } + if (offset < 0 || offset > data.Length) { + throw new ArgumentOutOfRangeException("offset"); + } + if (count < 0 || count > data.Length - offset) { + throw new ArgumentOutOfRangeException("count"); + } + if (signature == null) { + throw new ArgumentNullException("signature"); + } + if (String.IsNullOrEmpty(hashAlgorithm.Name)) { + throw HashAlgorithmNameNullOrEmpty(); + } + + byte[] hash = HashData(data, offset, count, hashAlgorithm); + return VerifyHash(hash, signature); + } + + public bool VerifyData(Stream data, byte[] signature, HashAlgorithmName hashAlgorithm) { + if (data == null) { + throw new ArgumentNullException("data"); + } + if (signature == null) { + throw new ArgumentNullException("signature"); + } + if (String.IsNullOrEmpty(hashAlgorithm.Name)) { + throw HashAlgorithmNameNullOrEmpty(); + } + + byte[] hash = HashData(data, hashAlgorithm); + return VerifyHash(hash, signature); + } + + private static Exception DerivedClassMustOverride() { + return new NotImplementedException(SR.GetString(SR.NotSupported_SubclassOverride)); + } + + internal static Exception HashAlgorithmNameNullOrEmpty() { + return new ArgumentException(SR.GetString(SR.Cryptography_HashAlgorithmNameNullOrEmpty), "hashAlgorithm"); + } } } diff --git a/System.Core/System/Security/Cryptography/ECDsaCng.cs b/System.Core/System/Security/Cryptography/ECDsaCng.cs index e152be8db..40505e30d 100644 --- a/System.Core/System/Security/Cryptography/ECDsaCng.cs +++ b/System.Core/System/Security/Cryptography/ECDsaCng.cs @@ -375,5 +375,37 @@ public override bool VerifyHash(byte[] hash, byte[] signature) { return NCryptNative.VerifySignature(keyHandle, hash, signature); } } + + /// + /// Helper property to get the NCrypt key handle + /// + private SafeNCryptKeyHandle KeyHandle { + [SecuritySafeCritical] + get { return Key.Handle; } + } + + protected override byte[] HashData(byte[] data, int offset, int count, HashAlgorithmName hashAlgorithm) { + // we're sealed and the base should have checked this before calling us + Debug.Assert(data != null); + Debug.Assert(offset >= 0 && offset <= data.Length); + Debug.Assert(count >= 0 && count <= data.Length - offset); + Debug.Assert(!String.IsNullOrEmpty(hashAlgorithm.Name)); + + using (BCryptHashAlgorithm hasher = new BCryptHashAlgorithm(new CngAlgorithm(hashAlgorithm.Name), BCryptNative.ProviderName.MicrosoftPrimitiveProvider)) { + hasher.HashCore(data, offset, count); + return hasher.HashFinal(); + } + } + + protected override byte[] HashData(Stream data, HashAlgorithmName hashAlgorithm) { + // we're sealed and the base should have checked this before calling us + Debug.Assert(data != null); + Debug.Assert(!String.IsNullOrEmpty(hashAlgorithm.Name)); + + using (BCryptHashAlgorithm hasher = new BCryptHashAlgorithm(new CngAlgorithm(hashAlgorithm.Name), BCryptNative.ProviderName.MicrosoftPrimitiveProvider)) { + hasher.HashStream(data); + return hasher.HashFinal(); + } + } } } diff --git a/System.Core/System/Security/Cryptography/NCryptNative.cs b/System.Core/System/Security/Cryptography/NCryptNative.cs index 162e0bb88..cf5620911 100644 --- a/System.Core/System/Security/Cryptography/NCryptNative.cs +++ b/System.Core/System/Security/Cryptography/NCryptNative.cs @@ -561,6 +561,11 @@ private static byte[] DecryptData(SafeNCryptKeyHandle key, if (error != ErrorCode.Success) { throw new CryptographicException((int)error); } + + // Sometimes decryptedSize can be less than the allocated buffer size + // So resize the array to the actual returned plaintext + Array.Resize(ref decrypted, decryptedSize); + return decrypted; } diff --git a/System.Core/System/Security/Cryptography/X509Certificates/ECDsaCertificateExtensions.cs b/System.Core/System/Security/Cryptography/X509Certificates/ECDsaCertificateExtensions.cs new file mode 100644 index 000000000..7ef63647f --- /dev/null +++ b/System.Core/System/Security/Cryptography/X509Certificates/ECDsaCertificateExtensions.cs @@ -0,0 +1,129 @@ +using System.Runtime.InteropServices; +using Microsoft.Win32.SafeHandles; + +namespace System.Security.Cryptography.X509Certificates +{ + /// + /// Provides extension methods for retrieving implementations for the + /// public and private keys of a . + /// + public static class ECDsaCertificateExtensions + { + + /// + /// Gets the private key from the certificate or null if + /// the certificate does not have an ECDsa private key. + /// + [SecuritySafeCritical] + public static ECDsa GetECDsaPrivateKey(this X509Certificate2 certificate) + { + if (certificate == null) { throw new ArgumentNullException("certificate"); } + //Check cert for private key and confirm it is ECDSA cert + if (!certificate.HasPrivateKey || !IsECDsa(certificate)) { return null; } + + using (SafeCertContextHandle certificateContext = X509Native.GetCertificateContext(certificate)) + using (SafeNCryptKeyHandle privateKeyHandle = X509Native.TryAcquireCngPrivateKey(certificateContext)) + { + CngKey key = CngKey.Open(privateKeyHandle, CngKeyHandleOpenOptions.None); + return new ECDsaCng(key); + } + } + + /// + /// Gets the public key from the certificate or null if the certificate does not have an ECDsa public key. + /// + [SecuritySafeCritical] + public static ECDsa GetECDsaPublicKey(this X509Certificate2 certificate) + { + if (certificate == null) { throw new ArgumentNullException("certificate"); } + if (!IsECDsa(certificate)) { return null; } + + SafeCertContextHandle safeCertContext = X509Native.GetCertificateContext(certificate); + IntPtr certHandle = safeCertContext.DangerousGetHandle(); + //Read the public key blob from the certificate + X509Native.CERT_CONTEXT pCertContext = (X509Native.CERT_CONTEXT)Marshal.PtrToStructure(certHandle, typeof(X509Native.CERT_CONTEXT)); + + IntPtr pSubjectPublicKeyInfo = new IntPtr((long)pCertContext.pCertInfo + + (long)Marshal.OffsetOf(typeof(X509Native.CERT_INFO), "SubjectPublicKeyInfo")); + + X509Native.CERT_PUBLIC_KEY_INFO certPublicKeyInfo = (X509Native.CERT_PUBLIC_KEY_INFO)Marshal.PtrToStructure(pSubjectPublicKeyInfo, + typeof(X509Native.CERT_PUBLIC_KEY_INFO)); + CngKey key; + //Import the public key blob to BCRYPT_KEY_HANDLE + using (SafeBCryptKeyHandle bcryptKeyHandle = BCryptNative.ImportAsymmetricPublicKey(certPublicKeyInfo, 0)) + { + if (bcryptKeyHandle.IsInvalid) + { + throw new CryptographicException("SR.GetString(SR.Cryptography_OpenInvalidHandle)"); + } + key = BCryptHandleToNCryptHandle(bcryptKeyHandle); + } + GC.KeepAlive(safeCertContext); + return new ECDsaCng(key); + } + + /// + /// Method take BCrypt handle as input and returns the CNGKey + /// + /// Accepts BCrypt Handle + /// Returns CNG key with NCrypt Handle + private static CngKey BCryptHandleToNCryptHandle(SafeBCryptKeyHandle bcryptKeyHandle) + { + byte[] keyBlob = BCryptNative.ExportBCryptKey(bcryptKeyHandle, BCryptNative.BCRYPT_ECCPUBLIC_BLOB); + //Now Import the key blob as NCRYPT_KEY_HANDLE + CngKey Key = CngKey.Import(keyBlob, CngKeyBlobFormat.EccPublicBlob); + return Key; + } + + /// + /// Check if the certificate contains ECDsa key or ECDH / ECMQV key. + /// + /// Certificate object + /// true if ECDsa key. False otherwise + private static bool IsECDsa(X509Certificate2 certificate) + { + string algName = certificate.PublicKey.Oid.FriendlyName; + string value = certificate.PublicKey.Oid.Value; + //At this point check OID. If it matches for ECC certs + //then go to extensions and find out difference between ECDSA and ECDH certs + if (value != X509Native.szOID_ECC_PUBLIC_KEY) { return false; } + else + { + //Following section is built based on RFC + //http://www.ietf.org/rfc/rfc5280.txt and + //http://www.rfc-archive.org/getrfc.php?rfc=5480. This RFC, section 3 describes when + // key can be ECDSA or ECDH or ECMQV. + foreach (X509Extension extension in certificate.Extensions) + { + //Check Key Usage OID value + if (extension.Oid.Value == "2.5.29.15") + { + X509KeyUsageExtension ext = (X509KeyUsageExtension)extension; + + if (!(ext.KeyUsages.HasFlag(X509KeyUsageFlags.KeyAgreement))) + { + //If this does not have KeyAgreement flag present, it cannot be ECDH or ECMQV key as KeyAgreement + // is mandatory flag for ECDH or ECMQV. In that case, at this point, it is safe to assume it is ECDSA + return true; + } + //If key has any of the following flag then it cannot be ECDH or ECMQV. Assume + //it is ECDSA. + if (ext.KeyUsages.HasFlag(X509KeyUsageFlags.DigitalSignature) || + ext.KeyUsages.HasFlag(X509KeyUsageFlags.NonRepudiation) || + ext.KeyUsages.HasFlag(X509KeyUsageFlags.KeyCertSign) || + ext.KeyUsages.HasFlag(X509KeyUsageFlags.CrlSign)) + { + return true; + } + else + { + return false; + } + } + } + } + //If key usage extension is not present in the certificate assume ECDSA + return true; + } + } +} diff --git a/System.Core/System/Security/Cryptography/X509Certificates/RSACertificateExtensions.cs b/System.Core/System/Security/Cryptography/X509Certificates/RSACertificateExtensions.cs index c6379b50e..e4ef01d3e 100644 --- a/System.Core/System/Security/Cryptography/X509Certificates/RSACertificateExtensions.cs +++ b/System.Core/System/Security/Cryptography/X509Certificates/RSACertificateExtensions.cs @@ -66,7 +66,7 @@ public static RSA GetRSAPrivateKey(this X509Certificate2 certificate) return null; } - using (SafeCertContextHandle certificateContext = GetCertificateContext(certificate)) + using (SafeCertContextHandle certificateContext = X509Native.GetCertificateContext(certificate)) using (SafeNCryptKeyHandle privateKeyHandle = X509Native.TryAcquireCngPrivateKey(certificateContext)) { if (privateKeyHandle == null) @@ -101,23 +101,6 @@ private static uint OidToAlgorithmId(Oid oid) CapiNative.CRYPT_OID_INFO oidInfo = CapiNative.CryptFindOIDInfo(CapiNative.CRYPT_OID_INFO_OID_KEY, oidHandle, 0); return oidInfo.Algid; } - } - - // Gets a SafeHandle for the X509 certificate. The caller - // owns the returned handle and should dispose of it. It - // can be used independently of the lifetime of the original - // X509Certificate. - [SecuritySafeCritical] - private static SafeCertContextHandle GetCertificateContext(X509Certificate certificate) - { - SafeCertContextHandle certificateContext = X509Native.DuplicateCertContext(certificate.Handle); - - // Make sure to keep the X509Certificate object alive until after its certificate context is - // duplicated, otherwise it could end up being closed out from underneath us before we get a - // chance to duplicate the handle. - GC.KeepAlive(certificate); - - return certificateContext; - } + } } } diff --git a/System.Core/System/Security/Cryptography/X509Certificates/X509Native.cs b/System.Core/System/Security/Cryptography/X509Certificates/X509Native.cs index 13af6e370..94aacfd6e 100644 --- a/System.Core/System/Security/Cryptography/X509Certificates/X509Native.cs +++ b/System.Core/System/Security/Cryptography/X509Certificates/X509Native.cs @@ -142,6 +142,18 @@ internal static SafeCertContextHandle DuplicateCertContext(IntPtr context) { return UnsafeNativeMethods.CertDuplicateCertificateContext(context); } + + // Gets a SafeHandle for the X509 certificate. The caller owns the returned handle and should dispose of it. It + // can be used independently of the lifetime of the original X509Certificate. + [SecuritySafeCritical] + internal static SafeCertContextHandle GetCertificateContext(X509Certificate certificate) { + SafeCertContextHandle certificateContext = DuplicateCertContext(certificate.Handle); + // Make sure to keep the X509Certificate object alive until after its certificate context is + // duplicated, otherwise it could end up being closed out from underneath us before we get a + // chance to duplicate the handle. + GC.KeepAlive(certificate); + return certificateContext; + } } /// /// Native interop layer for X509 certificate and Authenticode functions. Native definitions can be @@ -162,6 +174,60 @@ public enum AxlVerificationFlags { TrustMicrosoftRootOnly = 0x00000020 // AXL_TRUST_MICROSOFT_ROOT_ONLY } + internal const uint X509_ASN_ENCODING = 0x00000001; + internal const string szOID_ECC_PUBLIC_KEY = "1.2.840.10045.2.1"; //Copied from Windows header file + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CERT_CONTEXT { + internal uint dwCertEncodingType; + internal IntPtr pbCertEncoded; + internal uint cbCertEncoded; + internal IntPtr pCertInfo; + internal IntPtr hCertStore; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CERT_PUBLIC_KEY_INFO { + internal CRYPT_ALGORITHM_IDENTIFIER Algorithm; + internal CRYPT_BIT_BLOB PublicKey; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CERT_INFO { + internal uint dwVersion; + internal CRYPTOAPI_BLOB SerialNumber; + internal CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + internal CRYPTOAPI_BLOB Issuer; + internal FILETIME NotBefore; + internal FILETIME NotAfter; + internal CRYPTOAPI_BLOB Subject; + internal CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; + internal CRYPT_BIT_BLOB IssuerUniqueId; + internal CRYPT_BIT_BLOB SubjectUniqueId; + internal uint cExtension; + internal IntPtr rgExtension; // PCERT_EXTENSION + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CRYPT_ALGORITHM_IDENTIFIER { + [MarshalAs(UnmanagedType.LPStr)] + internal string pszObjId; + internal CRYPTOAPI_BLOB Parameters; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CRYPT_BIT_BLOB { + internal uint cbData; + internal IntPtr pbData; + internal uint cUnusedBits; + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + internal struct CRYPTOAPI_BLOB { + internal uint cbData; + internal IntPtr pbData; + } + /// /// Flags for the CryptAcquireCertificatePrivateKey API /// diff --git a/System.Core/System/threading/Tasks/TaskExtensions.cs b/System.Core/System/threading/Tasks/TaskExtensions.cs index 11c673bf5..2853b837a 100644 --- a/System.Core/System/threading/Tasks/TaskExtensions.cs +++ b/System.Core/System/threading/Tasks/TaskExtensions.cs @@ -7,7 +7,7 @@ // // TaskExtensions.cs // -// Microsoft +// [....] // // Extensions to Task/Task classes // diff --git a/System.Data.DataSetExtensions/System/Data/DataRowComparer.cs b/System.Data.DataSetExtensions/System/Data/DataRowComparer.cs index 20ee67a63..83d84faa2 100644 --- a/System.Data.DataSetExtensions/System/Data/DataRowComparer.cs +++ b/System.Data.DataSetExtensions/System/Data/DataRowComparer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // spather //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/DataRowExtensions.cs b/System.Data.DataSetExtensions/System/Data/DataRowExtensions.cs index c1321fd25..172aaa055 100644 --- a/System.Data.DataSetExtensions/System/Data/DataRowExtensions.cs +++ b/System.Data.DataSetExtensions/System/Data/DataRowExtensions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // spather //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/DataSetUtil.cs b/System.Data.DataSetExtensions/System/Data/DataSetUtil.cs index cbb567e0b..16c100fd3 100644 --- a/System.Data.DataSetExtensions/System/Data/DataSetUtil.cs +++ b/System.Data.DataSetExtensions/System/Data/DataSetUtil.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/DataTableExtensions.cs b/System.Data.DataSetExtensions/System/Data/DataTableExtensions.cs index 9c02c11df..f9d681be6 100644 --- a/System.Data.DataSetExtensions/System/Data/DataTableExtensions.cs +++ b/System.Data.DataSetExtensions/System/Data/DataTableExtensions.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/EnumerableRowCollection.cs b/System.Data.DataSetExtensions/System/Data/EnumerableRowCollection.cs index 2aa098fd1..6ef1b93e8 100644 --- a/System.Data.DataSetExtensions/System/Data/EnumerableRowCollection.cs +++ b/System.Data.DataSetExtensions/System/Data/EnumerableRowCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/EnumerableRowCollectionExtensions.cs b/System.Data.DataSetExtensions/System/Data/EnumerableRowCollectionExtensions.cs index cc1ff7a80..d4b54919c 100644 --- a/System.Data.DataSetExtensions/System/Data/EnumerableRowCollectionExtensions.cs +++ b/System.Data.DataSetExtensions/System/Data/EnumerableRowCollectionExtensions.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/LinqDataView.cs b/System.Data.DataSetExtensions/System/Data/LinqDataView.cs index 13f891636..5b5635888 100644 --- a/System.Data.DataSetExtensions/System/Data/LinqDataView.cs +++ b/System.Data.DataSetExtensions/System/Data/LinqDataView.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.DataSetExtensions/System/Data/OrderedEnumerableRowCollection.cs b/System.Data.DataSetExtensions/System/Data/OrderedEnumerableRowCollection.cs index a09a082e8..3deed3f8b 100644 --- a/System.Data.DataSetExtensions/System/Data/OrderedEnumerableRowCollection.cs +++ b/System.Data.DataSetExtensions/System/Data/OrderedEnumerableRowCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/SortExpressionBuilder.cs b/System.Data.DataSetExtensions/System/Data/SortExpressionBuilder.cs index e7f2aca7a..da6192b17 100644 --- a/System.Data.DataSetExtensions/System/Data/SortExpressionBuilder.cs +++ b/System.Data.DataSetExtensions/System/Data/SortExpressionBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.DataSetExtensions/System/Data/TypedTableBase.cs b/System.Data.DataSetExtensions/System/Data/TypedTableBase.cs index 4a4a0ee70..2d8289f89 100644 --- a/System.Data.DataSetExtensions/System/Data/TypedTableBase.cs +++ b/System.Data.DataSetExtensions/System/Data/TypedTableBase.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // spather //------------------------------------------------------------------------------ diff --git a/System.Data.DataSetExtensions/System/Data/TypedTableBaseExtensions.cs b/System.Data.DataSetExtensions/System/Data/TypedTableBaseExtensions.cs index 5d6b9e6d9..4b9b7e51e 100644 --- a/System.Data.DataSetExtensions/System/Data/TypedTableBaseExtensions.cs +++ b/System.Data.DataSetExtensions/System/Data/TypedTableBaseExtensions.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/BuildProviderUtils.cs b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/BuildProviderUtils.cs index 338e6d617..3111c8566 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/BuildProviderUtils.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/BuildProviderUtils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityDesignerBuildProvider.cs b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityDesignerBuildProvider.cs index 1a4745d48..09e66a21b 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityDesignerBuildProvider.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityDesignerBuildProvider.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityModelBuildProvider.cs b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityModelBuildProvider.cs index 3abf99539..8223ed939 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityModelBuildProvider.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/EntityModelBuildProvider.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/MappingModelBuildProvider.cs b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/MappingModelBuildProvider.cs index 018bbedf8..2c51a2866 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/MappingModelBuildProvider.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/MappingModelBuildProvider.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/StorageModelBuildProvider.cs b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/StorageModelBuildProvider.cs index 0cc456310..f79a5ba3a 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/StorageModelBuildProvider.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/AspNet/StorageModelBuildProvider.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/Common/EDesignUtil.cs b/System.Data.Entity.Design/System/Data/Entity/Design/Common/EDesignUtil.cs index 4a3cf74b9..ce09de026 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/Common/EDesignUtil.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/Common/EDesignUtil.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Entity.Design.Common { diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataItemSerializer.cs b/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataItemSerializer.cs index 7fb8a1be6..f285bbca5 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataItemSerializer.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataItemSerializer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data.Common; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataUtil.cs b/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataUtil.cs index 9f11c4c78..2039e6a1d 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataUtil.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/Common/MetadataUtil.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/Common/OneToOneMappingSerializer.cs b/System.Data.Entity.Design/System/Data/Entity/Design/Common/OneToOneMappingSerializer.cs index d99f440cb..fac123e43 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/Common/OneToOneMappingSerializer.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/Common/OneToOneMappingSerializer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Data.Common; @@ -100,21 +100,21 @@ private void GetFromAssociationSetEnd(AssociationSet definingSet, AssociationSet // this seems counter intuitive at first, but makes sense when you think all the way through it // // CascadeDelete Behavior (we can assume the runtime will always delete cascade - // to the link table from the outside tables (it actually doesn't, but that is a - - - - - - - - - - - - - - + // to the link table from the outside tables (it actually doesn't, but that is a bug)) + // Store Effective + // A -> AToB <- B None + // A <- AToB <- B <- + // A -> AToB -> B -> + // A <- AToB -> B None + // A <- AToB B <- + // A AToB -> B -> + // A -> AToB B None + // A AToB <- B None + // + // Other CascadeDelete rules + // 1. Can't have a delete from a Many multiplicity end + // 2. Can't have a delete on both ends + // associationSetEnd = GetAssociationSetEnd(definingSet, true); AssociationSetEnd multiplicityAssociationSetEnd = GetAssociationSetEnd(multiplicitySet, false); diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/Common/UniqueIdentifierService.cs b/System.Data.Entity.Design/System/Data/Entity/Design/Common/UniqueIdentifierService.cs index eeb540311..2ceeb737c 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/Common/UniqueIdentifierService.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/Common/UniqueIdentifierService.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityCodeGenerator.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityCodeGenerator.cs index db62698c5..2f8d3a152 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityCodeGenerator.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityCodeGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- //#define ENABLE_TEMPLATE_DEBUGGING diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityDesignerUtils.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityDesignerUtils.cs index e0d234d53..3d8b9c438 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityDesignerUtils.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityDesignerUtils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.IO; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityFrameworkVersions.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityFrameworkVersions.cs index 6fd70791f..587e68dbc 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityFrameworkVersions.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityFrameworkVersions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityModelSchemaGenerator.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityModelSchemaGenerator.cs index 827b1a256..537a769cc 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityModelSchemaGenerator.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityModelSchemaGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaFilterEntry.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaFilterEntry.cs index b086b3fbc..ed03f5675 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaFilterEntry.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaFilterEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator.cs index 4b1c9d046..57f59c442 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Diagnostics; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.DbObjectKey.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.DbObjectKey.cs index 78d87ade5..e059181a3 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.DbObjectKey.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.DbObjectKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; namespace System.Data.Entity.Design diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.LoadMethodSessionState.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.LoadMethodSessionState.cs index 2b1460a25..6a360dbcb 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.LoadMethodSessionState.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityStoreSchemaGenerator/EntityStoreSchemaGenerator.LoadMethodSessionState.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Entity.Design.Common; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerationConstants.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerationConstants.cs index fbb3711e9..69f9e7f3d 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerationConstants.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerationConstants.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerator.cs b/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerator.cs index c1f7c6c72..8102ba338 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerator.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/EntityViewGeneration/EntityViewGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -345,7 +345,7 @@ private static void GenerateAndStoreViews(StorageMappingItemCollection mappingCo foreach (var storageEntityContainerMapping in mappingCollection.GetItems()) { - //Throw warning when containerMapping contains query view for + //Throw warning when containerMapping contains query view for bug 547285. if (HasQueryView(storageEntityContainerMapping)) { schemaErrors.Add(new EdmSchemaError( diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/MetadataExtensionMethods.cs b/System.Data.Entity.Design/System/Data/Entity/Design/MetadataExtensionMethods.cs index 3c0325be0..05fadc535 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/MetadataExtensionMethods.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/MetadataExtensionMethods.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Entity.Design diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/MetadataItemCollectionFactory.cs b/System.Data.Entity.Design/System/Data/Entity/Design/MetadataItemCollectionFactory.cs index a0bd90d32..4f496c57f 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/MetadataItemCollectionFactory.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/MetadataItemCollectionFactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Entity.Design diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/BidirectionalDictionary.cs b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/BidirectionalDictionary.cs index f40b62456..1085686e0 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/BidirectionalDictionary.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/BidirectionalDictionary.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EnglishPluralizationService.cs b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EnglishPluralizationService.cs index 2ca6171af..a0885995a 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EnglishPluralizationService.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EnglishPluralizationService.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EntityDesignPluralizationHandler.cs b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EntityDesignPluralizationHandler.cs index 547983643..ccd70127b 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EntityDesignPluralizationHandler.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/EntityDesignPluralizationHandler.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/PluralizationServiceUtil.cs b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/PluralizationServiceUtil.cs index 59a95d917..5002205ed 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/PluralizationServiceUtil.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/PluralizationService/PluralizationServiceUtil.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/EntityStoreSchemaGeneratorDatabaseSchemaLoader.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/EntityStoreSchemaGeneratorDatabaseSchemaLoader.cs index 697013be7..49d484d13 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/EntityStoreSchemaGeneratorDatabaseSchemaLoader.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/EntityStoreSchemaGeneratorDatabaseSchemaLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Globalization; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/FunctionDetailsReader.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/FunctionDetailsReader.cs index 6b0c5c767..95a9c2eb1 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/FunctionDetailsReader.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/FunctionDetailsReader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsCollection.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsCollection.cs index 9b8f93b6f..8f13e94ac 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsCollection.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Xml; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsRow.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsRow.cs index 892fa572d..4d202670c 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsRow.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/RelationshipDetailsRow.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Xml; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsCollection.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsCollection.cs index b79aee2c9..5eca9413a 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsCollection.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Xml; diff --git a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsRow.cs b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsRow.cs index ad95e0103..cd3ca3660 100644 --- a/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsRow.cs +++ b/System.Data.Entity.Design/System/Data/Entity/Design/SSDLGenerator/TableDetailsRow.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Xml; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/EdmToObjectNamespaceMap.cs b/System.Data.Entity.Design/System/Data/EntityModel/EdmToObjectNamespaceMap.cs index 2a5277fad..c45935e9a 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/EdmToObjectNamespaceMap.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/EdmToObjectNamespaceMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AssociationTypeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AssociationTypeEmitter.cs index 5b87e6fdc..ae05595ad 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AssociationTypeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AssociationTypeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AttributeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AttributeEmitter.cs index f52b61f18..45124ca35 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AttributeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/AttributeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.CodeDom; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ClientApiGenerator.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ClientApiGenerator.cs index 2c4663dfa..d4ec4cf42 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ClientApiGenerator.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ClientApiGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/CommentEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/CommentEmitter.cs index d2942485f..d898e7012 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/CommentEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/CommentEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ComplexTypeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ComplexTypeEmitter.cs index 3785fefaf..7f3692230 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ComplexTypeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/ComplexTypeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Emitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Emitter.cs index 28f5daf85..aad4ff051 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Emitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Emitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityContainerEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityContainerEmitter.cs index 928d13c2e..2aebd4d83 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityContainerEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityContainerEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityTypeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityTypeEmitter.cs index d842bb38f..f4cf839d8 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityTypeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/EntityTypeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUp.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUp.cs index c6fd702e2..2058e54f8 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUp.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUp.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUpCollection.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUpCollection.cs index d32878775..86a73f3ae 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUpCollection.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/FixUpCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/MetadataItemEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/MetadataItemEmitter.cs index bbb721431..aaf1e80ce 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/MetadataItemEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/MetadataItemEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //---------------------------------------------------------------------using System; using System.Collections.Generic; using System.Text; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NamespaceEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NamespaceEmitter.cs index 171726227..e200f5d2a 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NamespaceEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NamespaceEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NavigationPropertyEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NavigationPropertyEmitter.cs index ef0104ca7..121868eb6 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NavigationPropertyEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/NavigationPropertyEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitter.cs index 78c8d78e5..bbcb468e2 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.CodeDom; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitterBase.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitterBase.cs index 04a9326d5..aab6dc731 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitterBase.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/PropertyEmitterBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/SchemaTypeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/SchemaTypeEmitter.cs index 348ddae3b..e74471f3f 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/SchemaTypeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/SchemaTypeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/StructuredTypeEmitter.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/StructuredTypeEmitter.cs index 3af30235c..2689c5b99 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/StructuredTypeEmitter.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/StructuredTypeEmitter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/TypeReference.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/TypeReference.cs index 9336dbf7b..9381d82cf 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/TypeReference.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/TypeReference.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Utils.cs b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Utils.cs index e35e67cbb..a85445adb 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Utils.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/Emitters/Utils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/EntityClassGenerator.cs b/System.Data.Entity.Design/System/Data/EntityModel/EntityClassGenerator.cs index 6f530f56b..cd27ddb97 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/EntityClassGenerator.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/EntityClassGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/LazyTextWriterCreator.cs b/System.Data.Entity.Design/System/Data/EntityModel/LazyTextWriterCreator.cs index a6f6f0589..70e90b89b 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/LazyTextWriterCreator.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/LazyTextWriterCreator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/PropertyGeneratedEventArgs.cs b/System.Data.Entity.Design/System/Data/EntityModel/PropertyGeneratedEventArgs.cs index 5bbb41588..d80bd5d64 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/PropertyGeneratedEventArgs.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/PropertyGeneratedEventArgs.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data; diff --git a/System.Data.Entity.Design/System/Data/EntityModel/TypeGeneratedEventArgs.cs b/System.Data.Entity.Design/System/Data/EntityModel/TypeGeneratedEventArgs.cs index 63e42956a..d4133aadc 100644 --- a/System.Data.Entity.Design/System/Data/EntityModel/TypeGeneratedEventArgs.cs +++ b/System.Data.Entity.Design/System/Data/EntityModel/TypeGeneratedEventArgs.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/AbstractExpressions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/AbstractExpressions.cs index 7b5d7192b..32f66a934 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/AbstractExpressions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/AbstractExpressions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Aggregates.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Aggregates.cs index 13a5cb17c..4be1672eb 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Aggregates.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Aggregates.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/BasicCommandTreeVisitor.cs b/System.Data.Entity/System/Data/Common/CommandTrees/BasicCommandTreeVisitor.cs index b2c449026..065b1f15d 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/BasicCommandTreeVisitor.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/BasicCommandTreeVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/BasicExpressionVisitor.cs b/System.Data.Entity/System/Data/Common/CommandTrees/BasicExpressionVisitor.cs index 524792543..62816a815 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/BasicExpressionVisitor.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/BasicExpressionVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbCommandTree.cs index 86b6ed952..ffbe27823 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbDeleteCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbDeleteCommandTree.cs index 22ccf2daf..bd2a0cd47 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbDeleteCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbDeleteCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft -// @backupOwner Microsoft +// @owner [....], [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor.cs index 3fe00156b..819515f3c 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor_TResultType.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor_TResultType.cs index 0fde73b97..add222197 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor_TResultType.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbExpressionVisitor_TResultType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbFunctionCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbFunctionCommandTree.cs index 219ab1ae7..cb0d6513d 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbFunctionCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbFunctionCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbInsertCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbInsertCommandTree.cs index 10dbfbaf8..4d3d41e5c 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbInsertCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbInsertCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft -// @backupOwner Microsoft +// @owner [....], [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbLambda.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbLambda.cs index 0a1574382..db7105b54 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbLambda.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbLambda.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationClause.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationClause.cs index 71eecb4b2..c9ea82ce3 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationClause.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationClause.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationCommandTree.cs index b129bb2ef..67f0bc2ea 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbModificationCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft -// @backupOwner Microsoft +// @owner [....], [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbQueryCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbQueryCommandTree.cs index 56039e69f..0816cae13 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbQueryCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbQueryCommandTree.cs @@ -4,8 +4,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbSetClause.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbSetClause.cs index 82794eccd..4b97556f1 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbSetClause.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbSetClause.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DbUpdateCommandTree.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DbUpdateCommandTree.cs index 4e486f0be..65e72e88d 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DbUpdateCommandTree.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DbUpdateCommandTree.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft -// @backupOwner Microsoft +// @owner [....], [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/DefaultExpressionVisitor.cs b/System.Data.Entity/System/Data/Common/CommandTrees/DefaultExpressionVisitor.cs index 520d5dcd0..3eaea9451 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/DefaultExpressionVisitor.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/DefaultExpressionVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBindings.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBindings.cs index 7c39a76a7..6b24b054e 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBindings.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBindings.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs index 6db0404e3..018822d25 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/DbExpressionBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.ExpressionBuilder diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs index 026dac119..564193b7f 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/EdmFunctions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.ExpressionBuilder diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/ArgumentValidation.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/ArgumentValidation.cs index 02c45b471..c0e80490b 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/ArgumentValidation.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/ArgumentValidation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.ExpressionBuilder.Internal diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/EnumerableValidator.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/EnumerableValidator.cs index 9010a31ed..77c9bbb42 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/EnumerableValidator.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Internal/EnumerableValidator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.ExpressionBuilder.Internal diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Row.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Row.cs index 17f4e2615..6b2e6f372 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Row.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Row.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Spatial/SpatialEdmFunctions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Spatial/SpatialEdmFunctions.cs index 70a627702..10c2e8748 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Spatial/SpatialEdmFunctions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ExpressionBuilder/Spatial/SpatialEdmFunctions.cs @@ -5,7 +5,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.ExpressionBuilder.Spatial diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/DbExpressionRules.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/DbExpressionRules.cs index 5227cd067..92fb84d99 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/DbExpressionRules.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/DbExpressionRules.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionCopier.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionCopier.cs index 764d80a4d..72b700598 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionCopier.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionCopier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.Internal diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionDumper.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionDumper.cs index 3f57a0ac5..020ea578f 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionDumper.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionDumper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionKeyGen.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionKeyGen.cs index 3e9e050e2..d769ea835 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionKeyGen.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionKeyGen.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner venkatja //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionList.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionList.cs index 15d0c154a..b7c12c7df 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionList.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionList.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionPrinter.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionPrinter.cs index 11f70731f..17c708d70 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionPrinter.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ExpressionPrinter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.Internal diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ParameterRetriever.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ParameterRetriever.cs index 29005dc52..89396b7b6 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ParameterRetriever.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ParameterRetriever.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/PatternMatchRules.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/PatternMatchRules.cs index 66e3a0286..33f8a8a7f 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/PatternMatchRules.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/PatternMatchRules.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/Validator.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/Validator.cs index 182e58592..75ddb2626 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/Validator.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/Validator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees.Internal diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ViewSimplifier.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ViewSimplifier.cs index 3a65b24a5..485339fce 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ViewSimplifier.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/ViewSimplifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft -// @backupOwner Microsoft +// @owner [....], [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/XmlExpressionDumper.cs b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/XmlExpressionDumper.cs index c50dad6b3..e5ed294bc 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/Internal/XmlExpressionDumper.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/Internal/XmlExpressionDumper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/OperatorExpressions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/OperatorExpressions.cs index 45e384904..d3bfc50dc 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/OperatorExpressions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/OperatorExpressions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/RelationalExpressions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/RelationalExpressions.cs index a6e626c2f..05f52deba 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/RelationalExpressions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/RelationalExpressions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/CommandTrees/ValueExpressions.cs b/System.Data.Entity/System/Data/Common/CommandTrees/ValueExpressions.cs index 7546835ec..7d9bef3d9 100644 --- a/System.Data.Entity/System/Data/Common/CommandTrees/ValueExpressions.cs +++ b/System.Data.Entity/System/Data/Common/CommandTrees/ValueExpressions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.CommandTrees diff --git a/System.Data.Entity/System/Data/Common/DataRecord.cs b/System.Data.Entity/System/Data/Common/DataRecord.cs index b2d286185..22945e86e 100644 --- a/System.Data.Entity/System/Data/Common/DataRecord.cs +++ b/System.Data.Entity/System/Data/Common/DataRecord.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Objects @@ -426,7 +426,7 @@ public override bool IsDBNull(int ordinal) } #region ICustomTypeDescriptor implementation - //[Microsoft] Reference: http://msdn.microsoft.com/msdnmag/issues/05/04/NETMatters/ + //[[....]] Reference: http://msdn.microsoft.com/msdnmag/issues/05/04/NETMatters/ //Holds all of the PropertyDescriptors for the PrimitiveType objects in _values private PropertyDescriptorCollection _propertyDescriptors = null; private FilterCache _filterCache; diff --git a/System.Data.Entity/System/Data/Common/DataRecordInfo.cs b/System.Data.Entity/System/Data/Common/DataRecordInfo.cs index 9e892e98d..b5fcf313e 100644 --- a/System.Data.Entity/System/Data/Common/DataRecordInfo.cs +++ b/System.Data.Entity/System/Data/Common/DataRecordInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common diff --git a/System.Data.Entity/System/Data/Common/DbCommandDefinition.cs b/System.Data.Entity/System/Data/Common/DbCommandDefinition.cs index ed4b28e27..af5490530 100644 --- a/System.Data.Entity/System/Data/Common/DbCommandDefinition.cs +++ b/System.Data.Entity/System/Data/Common/DbCommandDefinition.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Common/DbProviderManifest.cs b/System.Data.Entity/System/Data/Common/DbProviderManifest.cs index b043bb402..4258cb147 100644 --- a/System.Data.Entity/System/Data/Common/DbProviderManifest.cs +++ b/System.Data.Entity/System/Data/Common/DbProviderManifest.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common diff --git a/System.Data.Entity/System/Data/Common/DbProviderServices.cs b/System.Data.Entity/System/Data/Common/DbProviderServices.cs index e12c1c8cd..6647b41a6 100644 --- a/System.Data.Entity/System/Data/Common/DbProviderServices.cs +++ b/System.Data.Entity/System/Data/Common/DbProviderServices.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.SqlClient; diff --git a/System.Data.Entity/System/Data/Common/DbXmlEnabledProviderManifest.cs b/System.Data.Entity/System/Data/Common/DbXmlEnabledProviderManifest.cs index 456a6d5ce..b06d9eb2f 100644 --- a/System.Data.Entity/System/Data/Common/DbXmlEnabledProviderManifest.cs +++ b/System.Data.Entity/System/Data/Common/DbXmlEnabledProviderManifest.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Common diff --git a/System.Data.Entity/System/Data/Common/EntityRecordInfo.cs b/System.Data.Entity/System/Data/Common/EntityRecordInfo.cs index d98de0bc8..fac34b50b 100644 --- a/System.Data.Entity/System/Data/Common/EntityRecordInfo.cs +++ b/System.Data.Entity/System/Data/Common/EntityRecordInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/AliasedExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/AliasedExpr.cs index 102e5da53..df9f6e839 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/AliasedExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/AliasedExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/AstNode.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/AstNode.cs index f0532e26f..e9d15458b 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/AstNode.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/AstNode.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/BuiltInExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/BuiltInExpr.cs index 66f3ca72c..fde232bf3 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/BuiltInExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/BuiltInExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/CaseExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/CaseExpr.cs index b04a76624..e1cae1bea 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/CaseExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/CaseExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/Command.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/Command.cs index a984def3d..905d1de7c 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/Command.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/Command.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/ConstructorExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/ConstructorExpr.cs index 8f4e103e7..e347d8e49 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/ConstructorExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/ConstructorExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/CreateRefExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/CreateRefExpr.cs index 365783ede..0757273be 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/CreateRefExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/CreateRefExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/DotExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/DotExpr.cs index 1d5b129ea..cdd820cf2 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/DotExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/DotExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/FunctionDefinition.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/FunctionDefinition.cs index c42aebb76..3331eacd6 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/FunctionDefinition.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/FunctionDefinition.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupAggregateExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupAggregateExpr.cs index 228845313..2806c7f43 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupAggregateExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupAggregateExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupPartitionExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupPartitionExpr.cs index 892604a96..128f9605e 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupPartitionExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/GroupPartitionExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/Identifier.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/Identifier.cs index bf7ea32b8..027fecca6 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/Identifier.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/Identifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/Literal.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/Literal.cs index b29f3a6ea..5616b9262 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/Literal.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/Literal.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/MethodExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/MethodExpr.cs index b95887f0a..dd49950d7 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/MethodExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/MethodExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/NamespaceImport.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/NamespaceImport.cs index d6ad41432..bfc5b7406 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/NamespaceImport.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/NamespaceImport.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/NavigationExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/NavigationExpr.cs index b9ece4526..e57134ce2 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/NavigationExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/NavigationExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/ParenExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/ParenExpr.cs index 724fe2fef..f7e675102 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/ParenExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/ParenExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryExpr.cs index ab258763c..2929b1ac2 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryParameter.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryParameter.cs index 0913e91f9..42000a872 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryParameter.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryParameter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryStatement.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryStatement.cs index 4567c4fde..d417b7cd2 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryStatement.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/QueryStatement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/RefExpr.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/RefExpr.cs index 9a3478111..ecb09bd2b 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/RefExpr.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/RefExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/AST/TypeDefinition.cs b/System.Data.Entity/System/Data/Common/EntitySql/AST/TypeDefinition.cs index c7bf3a98b..bb6f19e81 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/AST/TypeDefinition.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/AST/TypeDefinition.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql.AST diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlErrorHelper.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlErrorHelper.cs index 0e53206e9..681bf9fe7 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlErrorHelper.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlErrorHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlLexer.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlLexer.cs index 8d8c09279..ddb98d334 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlLexer.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlLexer.cs @@ -15,8 +15,8 @@ namespace System.Data.Common.EntitySql // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //----------------------------------------------------------------------------*/ using System; using System.Globalization; diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlLexerHelpers.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlLexerHelpers.cs index 477807623..23dcbc379 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlLexerHelpers.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlLexerHelpers.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlParser.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlParser.cs index d6ba939fb..1049adebd 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlParser.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlParser.cs @@ -27,8 +27,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //---------------------------------------------------------------------------*/ using System; diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlParserHelpers.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlParserHelpers.cs index 9dcc68e18..901fbd4ec 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlParserHelpers.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlParserHelpers.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/CqlQuery.cs b/System.Data.Entity/System/Data/Common/EntitySql/CqlQuery.cs index 8c8fbe0d7..e68915008 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/CqlQuery.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/CqlQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/EntitySqlParser.cs b/System.Data.Entity/System/Data/Common/EntitySql/EntitySqlParser.cs index a6f018832..17b62f5bb 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/EntitySqlParser.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/EntitySqlParser.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/FunctionOverloadResolver.cs b/System.Data.Entity/System/Data/Common/EntitySql/FunctionOverloadResolver.cs index 0207198e6..fe00e0c48 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/FunctionOverloadResolver.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/FunctionOverloadResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/ParseResult.cs b/System.Data.Entity/System/Data/Common/EntitySql/ParseResult.cs index 77fa73c45..fdbf4be14 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/ParseResult.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/ParseResult.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/ParserOptions.cs b/System.Data.Entity/System/Data/Common/EntitySql/ParserOptions.cs index bf61750a9..cdfc03cda 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/ParserOptions.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/ParserOptions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/SemanticAnalyzer.cs b/System.Data.Entity/System/Data/Common/EntitySql/SemanticAnalyzer.cs index 51130912b..43bd38b5f 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/SemanticAnalyzer.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/SemanticAnalyzer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/SemanticResolver.cs b/System.Data.Entity/System/Data/Common/EntitySql/SemanticResolver.cs index 9009be640..ddc2fe1ed 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/SemanticResolver.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/SemanticResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/StaticContext.cs b/System.Data.Entity/System/Data/Common/EntitySql/StaticContext.cs index 1000b4d4d..810e2dde4 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/StaticContext.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/StaticContext.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntitySql/TypeResolver.cs b/System.Data.Entity/System/Data/Common/EntitySql/TypeResolver.cs index 99d2fcb2f..53052c6f9 100644 --- a/System.Data.Entity/System/Data/Common/EntitySql/TypeResolver.cs +++ b/System.Data.Entity/System/Data/Common/EntitySql/TypeResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.EntitySql diff --git a/System.Data.Entity/System/Data/Common/EntityUtil.cs b/System.Data.Entity/System/Data/Common/EntityUtil.cs index 63d51ab7e..273ba8bf5 100644 --- a/System.Data.Entity/System/Data/Common/EntityUtil.cs +++ b/System.Data.Entity/System/Data/Common/EntityUtil.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -2071,8 +2071,8 @@ public static Type[] GetTypesSpecial(Assembly assembly) /// /// This method uses the .net Fx target framework moniker (introduced in .net 4.0 Multitargeting feature) /// to provide a 'quirks' mode that serves as a compatibility flag for features that can be considered - /// breaking changes from 4.0 to 4.5 which is a in-place upgrade to 4.0. For details see DevDiv2 - + /// breaking changes from 4.0 to 4.5 which is a in-place upgrade to 4.0. For details see DevDiv2 bug#488375. + /// static bool? useFx40CompatMode; static public bool UseFx40CompatMode { diff --git a/System.Data.Entity/System/Data/Common/FieldMetadata.cs b/System.Data.Entity/System/Data/Common/FieldMetadata.cs index f9c967c80..5ed39f171 100644 --- a/System.Data.Entity/System/Data/Common/FieldMetadata.cs +++ b/System.Data.Entity/System/Data/Common/FieldMetadata.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data.Entity/System/Data/Common/FieldNameLookup.cs b/System.Data.Entity/System/Data/Common/FieldNameLookup.cs index 8d7177d5d..e65c7390d 100644 --- a/System.Data.Entity/System/Data/Common/FieldNameLookup.cs +++ b/System.Data.Entity/System/Data/Common/FieldNameLookup.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data.Entity/System/Data/Common/Internal/DbTypeMap.cs b/System.Data.Entity/System/Data/Common/Internal/DbTypeMap.cs index 7a85d27b4..65ab8650c 100644 --- a/System.Data.Entity/System/Data/Common/Internal/DbTypeMap.cs +++ b/System.Data.Entity/System/Data/Common/Internal/DbTypeMap.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Text; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/ColumnMapKeyBuilder.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/ColumnMapKeyBuilder.cs index af3717ef8..19041a0c3 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/ColumnMapKeyBuilder.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/ColumnMapKeyBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/CompensatingCollection.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/CompensatingCollection.cs index 3b48e5f40..8526686cd 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/CompensatingCollection.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/CompensatingCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common.Internal.Materialization diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/Coordinator.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/Coordinator.cs index 93a4e6c90..23be3839d 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/Coordinator.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/Coordinator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorFactory.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorFactory.cs index b6807fa20..0ec0331c8 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorFactory.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorScratchpad.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorScratchpad.cs index 96323de31..d2f81f02f 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorScratchpad.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/CoordinatorScratchpad.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordState.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordState.cs index b2c725f98..096fd6615 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordState.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordState.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateFactory.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateFactory.cs index 0df64e380..69904d04f 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateFactory.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateScratchpad.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateScratchpad.cs index 796548170..7a5f65e0d 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateScratchpad.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/RecordStateScratchpad.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/Shaper.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/Shaper.cs index db09b27ac..659e0e1c4 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/Shaper.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/Shaper.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common.Internal.Materialization diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/ShaperFactory.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/ShaperFactory.cs index 3fd39f9d2..0a4c89a46 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/ShaperFactory.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/ShaperFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Data.Common.QueryCache; diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/Translator.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/Translator.cs index ae93d8088..065d41fc1 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/Translator.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/Translator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common.Internal.Materialization @@ -2199,7 +2199,7 @@ internal static MethodInfo GetReaderMethod(Type type, out bool isNullable) } else if (typeof(Object) == type) { - // We assume that Object means we want DBNull rather than null. I believe this is a + // We assume that Object means we want DBNull rather than null. I believe this is a bug. result = DbDataReader_GetValue; } else diff --git a/System.Data.Entity/System/Data/Common/Internal/Materialization/Util.cs b/System.Data.Entity/System/Data/Common/Internal/Materialization/Util.cs index a968ae5ff..fd7cac415 100644 --- a/System.Data.Entity/System/Data/Common/Internal/Materialization/Util.cs +++ b/System.Data.Entity/System/Data/Common/Internal/Materialization/Util.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Common/Internal/MultipartIdentifier.cs b/System.Data.Entity/System/Data/Common/Internal/MultipartIdentifier.cs index b4f9fb478..53cef9b28 100644 --- a/System.Data.Entity/System/Data/Common/Internal/MultipartIdentifier.cs +++ b/System.Data.Entity/System/Data/Common/Internal/MultipartIdentifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheEntry.cs b/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheEntry.cs index d12784031..64adc859e 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheEntry.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheKey.cs index bd601d72a..2654fe187 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/CompiledQueryCacheKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/EntityClientCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/EntityClientCacheKey.cs index f779d4bc6..e15581534 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/EntityClientCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/EntityClientCacheKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/EntitySqlQueryCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/EntitySqlQueryCacheKey.cs index c768adabf..e522b27cb 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/EntitySqlQueryCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/EntitySqlQueryCacheKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/LinqQueryCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/LinqQueryCacheKey.cs index eda5cfd72..48e751b3a 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/LinqQueryCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/LinqQueryCacheKey.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner venkatja //------------------------------------------------------------------------------ diff --git a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheEntry.cs b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheEntry.cs index b24ea21c6..095192735 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheEntry.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheKey.cs index 28884ac06..4619758ae 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheManager.cs b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheManager.cs index 7bbc1a392..1b0ccd787 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheManager.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/QueryCacheManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Common.QueryCache diff --git a/System.Data.Entity/System/Data/Common/QueryCache/ShaperFactoryQueryCacheKey.cs b/System.Data.Entity/System/Data/Common/QueryCache/ShaperFactoryQueryCacheKey.cs index dd3826dae..4b47edc6e 100644 --- a/System.Data.Entity/System/Data/Common/QueryCache/ShaperFactoryQueryCacheKey.cs +++ b/System.Data.Entity/System/Data/Common/QueryCache/ShaperFactoryQueryCacheKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Common/Utils/AliasGenerator.cs b/System.Data.Entity/System/Data/Common/Utils/AliasGenerator.cs index 5417635a7..670f5e62d 100644 --- a/System.Data.Entity/System/Data/Common/Utils/AliasGenerator.cs +++ b/System.Data.Entity/System/Data/Common/Utils/AliasGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/BoolExpr.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/BoolExpr.cs index 4ddc93a15..c06db3a12 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/BoolExpr.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/BoolExpr.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Clause.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Clause.cs index f06cf05f8..510cf51b4 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Clause.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Clause.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/ConversionContext.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/ConversionContext.cs index 944a59a9a..ba6cb2b83 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/ConversionContext.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/ConversionContext.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Converter.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Converter.cs index 893ab5a69..c5bf38311 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Converter.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Converter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/DomainConstraint.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/DomainConstraint.cs index 0b69ae686..aa8d12e3c 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/DomainConstraint.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/DomainConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/IdentifierService.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/IdentifierService.cs index bfe37791d..36d5bd118 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/IdentifierService.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/IdentifierService.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/KnowledgeBase.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/KnowledgeBase.cs index 1fc9e9fd9..cb9d5569c 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/KnowledgeBase.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/KnowledgeBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Literal.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Literal.cs index 90f18519c..372a0cfa3 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Literal.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Literal.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/NegationPusher.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/NegationPusher.cs index 0123003f2..4a86fee78 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/NegationPusher.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/NegationPusher.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Sentence.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Sentence.cs index 92c7f9bee..2b6716c3e 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Sentence.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Sentence.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Simplifier.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Simplifier.cs index b591a6645..2bad66e26 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Simplifier.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Simplifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Solver.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Solver.cs index 8d0f77d72..d9769c5f3 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Solver.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Solver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -315,7 +315,7 @@ public bool Equals(Vertex x, Vertex y) { if (x.IsSink()) { - // sync nodes '1' and '0' each have one static instance; use reference + // [....] nodes '1' and '0' each have one static instance; use reference return x.Equals(y); } @@ -338,7 +338,7 @@ public bool Equals(Vertex x, Vertex y) public int GetHashCode(Vertex vertex) { - // sync nodes '1' and '0' each have one static instance; use reference + // [....] nodes '1' and '0' each have one static instance; use reference if (vertex.IsSink()) { return vertex.GetHashCode(); diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Vertex.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Vertex.cs index 38b8b5f87..6806a73b2 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Vertex.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Vertex.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Boolean/Visitor.cs b/System.Data.Entity/System/Data/Common/Utils/Boolean/Visitor.cs index b02fa5d12..d4f25a816 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Boolean/Visitor.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Boolean/Visitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/ByValueEqualityComparer.cs b/System.Data.Entity/System/Data/Common/Utils/ByValueEqualityComparer.cs index 0be82c086..4cd2051c0 100644 --- a/System.Data.Entity/System/Data/Common/Utils/ByValueEqualityComparer.cs +++ b/System.Data.Entity/System/Data/Common/Utils/ByValueEqualityComparer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/CommandHelper.cs b/System.Data.Entity/System/Data/Common/Utils/CommandHelper.cs index 1163bf8f8..39952ce67 100644 --- a/System.Data.Entity/System/Data/Common/Utils/CommandHelper.cs +++ b/System.Data.Entity/System/Data/Common/Utils/CommandHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common.Utils diff --git a/System.Data.Entity/System/Data/Common/Utils/DisposableCollectionWrapper.cs b/System.Data.Entity/System/Data/Common/Utils/DisposableCollectionWrapper.cs index 73f8b6299..2096b0887 100644 --- a/System.Data.Entity/System/Data/Common/Utils/DisposableCollectionWrapper.cs +++ b/System.Data.Entity/System/Data/Common/Utils/DisposableCollectionWrapper.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; using System.Linq; diff --git a/System.Data.Entity/System/Data/Common/Utils/Helpers.cs b/System.Data.Entity/System/Data/Common/Utils/Helpers.cs index 232648f3e..98a32e33e 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Helpers.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Helpers.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/InternalBase.cs b/System.Data.Entity/System/Data/Common/Utils/InternalBase.cs index a35fdc2da..44fe649dc 100644 --- a/System.Data.Entity/System/Data/Common/Utils/InternalBase.cs +++ b/System.Data.Entity/System/Data/Common/Utils/InternalBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/KeyToListMap.cs b/System.Data.Entity/System/Data/Common/Utils/KeyToListMap.cs index 12a2a1333..aaa2b0df3 100644 --- a/System.Data.Entity/System/Data/Common/Utils/KeyToListMap.cs +++ b/System.Data.Entity/System/Data/Common/Utils/KeyToListMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/Memoizer.cs b/System.Data.Entity/System/Data/Common/Utils/Memoizer.cs index 84395cf4c..f9f9d1d34 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Memoizer.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Memoizer.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Utils/MetadataHelper.cs b/System.Data.Entity/System/Data/Common/Utils/MetadataHelper.cs index 6015d34a1..1ab0fb912 100644 --- a/System.Data.Entity/System/Data/Common/Utils/MetadataHelper.cs +++ b/System.Data.Entity/System/Data/Common/Utils/MetadataHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/ModifiableIteratorCollection.cs b/System.Data.Entity/System/Data/Common/Utils/ModifiableIteratorCollection.cs index 17f7d6b56..06db634ab 100644 --- a/System.Data.Entity/System/Data/Common/Utils/ModifiableIteratorCollection.cs +++ b/System.Data.Entity/System/Data/Common/Utils/ModifiableIteratorCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/Pair.cs b/System.Data.Entity/System/Data/Common/Utils/Pair.cs index 4e6716346..78e1362f7 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Pair.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Pair.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Common/Utils/Set.cs b/System.Data.Entity/System/Data/Common/Utils/Set.cs index 4eead566c..4b9b0fac3 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Set.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Set.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/Singleton.cs b/System.Data.Entity/System/Data/Common/Utils/Singleton.cs index 9d5282ada..cb7a53fc9 100644 --- a/System.Data.Entity/System/Data/Common/Utils/Singleton.cs +++ b/System.Data.Entity/System/Data/Common/Utils/Singleton.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Utils/StringUtil.cs b/System.Data.Entity/System/Data/Common/Utils/StringUtil.cs index 79e347e38..bdd52eaa5 100644 --- a/System.Data.Entity/System/Data/Common/Utils/StringUtil.cs +++ b/System.Data.Entity/System/Data/Common/Utils/StringUtil.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Common/Utils/ThreadSafeList.cs b/System.Data.Entity/System/Data/Common/Utils/ThreadSafeList.cs index 1a26a4a10..e867acd6f 100644 --- a/System.Data.Entity/System/Data/Common/Utils/ThreadSafeList.cs +++ b/System.Data.Entity/System/Data/Common/Utils/ThreadSafeList.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Utils/TrailingSpaceComparer.cs b/System.Data.Entity/System/Data/Common/Utils/TrailingSpaceComparer.cs index 261894900..87929e26b 100644 --- a/System.Data.Entity/System/Data/Common/Utils/TrailingSpaceComparer.cs +++ b/System.Data.Entity/System/Data/Common/Utils/TrailingSpaceComparer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Common/Utils/TreePrinter.cs b/System.Data.Entity/System/Data/Common/Utils/TreePrinter.cs index dd2a101c5..fd2ab6566 100644 --- a/System.Data.Entity/System/Data/Common/Utils/TreePrinter.cs +++ b/System.Data.Entity/System/Data/Common/Utils/TreePrinter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityClient/DbConnectionOptions.cs b/System.Data.Entity/System/Data/EntityClient/DbConnectionOptions.cs index 4e0339f88..1a2aaea18 100644 --- a/System.Data.Entity/System/Data/EntityClient/DbConnectionOptions.cs +++ b/System.Data.Entity/System/Data/EntityClient/DbConnectionOptions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityClient/DbParameterCollectionHelper.cs b/System.Data.Entity/System/Data/EntityClient/DbParameterCollectionHelper.cs index 05513caf8..4fbe922b7 100644 --- a/System.Data.Entity/System/Data/EntityClient/DbParameterCollectionHelper.cs +++ b/System.Data.Entity/System/Data/EntityClient/DbParameterCollectionHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityClient/DbParameterHelper.cs b/System.Data.Entity/System/Data/EntityClient/DbParameterHelper.cs index 6d34f8a1a..c56ef6076 100644 --- a/System.Data.Entity/System/Data/EntityClient/DbParameterHelper.cs +++ b/System.Data.Entity/System/Data/EntityClient/DbParameterHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/EntityClient/EntityAdapter.cs b/System.Data.Entity/System/Data/EntityClient/EntityAdapter.cs index 3881760b3..5a175d33d 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityAdapter.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityAdapter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient { diff --git a/System.Data.Entity/System/Data/EntityClient/EntityCommand.cs b/System.Data.Entity/System/Data/EntityClient/EntityCommand.cs index ea6a1d391..84e2df32c 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityCommand.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityCommand.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityClient/EntityCommandDefinition.cs b/System.Data.Entity/System/Data/EntityClient/EntityCommandDefinition.cs index c0f9ea430..0f00c170e 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityCommandDefinition.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityCommandDefinition.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.EntityClient { diff --git a/System.Data.Entity/System/Data/EntityClient/EntityConnection.cs b/System.Data.Entity/System/Data/EntityClient/EntityConnection.cs index 7ef5b69b4..38de95d81 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityConnection.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityConnection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; @@ -790,14 +790,14 @@ public override void EnlistTransaction(Transaction transaction) protected override void Dispose(bool disposing) { // It is possible for the EntityConnection to be finalized even if the object was not actually - // created due to a "won't fix" - - - - - - - + // created due to a "won't fix" bug in the x86 JITer--see Dev10 bug 892884. + // Even without this bug, a stack overflow trying to allocate space to run the constructor can + // result in effectively the same situation. This means we can end up finalizing objects that + // have not even been fully initialized. In order for this to work we have to be very careful + // what we do in Dispose and we need to stick rigidly to the "only dispose unmanaged resources + // if disposing is false" rule. We don't actually have any unmanaged resources--these are + // handled by the base class or other managed classes that we have references to. These classes + // will dispose of their unmanaged resources on finalize, so we shouldn't try to do it here. if (disposing) { ClearTransactions(); diff --git a/System.Data.Entity/System/Data/EntityClient/EntityConnectionStringBuilder.cs b/System.Data.Entity/System/Data/EntityClient/EntityConnectionStringBuilder.cs index f6061e487..22ba703d3 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityConnectionStringBuilder.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityConnectionStringBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityClient/EntityDataReader.cs b/System.Data.Entity/System/Data/EntityClient/EntityDataReader.cs index 14b88c927..f79b0546c 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityDataReader.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityDataReader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityClient/EntityParameter.cs b/System.Data.Entity/System/Data/EntityClient/EntityParameter.cs index 33fd94821..17c7aa105 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityParameter.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityParameter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityClient { diff --git a/System.Data.Entity/System/Data/EntityClient/EntityParameterCollection.cs b/System.Data.Entity/System/Data/EntityClient/EntityParameterCollection.cs index 72b8c1bc9..8303a9172 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityParameterCollection.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityParameterCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityClient/EntityProviderFactory.cs b/System.Data.Entity/System/Data/EntityClient/EntityProviderFactory.cs index 5687ab06d..f633d9b29 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityProviderFactory.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityProviderFactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/System.Data.Entity/System/Data/EntityClient/EntityProviderServices.cs b/System.Data.Entity/System/Data/EntityClient/EntityProviderServices.cs index 579cf6ba8..aa7b9d3a3 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityProviderServices.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityProviderServices.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.EntityClient { diff --git a/System.Data.Entity/System/Data/EntityClient/EntityTransaction.cs b/System.Data.Entity/System/Data/EntityClient/EntityTransaction.cs index ffaeda4db..69c546691 100644 --- a/System.Data.Entity/System/Data/EntityClient/EntityTransaction.cs +++ b/System.Data.Entity/System/Data/EntityClient/EntityTransaction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Text; diff --git a/System.Data.Entity/System/Data/EntityClient/NameValuePair.cs b/System.Data.Entity/System/Data/EntityClient/NameValuePair.cs index 3d548d105..19ec74327 100644 --- a/System.Data.Entity/System/Data/EntityClient/NameValuePair.cs +++ b/System.Data.Entity/System/Data/EntityClient/NameValuePair.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.EntityClient diff --git a/System.Data.Entity/System/Data/EntityCommandCompilationException.cs b/System.Data.Entity/System/Data/EntityCommandCompilationException.cs index 0975cf1d4..6f88b7700 100644 --- a/System.Data.Entity/System/Data/EntityCommandCompilationException.cs +++ b/System.Data.Entity/System/Data/EntityCommandCompilationException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data { diff --git a/System.Data.Entity/System/Data/EntityCommandExecutionException.cs b/System.Data.Entity/System/Data/EntityCommandExecutionException.cs index db9a7c62e..b464bf4d1 100644 --- a/System.Data.Entity/System/Data/EntityCommandExecutionException.cs +++ b/System.Data.Entity/System/Data/EntityCommandExecutionException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data { diff --git a/System.Data.Entity/System/Data/EntityException.cs b/System.Data.Entity/System/Data/EntityException.cs index 84fd61e5c..4060610bb 100644 --- a/System.Data.Entity/System/Data/EntityException.cs +++ b/System.Data.Entity/System/Data/EntityException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/EntityKey.cs b/System.Data.Entity/System/Data/EntityKey.cs index 84c60eb7e..249249a77 100644 --- a/System.Data.Entity/System/Data/EntityKey.cs +++ b/System.Data.Entity/System/Data/EntityKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/BooleanFacetDescriptionElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/BooleanFacetDescriptionElement.cs index f48665f8b..99ee5aa72 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/BooleanFacetDescriptionElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/BooleanFacetDescriptionElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ByteFacetDescriptionElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ByteFacetDescriptionElement.cs index f9a3f58dc..8beec1311 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ByteFacetDescriptionElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ByteFacetDescriptionElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionTypeElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionTypeElement.cs index e59c73944..987631ed9 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionTypeElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/CollectionTypeElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Documentation.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Documentation.cs index 6edbe3939..855c7b9ab 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Documentation.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Documentation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainer.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainer.cs index 1fd962260..89d93ac8f 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainer.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSet.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSet.cs index 1123c77d6..d3bf53f96 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSet.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSetEnd.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSetEnd.cs index 94a82e4a5..9c1aa9ee3 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSetEnd.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerAssociationSetEnd.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySet.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySet.cs index 058927b46..84f1077ff 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySet.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySetDefiningQuery.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySetDefiningQuery.cs index a8e156eb9..e28c9e245 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySetDefiningQuery.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerEntitySetDefiningQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSet.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSet.cs index ffd2c2f21..1a97aa2eb 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSet.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel @@ -131,21 +131,21 @@ internal override void Validate() // Enabling Association between subtypes in case of Referential Constraints, since // CSD is blocked on this. We need to make a long term call about whether we should - // really allow this. - - - - - - - - - - - - - - + // really allow this. Bug #520216 + //foreach (ReferentialConstraint constraint in Relationship.Constraints) + //{ + // IRelationshipEnd dependentEnd = constraint.DependentRole.End; + // EntityContainerRelationshipSetEnd setEnd = GetEnd(dependentEnd.Name); + // Debug.Assert(setEnd != null); + // //Make sure that the EntityType of the dependant role in a referential constraint + // //covers the whole EntitySet( i.e. not a subtype of the EntitySet's type). + // if (!setEnd.EntitySet.EntityType.IsOfType(constraint.DependentRole.End.Type)) + // { + // AddError(ErrorCode.InvalidDependentRoleType, EdmSchemaErrorSeverity.Error, + // System.Data.Entity.Strings.InvalidDependentRoleType(dependentEnd.Type.FQName, dependentEnd.Name, + // dependentEnd.Parent.FQName, setEnd.EntitySet.Name, setEnd.ParentElement.Name)); + // } + //} // Validate Number of ends is correct // What we know: diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSetEnd.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSetEnd.cs index 05d03efff..1d1ece883 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSetEnd.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityContainerRelationshipSetEnd.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityKeyElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityKeyElement.cs index 2126b2a9c..07445c951 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityKeyElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/EntityKeyElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetDescriptionElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetDescriptionElement.cs index eb40d3dc2..49f2b7a86 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetDescriptionElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetDescriptionElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetEnabledSchemaElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetEnabledSchemaElement.cs index bb05b4a3e..fc0323241 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetEnabledSchemaElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FacetEnabledSchemaElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FilteredSchemaElementLookUpTable.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FilteredSchemaElementLookUpTable.cs index 3e5c9917d..1f831a311 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FilteredSchemaElementLookUpTable.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FilteredSchemaElementLookUpTable.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Function.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Function.cs index a037456cd..30a10dcee 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Function.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Function.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionCommandText.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionCommandText.cs index de1322b8e..2ce12d538 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionCommandText.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionCommandText.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionImportElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionImportElement.cs index a1847012c..9839bdd1f 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionImportElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/FunctionImportElement.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel { diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IntegerFacetDescriptionElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IntegerFacetDescriptionElement.cs index 1e2c8644b..8e5edae4b 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IntegerFacetDescriptionElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/IntegerFacetDescriptionElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ItemType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ItemType.cs index 47d691af5..3a5149eef 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ItemType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ItemType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/KeyProperty.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/KeyProperty.cs index 7f79e8774..bc0940010 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/KeyProperty.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/KeyProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunction.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunction.cs index 1b62350a0..a44097e95 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunction.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunctionTypeElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunctionTypeElement.cs index 89348cb93..97449e9f0 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunctionTypeElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ModelFunctionTypeElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/NavigationProperty.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/NavigationProperty.cs index 796497f28..3909de586 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/NavigationProperty.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/NavigationProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/OnOperation.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/OnOperation.cs index b1dbc31b2..53f19784b 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/OnOperation.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/OnOperation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Parameter.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Parameter.cs index b290e9a74..87bb5caf5 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Parameter.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Parameter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/PrimitiveSchema.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/PrimitiveSchema.cs index bda27b31e..6a7c4c121 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/PrimitiveSchema.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/PrimitiveSchema.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel { diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Property.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Property.cs index 54e400806..20550a805 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Property.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Property.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceSchema.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceSchema.cs index 5965358fd..d55c26c74 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceSchema.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceSchema.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceTypeElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceTypeElement.cs index 40e555cfc..38d5da73b 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceTypeElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferenceTypeElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel { diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraint.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraint.cs index 66d00ca22..64ac3051c 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraint.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraintRoleElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraintRoleElement.cs index f6ed7efc2..d3634f435 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraintRoleElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReferentialConstraintRoleElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Relationship.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Relationship.cs index 5091d573a..b8c9f47ad 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Relationship.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Relationship.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEnd.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEnd.cs index e1806d8a6..fb1f5f1cf 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEnd.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEnd.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEndCollection.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEndCollection.cs index 15314c5f4..e9ec6b566 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEndCollection.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RelationshipEndCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnType.cs index fd81011ad..0a04f994f 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnValue.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnValue.cs index 07c82622a..7ac9a584e 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnValue.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ReturnValue.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypeElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypeElement.cs index b7742c276..99783ac47 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypeElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypeElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypePropertyElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypePropertyElement.cs index cdbd4108a..e17b0b9f0 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypePropertyElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/RowTypePropertyElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ScalarType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ScalarType.cs index 16d543e00..7e2f1be53 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ScalarType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ScalarType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Schema.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Schema.cs index d0a9e7794..a0388683a 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Schema.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Schema.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel @@ -540,13 +540,13 @@ private set } } - // ISSUE: jthunter-03/14/05 - The Sync "schemas" don't follow the ".Store" assembly + // ISSUE: jthunter-03/14/05 - The [....] "schemas" don't follow the ".Store" assembly // naming convention but need to have the right StoreNamespace reported. // private static readonly string[] ClientNamespaceOfSchemasMissingStoreSuffix = { - "System.Storage.Sync.Utility", - "System.Storage.Sync.Services" + "System.Storage.[....].Utility", + "System.Storage.[....].Services" }; /// diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaComplexType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaComplexType.cs index 2a768a1cb..1c4aa5f7a 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaComplexType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaComplexType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElement.cs index 79be13fdd..eed8906e8 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTable.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTable.cs index 25bb4f749..044bb35f3 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTable.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTable.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTableEnumerator.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTableEnumerator.cs index fdcacf10d..428a071ab 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTableEnumerator.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaElementLookUpTableEnumerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumMember.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumMember.cs index ad6c82d1e..6e680d0b7 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumMember.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumMember.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumType.cs index 073088e11..9c3b3153b 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaEnumType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaLookupTable.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaLookupTable.cs index e6ea1117a..3b550b8e6 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaLookupTable.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaLookupTable.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaManager.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaManager.cs index 1afb48b5d..fbb7a3ae9 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaManager.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaType.cs index f20a29651..5e830ffb9 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SchemaType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SridFacetDescriptionElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SridFacetDescriptionElement.cs index 09196b79e..23f186522 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SridFacetDescriptionElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/SridFacetDescriptionElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredProperty.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredProperty.cs index 20c9da270..fb95425bf 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredProperty.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredType.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredType.cs index 887d82668..c95e93da8 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredType.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/StructuredType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TextElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TextElement.cs index 914cb26e5..87637e605 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TextElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TextElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeElement.cs index d0f548aef..36d8b5c77 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel { diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeRefElement.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeRefElement.cs index 29ca6faa0..12e7e50dd 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeRefElement.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeRefElement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeUsageBuilder.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeUsageBuilder.cs index 62786cbaa..6db83bb2c 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeUsageBuilder.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/TypeUsageBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Utils.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Utils.cs index dd3425434..61003c001 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Utils.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/Utils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.EntityModel.SchemaObjectModel diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ValidationHelper.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ValidationHelper.cs index a9ea0c731..1095504e1 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ValidationHelper.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/ValidationHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/XmlSchemaResource.cs b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/XmlSchemaResource.cs index 151fed0e6..eb3f3763f 100644 --- a/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/XmlSchemaResource.cs +++ b/System.Data.Entity/System/Data/EntityModel/SchemaObjectModel/XmlSchemaResource.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; using System.Data.Mapping; diff --git a/System.Data.Entity/System/Data/EntitySqlException.cs b/System.Data.Entity/System/Data/EntitySqlException.cs index 006f09519..d9a0c3b24 100644 --- a/System.Data.Entity/System/Data/EntitySqlException.cs +++ b/System.Data.Entity/System/Data/EntitySqlException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/InternalMappingException.cs b/System.Data.Entity/System/Data/InternalMappingException.cs index 22f12f72e..0626e41a0 100644 --- a/System.Data.Entity/System/Data/InternalMappingException.cs +++ b/System.Data.Entity/System/Data/InternalMappingException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/InvalidCommandTreeException.cs b/System.Data.Entity/System/Data/InvalidCommandTreeException.cs index c07883463..42e6cf01a 100644 --- a/System.Data.Entity/System/Data/InvalidCommandTreeException.cs +++ b/System.Data.Entity/System/Data/InvalidCommandTreeException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/Mapping/BaseMetadataMappingVisitor.cs b/System.Data.Entity/System/Data/Mapping/BaseMetadataMappingVisitor.cs index 52c82e3c7..44b985c6c 100644 --- a/System.Data.Entity/System/Data/Mapping/BaseMetadataMappingVisitor.cs +++ b/System.Data.Entity/System/Data/Mapping/BaseMetadataMappingVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/DefaultObjectMappingItemCollection.cs b/System.Data.Entity/System/Data/Mapping/DefaultObjectMappingItemCollection.cs index e57eacff7..cc0286ea6 100644 --- a/System.Data.Entity/System/Data/Mapping/DefaultObjectMappingItemCollection.cs +++ b/System.Data.Entity/System/Data/Mapping/DefaultObjectMappingItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping { diff --git a/System.Data.Entity/System/Data/Mapping/EntityViewContainer.cs b/System.Data.Entity/System/Data/Mapping/EntityViewContainer.cs index 5d4e87e27..080a4486d 100644 --- a/System.Data.Entity/System/Data/Mapping/EntityViewContainer.cs +++ b/System.Data.Entity/System/Data/Mapping/EntityViewContainer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/EntityViewGenerationAttribute.cs b/System.Data.Entity/System/Data/Mapping/EntityViewGenerationAttribute.cs index 5e6c8a3f8..d6caaa76c 100644 --- a/System.Data.Entity/System/Data/Mapping/EntityViewGenerationAttribute.cs +++ b/System.Data.Entity/System/Data/Mapping/EntityViewGenerationAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.ReturnTypeRenameMapping.cs b/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.ReturnTypeRenameMapping.cs index 18bffc41d..1b9cf0e5d 100644 --- a/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.ReturnTypeRenameMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.ReturnTypeRenameMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.cs b/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.cs index 6c3a297b6..610975820 100644 --- a/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/FunctionImportMapping.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner willa //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/FunctionImportMappingComposable.cs b/System.Data.Entity/System/Data/Mapping/FunctionImportMappingComposable.cs index 7e278377f..f0507d294 100644 --- a/System.Data.Entity/System/Data/Mapping/FunctionImportMappingComposable.cs +++ b/System.Data.Entity/System/Data/Mapping/FunctionImportMappingComposable.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner willa //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/FunctionImportMappingNonComposable.cs b/System.Data.Entity/System/Data/Mapping/FunctionImportMappingNonComposable.cs index a2c85076a..88677a82a 100644 --- a/System.Data.Entity/System/Data/Mapping/FunctionImportMappingNonComposable.cs +++ b/System.Data.Entity/System/Data/Mapping/FunctionImportMappingNonComposable.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner willa //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/Mapping.cs b/System.Data.Entity/System/Data/Mapping/Mapping.cs index b6d419b7b..17f4c59dc 100644 --- a/System.Data.Entity/System/Data/Mapping/Mapping.cs +++ b/System.Data.Entity/System/Data/Mapping/Mapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Mapping/MappingItemCollection.cs b/System.Data.Entity/System/Data/Mapping/MappingItemCollection.cs index aa74a7c7e..c03c1cd57 100644 --- a/System.Data.Entity/System/Data/Mapping/MappingItemCollection.cs +++ b/System.Data.Entity/System/Data/Mapping/MappingItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping diff --git a/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.HashSourceBuilder.cs b/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.HashSourceBuilder.cs index 6a9f710c2..d6f03a94a 100644 --- a/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.HashSourceBuilder.cs +++ b/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.HashSourceBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.cs b/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.cs index bd42445d1..864c5b508 100644 --- a/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.cs +++ b/System.Data.Entity/System/Data/Mapping/MetadataMappingHasherVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ObjectAssociationEndMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectAssociationEndMapping.cs index 694846f49..1500adf78 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectAssociationEndMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectAssociationEndMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ObjectComplexPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectComplexPropertyMapping.cs index a2f034b38..fd72adf2a 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectComplexPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectComplexPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ObjectMemberMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectMemberMapping.cs index 02bb19864..c6e1ac215 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectMemberMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectMemberMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ObjectNavigationPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectNavigationPropertyMapping.cs index 09b9789d7..f77723f4c 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectNavigationPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectNavigationPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ObjectPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectPropertyMapping.cs index 61ff5df99..c0a9472f9 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ObjectTypeMapping.cs b/System.Data.Entity/System/Data/Mapping/ObjectTypeMapping.cs index c0f7e7e40..ebe68f678 100644 --- a/System.Data.Entity/System/Data/Mapping/ObjectTypeMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/ObjectTypeMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping { diff --git a/System.Data.Entity/System/Data/Mapping/StorageAssociationSetMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageAssociationSetMapping.cs index f2a4f7f28..577d30411 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageAssociationSetMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageAssociationSetMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageAssociationTypeMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageAssociationTypeMapping.cs index 8ef29bd37..391865cf6 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageAssociationTypeMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageAssociationTypeMapping.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageComplexPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageComplexPropertyMapping.cs index afa203d18..bcc504de8 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageComplexPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageComplexPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageComplexTypeMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageComplexTypeMapping.cs index cefcdbf04..a8fe6a610 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageComplexTypeMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageComplexTypeMapping.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageConditionPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageConditionPropertyMapping.cs index 5bdf08056..d0ee0d38d 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageConditionPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageConditionPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageEndPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageEndPropertyMapping.cs index b9e1f19bc..a9481990e 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageEndPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageEndPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/StorageEntityContainerMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageEntityContainerMapping.cs index 79082acd4..65b8286e3 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageEntityContainerMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageEntityContainerMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/StorageEntitySetMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageEntitySetMapping.cs index c96d6f796..59d2e3812 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageEntitySetMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageEntitySetMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageEntityTypeMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageEntityTypeMapping.cs index 6ed006dca..41575121e 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageEntityTypeMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageEntityTypeMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/StorageMappingFragment.cs b/System.Data.Entity/System/Data/Mapping/StorageMappingFragment.cs index 6c5a11d38..faa501be9 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageMappingFragment.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageMappingFragment.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.ViewDictionary.cs b/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.ViewDictionary.cs index dcdbffffe..c7a1eb015 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.ViewDictionary.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.ViewDictionary.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.cs b/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.cs index 5dc038524..3bb5addca 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageMappingItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Concurrent; diff --git a/System.Data.Entity/System/Data/Mapping/StorageMappingItemLoader.cs b/System.Data.Entity/System/Data/Mapping/StorageMappingItemLoader.cs index 2c808ecf2..e065c9ab9 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageMappingItemLoader.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageMappingItemLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; diff --git a/System.Data.Entity/System/Data/Mapping/StorageModificationFunctionMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageModificationFunctionMapping.cs index 32eb36cb7..50e659c6b 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageModificationFunctionMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageModificationFunctionMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/StoragePropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/StoragePropertyMapping.cs index b428ed32e..455de5020 100644 --- a/System.Data.Entity/System/Data/Mapping/StoragePropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StoragePropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/StorageScalarPropertyMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageScalarPropertyMapping.cs index 16b34ed9a..84ed3c3e3 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageScalarPropertyMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageScalarPropertyMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Mapping/StorageSetMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageSetMapping.cs index 4da03bdda..d281639e8 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageSetMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageSetMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/StorageTypeMapping.cs b/System.Data.Entity/System/Data/Mapping/StorageTypeMapping.cs index b5f07a835..8d379b498 100644 --- a/System.Data.Entity/System/Data/Mapping/StorageTypeMapping.cs +++ b/System.Data.Entity/System/Data/Mapping/StorageTypeMapping.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/AssociationSetMetadata.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/AssociationSetMetadata.cs index 5037b183a..a3936e775 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/AssociationSetMetadata.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/AssociationSetMetadata.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/ChangeNode.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/ChangeNode.cs index 1eabff48f..0008c3ea0 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/ChangeNode.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/ChangeNode.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/CompositeKey.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/CompositeKey.cs index b44dafdad..bb2195d49 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/CompositeKey.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/CompositeKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/DynamicUpdateCommand.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/DynamicUpdateCommand.cs index 3e46e43dd..0318d9868 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/DynamicUpdateCommand.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/DynamicUpdateCommand.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractedStateEntry.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractedStateEntry.cs index aeac41b95..82a4dd8e5 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractedStateEntry.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractedStateEntry.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractorMetadata.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractorMetadata.cs index 9f7c93219..5f4cc16d3 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractorMetadata.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/ExtractorMetadata.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionMappingTranslator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionMappingTranslator.cs index bb15c28fb..5b4e5b7ad 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionMappingTranslator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionMappingTranslator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal @@ -110,7 +110,7 @@ on end.CorrespondingAssociationEndMember.DeclaringType equals candidateEntry.Ent if (stateEntries.All(e => e.State == EntityState.Unchanged)) { // we shouldn't update the entity if it is unchanged, only update when referenced association is changed. - // if not, then this will trigger a fake update for principal end as describe in + // if not, then this will trigger a fake update for principal end as describe in bug 894569. command = null; } else diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionUpdateCommand.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionUpdateCommand.cs index a735b2cba..8f5b8ae90 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionUpdateCommand.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/FunctionUpdateCommand.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Graph.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Graph.cs index 984fdc727..72db96c3f 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Graph.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Graph.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/KeyManager.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/KeyManager.cs index c742f977e..3027ad55f 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/KeyManager.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/KeyManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.Evaluator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.Evaluator.cs index 0e43c6cad..eb4d369ac 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.Evaluator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.Evaluator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.ExtentPlaceholderCreator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.ExtentPlaceholderCreator.cs index a45bf47ee..578920ab5 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.ExtentPlaceholderCreator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.ExtentPlaceholderCreator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.JoinPredicateVisitor.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.JoinPredicateVisitor.cs index c8845f555..48daf01bc 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.JoinPredicateVisitor.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.JoinPredicateVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.SubstitutingCloneVisitor.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.SubstitutingCloneVisitor.cs index f4fa3a2a0..cc924cef2 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.SubstitutingCloneVisitor.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.SubstitutingCloneVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.cs index 30ad18fab..e8af9fc11 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.JoinPropagator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.cs index 56ad4f943..799d01892 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/Propagator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorResult.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorResult.cs index 4cf4b5252..44b503576 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorResult.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/PropagatorResult.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/RecordConverter.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/RecordConverter.cs index e6dfbe7ae..81ff164b6 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/RecordConverter.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/RecordConverter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/RelationshipConstraintValidator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/RelationshipConstraintValidator.cs index aa5e72d1d..e1e72226d 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/RelationshipConstraintValidator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/RelationshipConstraintValidator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/SourceInterpreter.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/SourceInterpreter.cs index 245956fb0..9718ca9fe 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/SourceInterpreter.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/SourceInterpreter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/TableChangeProcessor.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/TableChangeProcessor.cs index 3acae097f..4567d472c 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/TableChangeProcessor.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/TableChangeProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UndirectedGraph.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UndirectedGraph.cs index 0d0e47133..055dcffd4 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UndirectedGraph.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UndirectedGraph.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommand.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommand.cs index 4de147195..2aa865a3b 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommand.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommand.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommandOrderer.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommandOrderer.cs index 79ed22c37..001046534 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommandOrderer.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCommandOrderer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCompiler.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCompiler.cs index 925fd2017..97eb4d5b0 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCompiler.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateCompiler.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- // For the purposes of the update compiler, the member name fully describes the member diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateExpressionVisitor.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateExpressionVisitor.cs index 9260ac826..f5643a33b 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateExpressionVisitor.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateExpressionVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.Update.Internal diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateTranslator.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateTranslator.cs index 73d15d4f5..ca37def4e 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateTranslator.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/UpdateTranslator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/Update/Internal/ViewLoader.cs b/System.Data.Entity/System/Data/Mapping/Update/Internal/ViewLoader.cs index 487d6c24d..98564d69d 100644 --- a/System.Data.Entity/System/Data/Mapping/Update/Internal/ViewLoader.cs +++ b/System.Data.Entity/System/Data/Mapping/Update/Internal/ViewLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/BasicViewGenerator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/BasicViewGenerator.cs index e62348521..180d906b6 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/BasicViewGenerator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/BasicViewGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration @@ -131,7 +131,7 @@ internal CellTreeNode GroupByRightExtent(CellTreeNode rootNode) foreach (LeafCellTreeNode childNode in rootNode.Children) { // A cell may contain P, P.PA -- we return P - // CHANGE_Microsoft_FEATURE_COMPOSITION Need to fix for composition!! + // CHANGE_[....]_FEATURE_COMPOSITION Need to fix for composition!! EntitySetBase extent = childNode.LeftCellWrapper.RightCellQuery.Extent; // relation or extent to group by Debug.Assert(extent != null, "Each cell must have a right extent"); diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellCreator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellCreator.cs index e58f58fd6..c046b6313 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellCreator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellCreator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellPartitioner.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellPartitioner.cs index e4e322dc8..5d0c913ee 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellPartitioner.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellPartitioner.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellTreeSimplifier.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellTreeSimplifier.cs index a842a88a7..38b12707c 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellTreeSimplifier.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CellTreeSimplifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; @@ -277,7 +277,7 @@ private static Set GetCommonGrandChildren(List n } // effects: Given a list of node, produces a new list in which all // leaf nodes of the same extent are adjacent to each other. Non-leaf - // nodes are also adjacent to each other. CHANGE_Microsoft_IMPROVE: Merge with GroupByRightExtent + // nodes are also adjacent to each other. CHANGE_[....]_IMPROVE: Merge with GroupByRightExtent private static List GroupLeafChildrenByExtent(List nodes) { // Keep track of leaf cells for each extent diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ConfigViewGenerator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ConfigViewGenerator.cs index f771247ae..47c59a98a 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ConfigViewGenerator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ConfigViewGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/AliasedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/AliasedSlot.cs index 499b17c26..6bb05a2b6 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/AliasedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/AliasedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Linq; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/BooleanProjectedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/BooleanProjectedSlot.cs index 113e28387..79a030baf 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/BooleanProjectedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/BooleanProjectedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Mapping.ViewGeneration.Structures; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CaseCqlBlock.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CaseCqlBlock.cs index e8ba88d0a..950e3e963 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CaseCqlBlock.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CaseCqlBlock.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Mapping.ViewGeneration.Structures; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlBlock.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlBlock.cs index 7c4eba699..98164a94b 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlBlock.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlBlock.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Linq; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlIdentifiers.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlIdentifiers.cs index c4db94301..9c7734fb8 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlIdentifiers.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlIdentifiers.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlWriter.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlWriter.cs index 429ed1b1f..81fc02884 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlWriter.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/CqlWriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Text.RegularExpressions; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/ExtentCqlBlock.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/ExtentCqlBlock.cs index c4a679140..f85ee2359 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/ExtentCqlBlock.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/ExtentCqlBlock.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Text; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/JoinCqlBlock.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/JoinCqlBlock.cs index 408f2a90b..45c0a5f07 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/JoinCqlBlock.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/JoinCqlBlock.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/SlotInfo.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/SlotInfo.cs index 3d33ff07f..eb2afc5c0 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/SlotInfo.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/SlotInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/UnionCqlBlock.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/UnionCqlBlock.cs index 95dffb4d6..2c7b8c23f 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/UnionCqlBlock.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGeneration/UnionCqlBlock.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGenerator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGenerator.cs index 37005f747..00988416f 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGenerator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/CqlGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/DiscriminatorMap.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/DiscriminatorMap.cs index 5abadcbd1..0c7848e3f 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/DiscriminatorMap.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/DiscriminatorMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/GeneratedView.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/GeneratedView.cs index bec352a06..3c2c331ce 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/GeneratedView.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/GeneratedView.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQuery.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQuery.cs index 6c94e5038..934e2018a 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQuery.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryKB.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryKB.cs index ae6ec4120..cffda30fd 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryKB.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryKB.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryProcessor.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryProcessor.cs index f13c6dc47..01754ba8c 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryProcessor.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/FragmentQueryProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/QueryRewriter.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/QueryRewriter.cs index 60fc38179..d209d9f80 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/QueryRewriter.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/QueryRewriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.QueryRewriting diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingPass.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingPass.cs index ae9abeb5c..860db188a 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingPass.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingPass.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingProcessor.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingProcessor.cs index 41c4e1dd9..df892676b 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingProcessor.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingSimplifier.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingSimplifier.cs index 4a28e458c..55d91edbd 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingSimplifier.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingSimplifier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingValidator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingValidator.cs index 588dfe0f4..4f1d21f57 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingValidator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RewritingValidator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Validation diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RoleBoolean.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RoleBoolean.cs index 2f944c42f..8a1ae2c20 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RoleBoolean.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/RoleBoolean.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/Tile.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/Tile.cs index c949b5681..8d490f590 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/Tile.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/QueryRewriting/Tile.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpression.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpression.cs index 3fd29a627..c44639280 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpression.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpression.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; @@ -366,7 +366,7 @@ internal BoolExpression RemapBool(Dictionary remap) // effects: Given a list of bools, returns a list of boolean expressions where each // boolean in bools has been ANDed with conjunct - // CHANGE_Microsoft_IMPROVE: replace with lambda pattern + // CHANGE_[....]_IMPROVE: replace with lambda pattern internal static List AddConjunctionToBools(List bools, BoolExpression conjunct) { diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpressionVisitors.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpressionVisitors.cs index ade70afbb..fc4c19680 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpressionVisitors.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolExpressionVisitors.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolLiteral.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolLiteral.cs index 64fdf5372..babeaa62f 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolLiteral.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/BoolLiteral.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatement.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatement.cs index 6e6e4d40d..1c1251178 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatement.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatementProjectedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatementProjectedSlot.cs index 8cdc34aed..ee74e3a1b 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatementProjectedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CaseStatementProjectedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Mapping.ViewGeneration.CqlGeneration; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Cell.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Cell.cs index d7bc34322..8fa4646bf 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Cell.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Cell.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellIdBoolean.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellIdBoolean.cs index 97740718c..251f86b8e 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellIdBoolean.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellIdBoolean.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellLabel.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellLabel.cs index bf02ac8aa..4cc45bfd8 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellLabel.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellLabel.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellQuery.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellQuery.cs index 3ed84c612..43f8b6814 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellQuery.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNode.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNode.cs index ecb925ac2..6bce7b75e 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNode.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNode.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNodeVisitors.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNodeVisitors.cs index 351a94165..2c78985a0 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNodeVisitors.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/CellTreeNodeVisitors.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Constant.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Constant.cs index c90fbb668..a77b8a4ab 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Constant.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Constant.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ConstantProjectedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ConstantProjectedSlot.cs index 4c9c27cbd..93a14b964 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ConstantProjectedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ConstantProjectedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Mapping.ViewGeneration.CqlGeneration; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Domain.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Domain.cs index 57b4f8fab..244c548fc 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Domain.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/Domain.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; @@ -177,7 +177,7 @@ private static CellConstantSet DeriveDomainFromType(EdmType type, EdmItemCollect // effect: returns the default value for the member // if the member is nullable and has no default, changes default value to CellConstant.NULL and returns true // if the mebmer is not nullable and has no default, returns false - // CHANGE_Microsoft_FEATURE_DEFAULT_VALUES: return the right default once metadata supports it + // CHANGE_[....]_FEATURE_DEFAULT_VALUES: return the right default once metadata supports it internal static bool TryGetDefaultValueForMemberPath(MemberPath memberPath, out Constant defaultConstant) { object defaultValue = memberPath.DefaultValue; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ErrorLog.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ErrorLog.cs index ba65fe75c..6b312d1ee 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ErrorLog.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ErrorLog.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeafCellTreeNode.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeafCellTreeNode.cs index 5b37f45fc..bf49103be 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeafCellTreeNode.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeafCellTreeNode.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeftCellWrapper.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeftCellWrapper.cs index a67833981..66778f774 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeftCellWrapper.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/LeftCellWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberDomainMap.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberDomainMap.cs index 47e31c66e..83dbe8c00 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberDomainMap.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberDomainMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberMaps.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberMaps.cs index 5ecce1d31..3fed309b1 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberMaps.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberMaps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberPath.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberPath.cs index ba48a1389..ad0dff468 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberPath.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberPath.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectedSlot.cs index b17ce971f..a58b37712 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectionIndex.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectionIndex.cs index d36c26c23..b508995fe 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectionIndex.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberProjectionIndex.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberRestriction.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberRestriction.cs index fc63a2926..797e1e675 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberRestriction.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/MemberRestriction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/NegatedConstant.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/NegatedConstant.cs index 9c671fe6b..fa8f05cfa 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/NegatedConstant.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/NegatedConstant.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs index 231b1563c..362e9ff84 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/OpCellTreeNode.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ProjectedSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ProjectedSlot.cs index 48e2157c2..5fda4c615 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ProjectedSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ProjectedSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Structures diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/QualifiedCellIdBoolean.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/QualifiedCellIdBoolean.cs index 8ad476f87..b9800cf93 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/QualifiedCellIdBoolean.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/QualifiedCellIdBoolean.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarConstant.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarConstant.cs index dca95d825..a7219d6e2 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarConstant.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarConstant.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Text; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarRestriction.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarRestriction.cs index 59fa8a68f..722aa09c7 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarRestriction.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/ScalarRestriction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeConstant.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeConstant.cs index 703f81096..6dd961fd2 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeConstant.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeConstant.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Text; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeRestriction.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeRestriction.cs index a17ef9ea3..c4cb20d73 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeRestriction.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/TypeRestriction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/WithStatement.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/WithStatement.cs index 2d262cf77..d609a2fe7 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/WithStatement.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Structures/WithStatement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExceptionHelpers.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExceptionHelpers.cs index fffdf5ad1..8166c317f 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExceptionHelpers.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExceptionHelpers.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Text; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExternalCalls.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExternalCalls.cs index 5fb40d871..befe9b356 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExternalCalls.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Utils/ExternalCalls.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicCellRelation.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicCellRelation.cs index fbd9c76e8..366035326 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicCellRelation.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicCellRelation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved.Bharani1729 // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; @@ -88,7 +88,7 @@ private void PopulateKeyConstraintsForRelationshipSet(BasicSchemaConstraints con { AssociationSet relationshipSet = m_cellQuery.Extent as AssociationSet; // Gather all members of all keys - // CHANGE_Microsoft_FEATURE_KEYS: assume that an Entity has exactly one key. Otherwise we + // CHANGE_[....]_FEATURE_KEYS: assume that an Entity has exactly one key. Otherwise we // have to take a cross-product of all keys // Keep track of all the key members for the association in a set diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicKeyConstraint.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicKeyConstraint.cs index 299fe131d..b52c62ee4 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicKeyConstraint.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/BasicKeyConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/CellRelation.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/CellRelation.cs index ac9c66cb6..1824b2900 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/CellRelation.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/CellRelation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ErrorPatternMatcher.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ErrorPatternMatcher.cs index b57ab576f..918b7ff0d 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ErrorPatternMatcher.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ErrorPatternMatcher.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ExtentKey.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ExtentKey.cs index a89bf8271..eceb6063e 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ExtentKey.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ExtentKey.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- @@ -49,7 +49,7 @@ internal IEnumerable KeyFields // -- prefix is prepended to the entity's key fields to get the full memberpath internal static List GetKeysForEntityType(MemberPath prefix, EntityType entityType) { - // CHANGE_Microsoft_MULTIPLE_KEYS: currently there is a single key only. Need to support + // CHANGE_[....]_MULTIPLE_KEYS: currently there is a single key only. Need to support // keys inside complex types + unique keys ExtentKey key = GetPrimaryKeyForEntityType(prefix, entityType); diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ForeignConstraint.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ForeignConstraint.cs index 28c9c71a9..b4cbd3202 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ForeignConstraint.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ForeignConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/KeyConstraint.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/KeyConstraint.cs index e9de9dcdb..7de844253 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/KeyConstraint.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/KeyConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/SchemaConstraints.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/SchemaConstraints.cs index 8e43ff8f0..a3eb207a5 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/SchemaConstraints.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/SchemaConstraints.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellRelation.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellRelation.cs index dc4799b9a..be91192de 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellRelation.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellRelation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; @@ -62,7 +62,7 @@ internal Cell Cell // null if it does not find the slot in the left or right side of the viewrelation internal ViewCellSlot LookupViewSlot(MemberProjectedSlot slot) { - // CHANGE_Microsoft_IMPROVE: We could have a dictionary to speed this up + // CHANGE_[....]_IMPROVE: We could have a dictionary to speed this up foreach (ViewCellSlot viewSlot in m_slots) { // If the left or right slots are equal, return the viewSlot diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellSlot.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellSlot.cs index fea993596..9b9fe6921 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellSlot.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewCellSlot.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Validation diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewKeyConstraint.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewKeyConstraint.cs index a8898c241..704c122b1 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewKeyConstraint.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validation/ViewKeyConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration.Validation diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validator.cs index 497a193d4..a8b380e66 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/Validator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenResults.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenResults.cs index a0348faf7..1061c52a5 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenResults.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenResults.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenerator.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenerator.cs index 96d9d83e9..8c5618e7a 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenerator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.CommandTrees; @@ -492,7 +492,7 @@ private static KeyToListMap GroupCellsByExtent(IEnumerable< { // Partition cells by extent -- extent is the top node in - // the tree. Even for compositions for now? CHANGE_Microsoft_FEATURE_COMPOSITION + // the tree. Even for compositions for now? CHANGE_[....]_FEATURE_COMPOSITION KeyToListMap extentCellMap = new KeyToListMap(EqualityComparer.Default); foreach (Cell cell in cells) diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenContext.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenContext.cs index b23ecf6a9..50bb0142b 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenContext.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenContext.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping.ViewGeneration diff --git a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenGatekeeper.cs b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenGatekeeper.cs index 20bf0b8be..f7a1d4113 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenGatekeeper.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewGeneration/ViewgenGatekeeper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Mapping/ViewValidator.cs b/System.Data.Entity/System/Data/Mapping/ViewValidator.cs index cce9f4315..2ab3c302c 100644 --- a/System.Data.Entity/System/Data/Mapping/ViewValidator.cs +++ b/System.Data.Entity/System/Data/Mapping/ViewValidator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Mapping diff --git a/System.Data.Entity/System/Data/MappingException.cs b/System.Data.Entity/System/Data/MappingException.cs index 0cd23d838..4c8e9d1c5 100644 --- a/System.Data.Entity/System/Data/MappingException.cs +++ b/System.Data.Entity/System/Data/MappingException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/Metadata/AspProxy.cs b/System.Data.Entity/System/Data/Metadata/AspProxy.cs index 440497527..cf39195f0 100644 --- a/System.Data.Entity/System/Data/Metadata/AspProxy.cs +++ b/System.Data.Entity/System/Data/Metadata/AspProxy.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/CacheForPrimitiveTypes.cs b/System.Data.Entity/System/Data/Metadata/CacheForPrimitiveTypes.cs index cc3c04e0c..100159b7c 100644 --- a/System.Data.Entity/System/Data/Metadata/CacheForPrimitiveTypes.cs +++ b/System.Data.Entity/System/Data/Metadata/CacheForPrimitiveTypes.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/ClrPerspective.cs b/System.Data.Entity/System/Data/Metadata/ClrPerspective.cs index 96cb27bb7..708896590 100644 --- a/System.Data.Entity/System/Data/Metadata/ClrPerspective.cs +++ b/System.Data.Entity/System/Data/Metadata/ClrPerspective.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Converter.cs b/System.Data.Entity/System/Data/Metadata/Converter.cs index 40d2b765e..eb4e61ec3 100644 --- a/System.Data.Entity/System/Data/Metadata/Converter.cs +++ b/System.Data.Entity/System/Data/Metadata/Converter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/CustomAssemblyResolver.cs b/System.Data.Entity/System/Data/Metadata/CustomAssemblyResolver.cs index 608bdd56c..2ed13e505 100644 --- a/System.Data.Entity/System/Data/Metadata/CustomAssemblyResolver.cs +++ b/System.Data.Entity/System/Data/Metadata/CustomAssemblyResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/DefaultAssemblyResolver.cs b/System.Data.Entity/System/Data/Metadata/DefaultAssemblyResolver.cs index 134045fee..a5abcab9c 100644 --- a/System.Data.Entity/System/Data/Metadata/DefaultAssemblyResolver.cs +++ b/System.Data.Entity/System/Data/Metadata/DefaultAssemblyResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Reflection; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/AssociationEndMember.cs b/System.Data.Entity/System/Data/Metadata/Edm/AssociationEndMember.cs index 33511243f..48490fa5e 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/AssociationEndMember.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/AssociationEndMember.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/AssociationSet.cs b/System.Data.Entity/System/Data/Metadata/Edm/AssociationSet.cs index 64df1f868..e0d165556 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/AssociationSet.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/AssociationSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/AssociationSetEnd.cs b/System.Data.Entity/System/Data/Metadata/Edm/AssociationSetEnd.cs index b6c5cbd43..3fe246c32 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/AssociationSetEnd.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/AssociationSetEnd.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/AssociationType.cs b/System.Data.Entity/System/Data/Metadata/Edm/AssociationType.cs index f12462b1c..bc7283105 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/AssociationType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/AssociationType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/CollectionType.cs b/System.Data.Entity/System/Data/Metadata/Edm/CollectionType.cs index debab7686..27f49ab65 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/CollectionType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/CollectionType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/ComplexType.cs b/System.Data.Entity/System/Data/Metadata/Edm/ComplexType.cs index ad0fe21a1..b3aa9751c 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/ComplexType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/ComplexType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common; using System.Threading; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Documentation.cs b/System.Data.Entity/System/Data/Metadata/Edm/Documentation.cs index c036a9c0e..38f6d3d35 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Documentation.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Documentation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EdmConstants.cs b/System.Data.Entity/System/Data/Metadata/Edm/EdmConstants.cs index b85a830d4..45ce070b2 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EdmConstants.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EdmConstants.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EdmFunction.cs b/System.Data.Entity/System/Data/Metadata/Edm/EdmFunction.cs index 29632cdfb..a9c0b1672 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EdmFunction.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EdmFunction.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EdmMember.cs b/System.Data.Entity/System/Data/Metadata/Edm/EdmMember.cs index e04b01429..2a5f5c8d8 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EdmMember.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EdmMember.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EdmProperty.cs b/System.Data.Entity/System/Data/Metadata/Edm/EdmProperty.cs index b1529dde6..0d42381f4 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EdmProperty.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EdmProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EdmType.cs b/System.Data.Entity/System/Data/Metadata/Edm/EdmType.cs index c324b5475..39a25ab74 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EdmType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EdmType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common; using System.Globalization; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntityContainer.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntityContainer.cs index a51c2f59c..e04b365e3 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntityContainer.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntityContainer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntitySet.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntitySet.cs index 500c7b269..d22fccf9b 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntitySet.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntitySet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBase.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBase.cs index 8b09606a6..0679dfe8a 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBase.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBaseCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBaseCollection.cs index e0a884a84..72ba6079d 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBaseCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntitySetBaseCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntityType.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntityType.cs index 60d95712d..65f780409 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntityType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntityType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EntityTypeBase.cs b/System.Data.Entity/System/Data/Metadata/Edm/EntityTypeBase.cs index 2cf2e39ec..d3776b976 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EntityTypeBase.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EntityTypeBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { @@ -64,8 +64,8 @@ public ReadOnlyMetadataCollection KeyMembers /// /// Returns the list of the member names that form the key for this entity type - /// Perf - + /// Perf Bug #529294: To cache the list of member names that form the key for the entity type + /// internal string[] KeyMemberNames { get @@ -80,7 +80,7 @@ internal string[] KeyMemberNames } _keyMemberNames = keyNames; } - Debug.Assert(_keyMemberNames.Length == this.KeyMembers.Count, "This list is out of sync with the key members count. This property was called before all the keymembers were added"); + Debug.Assert(_keyMemberNames.Length == this.KeyMembers.Count, "This list is out of [....] with the key members count. This property was called before all the keymembers were added"); return _keyMemberNames; } } diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EnumMember.cs b/System.Data.Entity/System/Data/Metadata/Edm/EnumMember.cs index ef089ea63..da510a866 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EnumMember.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EnumMember.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/EnumType.cs b/System.Data.Entity/System/Data/Metadata/Edm/EnumType.cs index 1c4df323c..29488511a 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/EnumType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/EnumType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Facet.cs b/System.Data.Entity/System/Data/Metadata/Edm/Facet.cs index af7f75517..5e985eb5a 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Facet.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Facet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Edm/FacetDescription.cs b/System.Data.Entity/System/Data/Metadata/Edm/FacetDescription.cs index 4a8670c27..3bb0c373d 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/FacetDescription.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/FacetDescription.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/FacetValueContainer.cs b/System.Data.Entity/System/Data/Metadata/Edm/FacetValueContainer.cs index d87d9a593..ef7173e62 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/FacetValueContainer.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/FacetValueContainer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/FacetValues.cs b/System.Data.Entity/System/Data/Metadata/Edm/FacetValues.cs index 25cf2a8c4..93cba7cd8 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/FacetValues.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/FacetValues.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/FilteredReadOnlyMetadataCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/FilteredReadOnlyMetadataCollection.cs index 53325caf1..6595c4602 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/FilteredReadOnlyMetadataCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/FilteredReadOnlyMetadataCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -27,7 +27,7 @@ internal interface IBaseList : IList int IndexOf(T item); } -#pragma warning disable 1711 // compiler +#pragma warning disable 1711 // compiler bug: reports TDerived and TBase as type parameters for non-existing IsReadOnly property /// /// Class to filter stuff out from a metadata collection /// diff --git a/System.Data.Entity/System/Data/Metadata/Edm/FunctionParameter.cs b/System.Data.Entity/System/Data/Metadata/Edm/FunctionParameter.cs index 326e416c8..005a5db56 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/FunctionParameter.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/FunctionParameter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/GlobalItem.cs b/System.Data.Entity/System/Data/Metadata/Edm/GlobalItem.cs index 4b768e481..1e1e1517d 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/GlobalItem.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/GlobalItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/ItemCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/ItemCollection.cs index de0b94047..d04aa0731 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/ItemCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/ItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Edm/LightweightCodeGenerator.cs b/System.Data.Entity/System/Data/Metadata/Edm/LightweightCodeGenerator.cs index cc60a7a0f..fc0e9e2a5 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/LightweightCodeGenerator.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/LightweightCodeGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MemberCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/MemberCollection.cs index 155f65559..c2f9cbd86 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MemberCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MemberCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataCollection.cs index e62dd919b..36535c8a0 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -28,7 +28,7 @@ internal class MetadataCollection : IList where T : MetadataItem // The way the collection supports both case sensitive and insensitive search is that it maintains two lists: one list // for keep tracking of the order (the ordered list) and another list sorted case sensitively (the sorted list) by the // identity of the item. When a look up on ordinal is requested, the ordered list is used. When a look up on the name - // is requested, the sorted list is used. The two list must be kept in sync for all update operations. For case + // is requested, the sorted list is used. The two list must be kept in [....] for all update operations. For case // sensitive name lookup, the sorted list is searched. For case insensitive name lookup, a binary search is used on the // sorted list to find the match. diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem.cs index 04e93f764..a99c0292b 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem_Static.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem_Static.cs index e8da22d70..126c4b7a9 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem_Static.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataItem_Static.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataProperty.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataProperty.cs index 0fe365f08..b8ac93d07 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataProperty.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyAttribute.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyAttribute.cs index 3e0684456..471301f36 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyAttribute.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyCollection.cs index b8119608c..6ae122150 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyvalue.cs b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyvalue.cs index 8fdb0eca6..26897499b 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyvalue.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/MetadataPropertyvalue.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/NavigationProperty.cs b/System.Data.Entity/System/Data/Metadata/Edm/NavigationProperty.cs index e8525f7cc..721725925 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/NavigationProperty.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/NavigationProperty.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/NavigationPropertyAccessor.cs b/System.Data.Entity/System/Data/Metadata/Edm/NavigationPropertyAccessor.cs index d9e8da11d..52a8949ac 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/NavigationPropertyAccessor.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/NavigationPropertyAccessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveType.cs b/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveType.cs index 89ccf2a65..5e644eb56 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/PrimitiveType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Provider/ClrProviderManifest.cs b/System.Data.Entity/System/Data/Metadata/Edm/Provider/ClrProviderManifest.cs index 126408018..82627c485 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Provider/ClrProviderManifest.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Provider/ClrProviderManifest.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifest.cs b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifest.cs index 372fabbca..cb2f50ddb 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifest.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifest.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestFunctionBuilder.cs b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestFunctionBuilder.cs index 69d4bf334..fbbf97d8c 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestFunctionBuilder.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestFunctionBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestSpatialFunctions.cs b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestSpatialFunctions.cs index b34b15786..19fc7d196 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestSpatialFunctions.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/Provider/EdmProviderManifestSpatialFunctions.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //-------------------------------------------------------------------------- // This file is automatically generated and should not be changed directly. // diff --git a/System.Data.Entity/System/Data/Metadata/Edm/ReadOnlyMetadataCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/ReadOnlyMetadataCollection.cs index 1d57ceb9d..3f60afa59 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/ReadOnlyMetadataCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/ReadOnlyMetadataCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; @@ -199,10 +199,10 @@ public virtual bool TryGetValue(string identity, bool ignoreCase, out T item) } /// - /// Workaround for - - - + /// Workaround for bug + /// + /// + /// public new virtual int IndexOf(T value) { return base.IndexOf(value); diff --git a/System.Data.Entity/System/Data/Metadata/Edm/RefType.cs b/System.Data.Entity/System/Data/Metadata/Edm/RefType.cs index 8c8184cbb..d33335f4e 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/RefType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/RefType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/ReferentialConstraint.cs b/System.Data.Entity/System/Data/Metadata/Edm/ReferentialConstraint.cs index 051d7bfea..71295ba55 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/ReferentialConstraint.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/ReferentialConstraint.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipEndMember.cs b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipEndMember.cs index 81225a715..4a635d82d 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipEndMember.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipEndMember.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipSet.cs b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipSet.cs index 39ba5e07a..f4714eccf 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipSet.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipType.cs b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipType.cs index 1e3b04274..46c0107a6 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/RelationshipType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/RelationshipType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/RowType.cs b/System.Data.Entity/System/Data/Metadata/Edm/RowType.cs index 3285477da..0b954067d 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/RowType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/RowType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/SafeLink.cs b/System.Data.Entity/System/Data/Metadata/Edm/SafeLink.cs index 563a8b5d1..22e4126b5 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/SafeLink.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/SafeLink.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //---------------------------------------------------------------------using System; using System.Collections.Generic; using System.Linq; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/SafeLinkCollection.cs b/System.Data.Entity/System/Data/Metadata/Edm/SafeLinkCollection.cs index 43b3fa00f..39a0c85d9 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/SafeLinkCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/SafeLinkCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/SimpleType.cs b/System.Data.Entity/System/Data/Metadata/Edm/SimpleType.cs index 82c07fbd4..554cbcdc7 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/SimpleType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/SimpleType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/StructuralType.cs b/System.Data.Entity/System/Data/Metadata/Edm/StructuralType.cs index dea24673f..66fe1c7e2 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/StructuralType.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/StructuralType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/Edm/TypeUsage.cs b/System.Data.Entity/System/Data/Metadata/Edm/TypeUsage.cs index 308c2bc68..29308e0a4 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/TypeUsage.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/TypeUsage.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Edm/util.cs b/System.Data.Entity/System/Data/Metadata/Edm/util.cs index 3ea3b7036..b54adc330 100644 --- a/System.Data.Entity/System/Data/Metadata/Edm/util.cs +++ b/System.Data.Entity/System/Data/Metadata/Edm/util.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/EdmError.cs b/System.Data.Entity/System/Data/Metadata/EdmError.cs index e2915eed0..883a09574 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmError.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmError.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/EdmItemCollection.OcAssemblyCache.cs b/System.Data.Entity/System/Data/Metadata/EdmItemCollection.OcAssemblyCache.cs index 19f0082a3..b6cf23948 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmItemCollection.OcAssemblyCache.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmItemCollection.OcAssemblyCache.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Reflection; diff --git a/System.Data.Entity/System/Data/Metadata/EdmItemCollection.cs b/System.Data.Entity/System/Data/Metadata/EdmItemCollection.cs index ca1d2be40..570ad901c 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmItemCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/EdmItemError.cs b/System.Data.Entity/System/Data/Metadata/EdmItemError.cs index c18d3a5ca..feee36878 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmItemError.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmItemError.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/EdmSchemaError.cs b/System.Data.Entity/System/Data/Metadata/EdmSchemaError.cs index e6a143183..7769c0938 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmSchemaError.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmSchemaError.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/EdmValidator.cs b/System.Data.Entity/System/Data/Metadata/EdmValidator.cs index 9aca70f70..45822d9d4 100644 --- a/System.Data.Entity/System/Data/Metadata/EdmValidator.cs +++ b/System.Data.Entity/System/Data/Metadata/EdmValidator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/Helper.cs b/System.Data.Entity/System/Data/Metadata/Helper.cs index ac6358abf..392270ccd 100644 --- a/System.Data.Entity/System/Data/Metadata/Helper.cs +++ b/System.Data.Entity/System/Data/Metadata/Helper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/MappingMetadataHelper.cs b/System.Data.Entity/System/Data/Metadata/MappingMetadataHelper.cs index 38916861f..80fefe077 100644 --- a/System.Data.Entity/System/Data/Metadata/MappingMetadataHelper.cs +++ b/System.Data.Entity/System/Data/Metadata/MappingMetadataHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoader.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoader.cs index 215b129f8..d393a6b4d 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderComposite.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderComposite.cs index 3f1a54b1f..0338f5466 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderComposite.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderComposite.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeFile.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeFile.cs index 77769e760..f81c3bffd 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeFile.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeFile.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeResource.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeResource.cs index 344a60e79..959e6617f 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeResource.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderCompositeResource.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderFile.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderFile.cs index ca04d7a87..3fd746c44 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderFile.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderFile.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderResource.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderResource.cs index 419e2f1f0..7b6927c64 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderResource.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderResource.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderXmlReaderWrapper.cs b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderXmlReaderWrapper.cs index e83fa0c9a..8624eb4bf 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderXmlReaderWrapper.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataArtifactLoaderXmlReaderWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/MetadataCache.cs b/System.Data.Entity/System/Data/Metadata/MetadataCache.cs index 340a26d7f..d9701d510 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataCache.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataCache.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/MetadataWorkspace.cs b/System.Data.Entity/System/Data/Metadata/MetadataWorkspace.cs index 831428fee..065255828 100644 --- a/System.Data.Entity/System/Data/Metadata/MetadataWorkspace.cs +++ b/System.Data.Entity/System/Data/Metadata/MetadataWorkspace.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ModelPerspective.cs b/System.Data.Entity/System/Data/Metadata/ModelPerspective.cs index 90cc7b12f..855de302a 100644 --- a/System.Data.Entity/System/Data/Metadata/ModelPerspective.cs +++ b/System.Data.Entity/System/Data/Metadata/ModelPerspective.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ObjectHelper.cs b/System.Data.Entity/System/Data/Metadata/ObjectHelper.cs index abde1abf2..6d966224d 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectHelper.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Mapping; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectItemCollection.cs b/System.Data.Entity/System/Data/Metadata/ObjectItemCollection.cs index 2c79eb40d..ccbb10a43 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectItemCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCache.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCache.cs index 1c8a8b9fe..02d09f98b 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCache.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCache.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCacheEntry.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCacheEntry.cs index b5c6ec4f6..fdaab763c 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCacheEntry.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/AssemblyCacheEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ImmutableAssemblyCacheEntry.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ImmutableAssemblyCacheEntry.cs index f21a47597..e6804614e 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ImmutableAssemblyCacheEntry.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ImmutableAssemblyCacheEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssembliesSet.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssembliesSet.cs index 116233108..608f707ef 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssembliesSet.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssembliesSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssemblyEntry.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssemblyEntry.cs index ca0b6bd37..2a59d2d69 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssemblyEntry.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/KnownAssemblyEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/LoadMessageLogger.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/LoadMessageLogger.cs index e4501a214..911045164 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/LoadMessageLogger.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/LoadMessageLogger.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/LockedAssemblyCache.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/LockedAssemblyCache.cs index a81ccee2c..43ef352db 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/LockedAssemblyCache.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/LockedAssemblyCache.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/MetadataAssemblyHelper.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/MetadataAssemblyHelper.cs index ebaad4ec1..7229c3b83 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/MetadataAssemblyHelper.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/MetadataAssemblyHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Reflection; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/MutableAssemblyCacheEntry.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/MutableAssemblyCacheEntry.cs index f44d9d1d1..e17dcb220 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/MutableAssemblyCacheEntry.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/MutableAssemblyCacheEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAssemblyLoader.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAssemblyLoader.cs index bbadb7cc5..a394eecea 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAssemblyLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAssemblyLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAttributeAssemblyLoader.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAttributeAssemblyLoader.cs index c54f6bbd7..610f1f067 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAttributeAssemblyLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemAttributeAssemblyLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemCachedAssemblyLoader.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemCachedAssemblyLoader.cs index 9cf8fae6e..d1db7caeb 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemCachedAssemblyLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemCachedAssemblyLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemConventionAssemblyLoader.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemConventionAssemblyLoader.cs index a336bab04..d6f3c2dda 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemConventionAssemblyLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemConventionAssemblyLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemLoadingSessionData.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemLoadingSessionData.cs index f033bc476..bfb63d99f 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemLoadingSessionData.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemLoadingSessionData.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Reflection; using System.Linq; diff --git a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemNoOpAssemblyLoader.cs b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemNoOpAssemblyLoader.cs index 45a60e927..87c4d7d3e 100644 --- a/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemNoOpAssemblyLoader.cs +++ b/System.Data.Entity/System/Data/Metadata/ObjectLayer/ObjectItemNoOpAssemblyLoader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Reflection; diff --git a/System.Data.Entity/System/Data/Metadata/Perspective.cs b/System.Data.Entity/System/Data/Metadata/Perspective.cs index c8f6ff312..b3834ecef 100644 --- a/System.Data.Entity/System/Data/Metadata/Perspective.cs +++ b/System.Data.Entity/System/Data/Metadata/Perspective.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Diagnostics; using System.Linq; diff --git a/System.Data.Entity/System/Data/Metadata/StoreItemCollection.Loader.cs b/System.Data.Entity/System/Data/Metadata/StoreItemCollection.Loader.cs index 0583ffef5..ede35e321 100644 --- a/System.Data.Entity/System/Data/Metadata/StoreItemCollection.Loader.cs +++ b/System.Data.Entity/System/Data/Metadata/StoreItemCollection.Loader.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/StoreItemCollection.cs b/System.Data.Entity/System/Data/Metadata/StoreItemCollection.cs index 585dfca18..8d3db3692 100644 --- a/System.Data.Entity/System/Data/Metadata/StoreItemCollection.cs +++ b/System.Data.Entity/System/Data/Metadata/StoreItemCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm { diff --git a/System.Data.Entity/System/Data/Metadata/TargetPerspective.cs b/System.Data.Entity/System/Data/Metadata/TargetPerspective.cs index 4f52bfdd8..372a6d867 100644 --- a/System.Data.Entity/System/Data/Metadata/TargetPerspective.cs +++ b/System.Data.Entity/System/Data/Metadata/TargetPerspective.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Metadata.Edm diff --git a/System.Data.Entity/System/Data/Metadata/TypeHelpers.cs b/System.Data.Entity/System/Data/Metadata/TypeHelpers.cs index a08529d31..a3f8e6394 100644 --- a/System.Data.Entity/System/Data/Metadata/TypeHelpers.cs +++ b/System.Data.Entity/System/Data/Metadata/TypeHelpers.cs @@ -3,8 +3,8 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Common diff --git a/System.Data.Entity/System/Data/Metadata/TypeSemantics.cs b/System.Data.Entity/System/Data/Metadata/TypeSemantics.cs index 0c0df5560..5142269ba 100644 --- a/System.Data.Entity/System/Data/Metadata/TypeSemantics.cs +++ b/System.Data.Entity/System/Data/Metadata/TypeSemantics.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/MetadataException.cs b/System.Data.Entity/System/Data/MetadataException.cs index bd0cfb075..67eafde4e 100644 --- a/System.Data.Entity/System/Data/MetadataException.cs +++ b/System.Data.Entity/System/Data/MetadataException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/ObjectNotFoundException.cs b/System.Data.Entity/System/Data/ObjectNotFoundException.cs index 9247b2e59..d0496ab15 100644 --- a/System.Data.Entity/System/Data/ObjectNotFoundException.cs +++ b/System.Data.Entity/System/Data/ObjectNotFoundException.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, nkline +// @owner [....], nkline //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/Objects/AdditionalEntityFunctions.cs b/System.Data.Entity/System/Data/Objects/AdditionalEntityFunctions.cs index 36c949997..2ca2abe88 100644 --- a/System.Data.Entity/System/Data/Objects/AdditionalEntityFunctions.cs +++ b/System.Data.Entity/System/Data/Objects/AdditionalEntityFunctions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects { diff --git a/System.Data.Entity/System/Data/Objects/CompiledQuery.cs b/System.Data.Entity/System/Data/Objects/CompiledQuery.cs index c3f31fb4b..96f6bb6be 100644 --- a/System.Data.Entity/System/Data/Objects/CompiledQuery.cs +++ b/System.Data.Entity/System/Data/Objects/CompiledQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/ComplexObject.cs b/System.Data.Entity/System/Data/Objects/DataClasses/ComplexObject.cs index fd606f818..c63108a63 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/ComplexObject.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/ComplexObject.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data; using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexPropertyAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexPropertyAttribute.cs index 857cc0432..61a7498be 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexPropertyAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexPropertyAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexTypeAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexTypeAttribute.cs index 05f2fcc71..6f4d556f0 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexTypeAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmComplexTypeAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmEntityTypeAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmEntityTypeAttribute.cs index 79b9c4bc3..495c0fdee 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmEntityTypeAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmEntityTypeAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmEnumTypeAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmEnumTypeAttribute.cs index 208b57f3c..01e1acce1 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmEnumTypeAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmEnumTypeAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmFunctionAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmFunctionAttribute.cs index 59029670e..af990b078 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmFunctionAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmFunctionAttribute.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmPropertyAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmPropertyAttribute.cs index e9d288628..0897a9d25 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmPropertyAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmPropertyAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipNavigationPropertyAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipNavigationPropertyAttribute.cs index 3ce546554..e94eeb442 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipNavigationPropertyAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipNavigationPropertyAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipRoleAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipRoleAttribute.cs index 45694e622..fb36665f8 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipRoleAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmRelationshipRoleAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; //for RelationshipMultiplicity diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmScalarPropertyAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmScalarPropertyAttribute.cs index ddf8d9398..13d23f82d 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmScalarPropertyAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmScalarPropertyAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmSchemaAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmSchemaAttribute.cs index e52f33554..eec9c4c9a 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmSchemaAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmSchemaAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EdmTypeAttribute.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EdmTypeAttribute.cs index cdac80497..097fd72cb 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EdmTypeAttribute.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EdmTypeAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EntityCollection.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EntityCollection.cs index 4b1da9fd4..0f1f0cc60 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EntityCollection.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EntityCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EntityObject.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EntityObject.cs index 028698fe9..08e8dd69a 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EntityObject.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EntityObject.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data; using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference.cs index 48acf77e5..5a7b1c84e 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference_TResultType.cs b/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference_TResultType.cs index 29b355682..c18e9638f 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference_TResultType.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/EntityReference_TResultType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/RelatedEnd.cs b/System.Data.Entity/System/Data/Objects/DataClasses/RelatedEnd.cs index 073c79de2..e89a660d4 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/RelatedEnd.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/RelatedEnd.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipFixer.cs b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipFixer.cs index 40b72aed2..4621064d8 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipFixer.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipFixer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipManager.cs b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipManager.cs index 854e90087..32c092397 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipManager.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.DataClasses { @@ -1429,8 +1429,8 @@ private bool TryGetCachedRelatedEnd(string relationshipName, string targetRoleNa // Find properties which are Dependent/Principal ends of some referential constraint // Returned lists are never null. - // NOTE This method will be removed when - + // NOTE This method will be removed when bug 505935 is solved + // Returns true if any FK relationships were skipped so that they can be checked again after fixup internal bool FindNamesOfReferentialConstraintProperties(out List propertiesToRetrieve, out bool propertiesToPropagateExist, bool skipFK) { IEntityWrapper wrappedOwner = WrappedOwner; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipNavigation.cs b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipNavigation.cs index 82295b743..66dcba0ec 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipNavigation.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/RelationshipNavigation.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/DataClasses/StructuralObject.cs b/System.Data.Entity/System/Data/Objects/DataClasses/StructuralObject.cs index acda94e3d..900af0333 100644 --- a/System.Data.Entity/System/Data/Objects/DataClasses/StructuralObject.cs +++ b/System.Data.Entity/System/Data/Objects/DataClasses/StructuralObject.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data; using System.Diagnostics; diff --git a/System.Data.Entity/System/Data/Objects/DataRecordObjectView.cs b/System.Data.Entity/System/Data/Objects/DataRecordObjectView.cs index f00b88296..5869bf86b 100644 --- a/System.Data.Entity/System/Data/Objects/DataRecordObjectView.cs +++ b/System.Data.Entity/System/Data/Objects/DataRecordObjectView.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; @@ -63,8 +63,8 @@ internal DataRecordObjectView(IObjectViewData viewData, object eve /// /// The algorithm here is lifted from System.Windows.Forms.ListBindingHelper, /// from the GetTypedIndexer method. - /// The Entity Framework could not take a dependency on Microsoft, - /// so we lifted the appropriate parts from the Microsoft code here. + /// The Entity Framework could not take a dependency on [....], + /// so we lifted the appropriate parts from the [....] code here. /// Not the best, but much better than guessing as to what algorithm is proper for data binding. /// private static PropertyInfo GetTypedIndexer(Type type) @@ -106,8 +106,8 @@ private static PropertyInfo GetTypedIndexer(Type type) /// /// The algorithm here is lifted from System.Windows.Forms.ListBindingHelper, /// from the GetListItemType(object) method. - /// The Entity Framework could not take a dependency on Microsoft, - /// so we lifted the appropriate parts from the Microsoft code here. + /// The Entity Framework could not take a dependency on [....], + /// so we lifted the appropriate parts from the [....] code here. /// Not the best, but much better than guessing as to what algorithm is proper for data binding. /// private static Type GetListItemType(Type type) diff --git a/System.Data.Entity/System/Data/Objects/ELinq/BindingContext.cs b/System.Data.Entity/System/Data/Objects/ELinq/BindingContext.cs index 5a3cb738b..eeb849f9b 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/BindingContext.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/BindingContext.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using CqtExpression = System.Data.Common.CommandTrees.DbExpression; diff --git a/System.Data.Entity/System/Data/Objects/ELinq/CompiledELinqQueryState.cs b/System.Data.Entity/System/Data/Objects/ELinq/CompiledELinqQueryState.cs index d072e7c3b..0b7aa97d3 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/CompiledELinqQueryState.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/CompiledELinqQueryState.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/ELinqQueryState.cs b/System.Data.Entity/System/Data/Objects/ELinq/ELinqQueryState.cs index ec98b5bb6..6a68bcb8b 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/ELinqQueryState.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/ELinqQueryState.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/ExpressionConverter.cs b/System.Data.Entity/System/Data/Objects/ELinq/ExpressionConverter.cs index 5d0fdd7b7..95c65e884 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/ExpressionConverter.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/ExpressionConverter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq @@ -1069,8 +1069,8 @@ private bool TryGetValueLayerType(Type linqType, out TypeUsage type) /// private static void VerifyTypeSupportedForComparison(Type clrType, TypeUsage edmType, Stack memberPath) { - // NOTE: due to - + // NOTE: due to bug in null handling for complex types, complex types are currently not supported + // for comparisons (see SQL BU 543956) switch (edmType.EdmType.BuiltInTypeKind) { case BuiltInTypeKind.PrimitiveType: diff --git a/System.Data.Entity/System/Data/Objects/ELinq/ExpressionVisitorHelpers.cs b/System.Data.Entity/System/Data/Objects/ELinq/ExpressionVisitorHelpers.cs index 90853b143..3f0060f41 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/ExpressionVisitorHelpers.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/ExpressionVisitorHelpers.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Linq.Expressions.Internal diff --git a/System.Data.Entity/System/Data/Objects/ELinq/Funcletizer.cs b/System.Data.Entity/System/Data/Objects/ELinq/Funcletizer.cs index ab12b11cc..7b45f33dd 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/Funcletizer.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/Funcletizer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/InitializerFacet.cs b/System.Data.Entity/System/Data/Objects/ELinq/InitializerFacet.cs index 207b73973..b6e7adc53 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/InitializerFacet.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/InitializerFacet.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/LinqExpressionNormalizer.cs b/System.Data.Entity/System/Data/Objects/ELinq/LinqExpressionNormalizer.cs index e6042b498..1a2e9d353 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/LinqExpressionNormalizer.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/LinqExpressionNormalizer.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- using System.Linq.Expressions; diff --git a/System.Data.Entity/System/Data/Objects/ELinq/MethodCallTranslator.cs b/System.Data.Entity/System/Data/Objects/ELinq/MethodCallTranslator.cs index b0f2bbade..247357fb4 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/MethodCallTranslator.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/MethodCallTranslator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/ObjectQueryProvider.cs b/System.Data.Entity/System/Data/Objects/ELinq/ObjectQueryProvider.cs index 9999435a9..fafc18ce0 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/ObjectQueryProvider.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/ObjectQueryProvider.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/OrderByLifter.cs b/System.Data.Entity/System/Data/Objects/ELinq/OrderByLifter.cs index cf0ccb54b..e32e423a2 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/OrderByLifter.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/OrderByLifter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/ReflectionUtil.cs b/System.Data.Entity/System/Data/Objects/ELinq/ReflectionUtil.cs index 95a9af21f..86559d6b4 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/ReflectionUtil.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/ReflectionUtil.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System.Reflection; diff --git a/System.Data.Entity/System/Data/Objects/ELinq/SpatialMethodCallTranslator.cs b/System.Data.Entity/System/Data/Objects/ELinq/SpatialMethodCallTranslator.cs index cfcc26232..2eb958f02 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/SpatialMethodCallTranslator.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/SpatialMethodCallTranslator.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //-------------------------------------------------------------------------- // This file is automatically generated and should not be changed directly. // diff --git a/System.Data.Entity/System/Data/Objects/ELinq/SpatialPropertyTranslator.cs b/System.Data.Entity/System/Data/Objects/ELinq/SpatialPropertyTranslator.cs index 84dc51270..c16cee7d5 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/SpatialPropertyTranslator.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/SpatialPropertyTranslator.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //-------------------------------------------------------------------------- // This file is automatically generated and should not be changed directly. // diff --git a/System.Data.Entity/System/Data/Objects/ELinq/Translator.cs b/System.Data.Entity/System/Data/Objects/ELinq/Translator.cs index 5a4f283f1..53ae3be39 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/Translator.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/Translator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft, Microsoft +// @owner [....], [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/ELinq/TypeSystem.cs b/System.Data.Entity/System/Data/Objects/ELinq/TypeSystem.cs index f7fbc08f6..1d0e4a7f1 100644 --- a/System.Data.Entity/System/Data/Objects/ELinq/TypeSystem.cs +++ b/System.Data.Entity/System/Data/Objects/ELinq/TypeSystem.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.ELinq diff --git a/System.Data.Entity/System/Data/Objects/EntityEntry.cs b/System.Data.Entity/System/Data/Objects/EntityEntry.cs index def33f204..efeddc674 100644 --- a/System.Data.Entity/System/Data/Objects/EntityEntry.cs +++ b/System.Data.Entity/System/Data/Objects/EntityEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects { @@ -3748,7 +3748,7 @@ private void FixupForeignKeysByReference(List visited) { // Added prinipal end. Fixup FKs on all dependents. // This is necessary because of the case where a PK in an added entity is changed after it and its dependnents - // are added to the context--see + // are added to the context--see bug 628752. bool fkOverlapsPk = false; // Set to true if we find out that the FK overlaps the dependent PK bool dependentPropsChecked = false; // Set to true once we have checked whether or not the FK overlaps the PK EntityKey principalKey = WrappedEntity.EntityKey; diff --git a/System.Data.Entity/System/Data/Objects/EntityFunctions.cs b/System.Data.Entity/System/Data/Objects/EntityFunctions.cs index 51a6eea6a..879f3af5c 100644 --- a/System.Data.Entity/System/Data/Objects/EntityFunctions.cs +++ b/System.Data.Entity/System/Data/Objects/EntityFunctions.cs @@ -10,8 +10,8 @@ // Changes to this file will be lost if the code is regenerated. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/FieldDescriptor.cs b/System.Data.Entity/System/Data/Objects/FieldDescriptor.cs index f2bb8cf6f..fd5ef4e00 100644 --- a/System.Data.Entity/System/Data/Objects/FieldDescriptor.cs +++ b/System.Data.Entity/System/Data/Objects/FieldDescriptor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/Internal/BaseEntityWrapper.cs b/System.Data.Entity/System/Data/Objects/Internal/BaseEntityWrapper.cs index 8278f03a9..7c4e91ac3 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/BaseEntityWrapper.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/BaseEntityWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Data.Objects.DataClasses; diff --git a/System.Data.Entity/System/Data/Objects/Internal/ComplexTypeMaterializer.cs b/System.Data.Entity/System/Data/Objects/Internal/ComplexTypeMaterializer.cs index d4916b2c5..44f963f3a 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/ComplexTypeMaterializer.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/ComplexTypeMaterializer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntityProxyFactory.cs b/System.Data.Entity/System/Data/Objects/Internal/EntityProxyFactory.cs index 385cb5b23..0de1b08a4 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntityProxyFactory.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntityProxyFactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntityProxyTypeInfo.cs b/System.Data.Entity/System/Data/Objects/Internal/EntityProxyTypeInfo.cs index 67b9ce1f7..a301deb03 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntityProxyTypeInfo.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntityProxyTypeInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryBuilder.cs b/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryBuilder.cs index f757170e4..eb994d425 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryBuilder.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryBuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryState.cs b/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryState.cs index 40d6b1f62..63b4ca4e6 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryState.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntitySqlQueryState.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntityWrapper.cs b/System.Data.Entity/System/Data/Objects/Internal/EntityWrapper.cs index 95f18d39a..8f06e08b9 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntityWrapper.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntityWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Data.Objects.DataClasses; diff --git a/System.Data.Entity/System/Data/Objects/Internal/EntityWrapperFactory.cs b/System.Data.Entity/System/Data/Objects/Internal/EntityWrapperFactory.cs index a337615de..bfbb201b7 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/EntityWrapperFactory.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/EntityWrapperFactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Objects.DataClasses; using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Objects/Internal/LazyLoadBehavior.cs b/System.Data.Entity/System/Data/Objects/Internal/LazyLoadBehavior.cs index 6806c05cd..06276f934 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/LazyLoadBehavior.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/LazyLoadBehavior.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/Internal/LightweightEntityWrapper.cs b/System.Data.Entity/System/Data/Objects/Internal/LightweightEntityWrapper.cs index 874b4c0d0..76cae2fa8 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/LightweightEntityWrapper.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/LightweightEntityWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Data.Objects.DataClasses; diff --git a/System.Data.Entity/System/Data/Objects/Internal/NullEntityWrapper.cs b/System.Data.Entity/System/Data/Objects/Internal/NullEntityWrapper.cs index 9590660d0..0273238b7 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/NullEntityWrapper.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/NullEntityWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal { diff --git a/System.Data.Entity/System/Data/Objects/Internal/ObjectFullSpanRewriter.cs b/System.Data.Entity/System/Data/Objects/Internal/ObjectFullSpanRewriter.cs index 2d54ed02c..d8a4c861e 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/ObjectFullSpanRewriter.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/ObjectFullSpanRewriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryExecutionPlan.cs b/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryExecutionPlan.cs index 43ca97936..78f35d033 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryExecutionPlan.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryExecutionPlan.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryState.cs b/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryState.cs index 8c958ea14..06d5d0841 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryState.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/ObjectQueryState.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data.Objects.Internal diff --git a/System.Data.Entity/System/Data/Objects/Internal/ObjectSpanRewriter.cs b/System.Data.Entity/System/Data/Objects/Internal/ObjectSpanRewriter.cs index 2469adc8b..3dcb85b7c 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/ObjectSpanRewriter.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/ObjectSpanRewriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/Internal/TransactionManager.cs b/System.Data.Entity/System/Data/Objects/Internal/TransactionManager.cs index 92352278e..240963625 100644 --- a/System.Data.Entity/System/Data/Objects/Internal/TransactionManager.cs +++ b/System.Data.Entity/System/Data/Objects/Internal/TransactionManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- // // Internal class used to manage ObjectStateManager's transactions for diff --git a/System.Data.Entity/System/Data/Objects/ObjectContext.cs b/System.Data.Entity/System/Data/Objects/ObjectContext.cs index 49b58de7c..df6204519 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectContext.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectContext.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects @@ -3034,7 +3034,7 @@ public int ExecuteStoreCommand(string commandText, params object[] parameters) /// The query specified in the server's native query language. /// The parameter values to use for the query. /// An IEnumerable sequence of objects. - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public ObjectResult ExecuteStoreQuery(string commandText, params object[] parameters) { return ExecuteStoreQueryInternal(commandText, null /*entitySetName*/, MergeOption.AppendOnly, parameters); @@ -3049,7 +3049,7 @@ public ObjectResult ExecuteStoreQuery(string commandText, pa /// The entity set in which results should be tracked. Null indicates there is no entity set. /// Merge option to use for entity results. /// The translated sequence of objects - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public ObjectResult ExecuteStoreQuery(string commandText, string entitySetName, MergeOption mergeOption, params object[] parameters) { EntityUtil.CheckStringArgument(entitySetName, "entitySetName"); @@ -3106,7 +3106,7 @@ private ObjectResult ExecuteStoreQueryInternal(string comman /// The DbDataReader to translate /// Merge option to use for entity results. /// The translated sequence of objects - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public ObjectResult Translate(DbDataReader reader) { // SQLBUDT 447285: Ensure the assembly containing the entity's CLR type @@ -3130,7 +3130,7 @@ public ObjectResult Translate(DbDataReader reader) /// The entity set in which results should be tracked. Null indicates there is no entity set. /// Merge option to use for entity results. /// The translated sequence of objects - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public ObjectResult Translate(DbDataReader reader, string entitySetName, MergeOption mergeOption) { EntityUtil.CheckStringArgument(entitySetName, "entitySetName"); diff --git a/System.Data.Entity/System/Data/Objects/ObjectMaterializedEventArgs.cs b/System.Data.Entity/System/Data/Objects/ObjectMaterializedEventArgs.cs index 26bd5a012..4b269fba2 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectMaterializedEventArgs.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectMaterializedEventArgs.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/ObjectParameter.cs b/System.Data.Entity/System/Data/Objects/ObjectParameter.cs index 4390811bc..2939ae7b9 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectParameter.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectParameter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectParameterCollection.cs b/System.Data.Entity/System/Data/Objects/ObjectParameterCollection.cs index 7efb20d55..bd314d2e1 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectParameterCollection.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectParameterCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectQuery.cs b/System.Data.Entity/System/Data/Objects/ObjectQuery.cs index b8041ee41..bd2868425 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectQuery.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectQuery.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectQuery_EntitySqlExtensions.cs b/System.Data.Entity/System/Data/Objects/ObjectQuery_EntitySqlExtensions.cs index 10c751301..36d85f3ee 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectQuery_EntitySqlExtensions.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectQuery_EntitySqlExtensions.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectQuery_TResultType.cs b/System.Data.Entity/System/Data/Objects/ObjectQuery_TResultType.cs index e5acd60fe..bb459b661 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectQuery_TResultType.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectQuery_TResultType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/ObjectResult.cs b/System.Data.Entity/System/Data/Objects/ObjectResult.cs index 0c1197921..4b3bcb868 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectResult.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectResult.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectResult_TResultType.cs b/System.Data.Entity/System/Data/Objects/ObjectResult_TResultType.cs index 89643315a..4b764e236 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectResult_TResultType.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectResult_TResultType.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/ObjectSet.cs b/System.Data.Entity/System/Data/Objects/ObjectSet.cs index 3d5c4a02c..94ffdbcab 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectSet.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectSet.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- // ObjectSet is a wrapper around ObjectQuery and CUD diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateEntry.cs b/System.Data.Entity/System/Data/Objects/ObjectStateEntry.cs index 5d069e2ba..388559d75 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateEntry.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Data.Common; diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateEntryBaseUpdatableDataRecord.cs b/System.Data.Entity/System/Data/Objects/ObjectStateEntryBaseUpdatableDataRecord.cs index 3006ec920..72e6a8ce1 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateEntryBaseUpdatableDataRecord.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateEntryBaseUpdatableDataRecord.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.ComponentModel; diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbDataRecord.cs b/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbDataRecord.cs index 5b763db4a..cda0af00f 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbDataRecord.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbDataRecord.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbUpdatableDataRecord.cs b/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbUpdatableDataRecord.cs index 768828d89..08a0551c5 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbUpdatableDataRecord.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateEntryDbUpdatableDataRecord.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.ComponentModel; diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateEntryOriginalDbUpdatableDataRecord.cs b/System.Data.Entity/System/Data/Objects/ObjectStateEntryOriginalDbUpdatableDataRecord.cs index e16a62b70..56c4c0f8a 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateEntryOriginalDbUpdatableDataRecord.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateEntryOriginalDbUpdatableDataRecord.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.ComponentModel; diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateManager.cs b/System.Data.Entity/System/Data/Objects/ObjectStateManager.cs index 842891518..9657c208b 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateManager.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects @@ -2131,7 +2131,7 @@ private void ResetEntityKey(EntityEntry entry, EntityKey value) _inRelationshipFixup = false; } - // Keeping the entity and entry keys in sync. + // Keeping the entity and entry keys in [....]. entry.EntityKey = value; //Internally, entry.EntityKey asserts that entry._entityKey and entityWithKey.EntityKey are equal. @@ -3553,7 +3553,7 @@ private void PerformDelete(IList entries) reference.IsForeignKey && reference.IsDependentEndOfReferentialConstraint(checkIdentifying: false)) { - // Ensure that the cached FK value on the reference is in sync because it is possible that we + // Ensure that the cached FK value on the reference is in [....] because it is possible that we // didn't take any actions above that would cause this to be set. reference.SetCachedForeignKey(ForeignKeyFactory.CreateKeyFromForeignKeyValues(entry, reference), entry); } diff --git a/System.Data.Entity/System/Data/Objects/ObjectStateManagerMetadata.cs b/System.Data.Entity/System/Data/Objects/ObjectStateManagerMetadata.cs index 81e861695..2f078289b 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectStateManagerMetadata.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectStateManagerMetadata.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/ObjectView.cs b/System.Data.Entity/System/Data/Objects/ObjectView.cs index 0adbd0b50..acd5c3aa2 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectView.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectView.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/ObjectViewEntityCollectionData.cs b/System.Data.Entity/System/Data/Objects/ObjectViewEntityCollectionData.cs index 0f91fb37d..de89b3a48 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectViewEntityCollectionData.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectViewEntityCollectionData.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/ObjectViewFactory.cs b/System.Data.Entity/System/Data/Objects/ObjectViewFactory.cs index 94bed62f1..9c803f7bd 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectViewFactory.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectViewFactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/ObjectViewListener.cs b/System.Data.Entity/System/Data/Objects/ObjectViewListener.cs index f26e293c8..326ca561b 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectViewListener.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectViewListener.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/ObjectViewQueryResultData.cs b/System.Data.Entity/System/Data/Objects/ObjectViewQueryResultData.cs index dd79ce434..1f1eb2958 100644 --- a/System.Data.Entity/System/Data/Objects/ObjectViewQueryResultData.cs +++ b/System.Data.Entity/System/Data/Objects/ObjectViewQueryResultData.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Data.Entity/System/Data/Objects/ProxyDataContractResolver.cs b/System.Data.Entity/System/Data/Objects/ProxyDataContractResolver.cs index 4435cbc82..251a18ed5 100644 --- a/System.Data.Entity/System/Data/Objects/ProxyDataContractResolver.cs +++ b/System.Data.Entity/System/Data/Objects/ProxyDataContractResolver.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/RelationshipEntry.cs b/System.Data.Entity/System/Data/Objects/RelationshipEntry.cs index de19216f6..d3a7e9418 100644 --- a/System.Data.Entity/System/Data/Objects/RelationshipEntry.cs +++ b/System.Data.Entity/System/Data/Objects/RelationshipEntry.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects { diff --git a/System.Data.Entity/System/Data/Objects/RelationshipWrapper.cs b/System.Data.Entity/System/Data/Objects/RelationshipWrapper.cs index 2aa42ba86..e3f4a297f 100644 --- a/System.Data.Entity/System/Data/Objects/RelationshipWrapper.cs +++ b/System.Data.Entity/System/Data/Objects/RelationshipWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/Span.cs b/System.Data.Entity/System/Data/Objects/Span.cs index 28482f31e..c74e95d95 100644 --- a/System.Data.Entity/System/Data/Objects/Span.cs +++ b/System.Data.Entity/System/Data/Objects/Span.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Objects diff --git a/System.Data.Entity/System/Data/Objects/SpanIndex.cs b/System.Data.Entity/System/Data/Objects/SpanIndex.cs index 151f06a22..921eed602 100644 --- a/System.Data.Entity/System/Data/Objects/SpanIndex.cs +++ b/System.Data.Entity/System/Data/Objects/SpanIndex.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupowner Microsoft +// @owner [....] +// @backupowner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Objects/SqlClient/SqlFunctions.cs b/System.Data.Entity/System/Data/Objects/SqlClient/SqlFunctions.cs index 0d9a53bd2..d5745f568 100644 --- a/System.Data.Entity/System/Data/Objects/SqlClient/SqlFunctions.cs +++ b/System.Data.Entity/System/Data/Objects/SqlClient/SqlFunctions.cs @@ -10,8 +10,8 @@ // Changes to this file will be lost if the code is regenerated. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Objects/SqlClient/SqlSpatialFunctions.cs b/System.Data.Entity/System/Data/Objects/SqlClient/SqlSpatialFunctions.cs index 1c1dd30bb..3dd9e3aad 100644 --- a/System.Data.Entity/System/Data/Objects/SqlClient/SqlSpatialFunctions.cs +++ b/System.Data.Entity/System/Data/Objects/SqlClient/SqlSpatialFunctions.cs @@ -10,8 +10,8 @@ // Changes to this file will be lost if the code is regenerated. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/OptimisticConcurrencyException.cs b/System.Data.Entity/System/Data/OptimisticConcurrencyException.cs index 9a911e5d2..6a38eb00c 100644 --- a/System.Data.Entity/System/Data/OptimisticConcurrencyException.cs +++ b/System.Data.Entity/System/Data/OptimisticConcurrencyException.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/PropertyConstraintException.cs b/System.Data.Entity/System/Data/PropertyConstraintException.cs index ff231df5a..034e96170 100644 --- a/System.Data.Entity/System/Data/PropertyConstraintException.cs +++ b/System.Data.Entity/System/Data/PropertyConstraintException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- diff --git a/System.Data.Entity/System/Data/ProviderIncompatibleException.cs b/System.Data.Entity/System/Data/ProviderIncompatibleException.cs index 8b3a5dad1..f15b3a5ed 100644 --- a/System.Data.Entity/System/Data/ProviderIncompatibleException.cs +++ b/System.Data.Entity/System/Data/ProviderIncompatibleException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/AncillaryOps.cs b/System.Data.Entity/System/Data/Query/InternalTrees/AncillaryOps.cs index 624c6db17..e2f4c3ad4 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/AncillaryOps.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/AncillaryOps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMap.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMap.cs index 541441845..5616d7744 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMap.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapCopier.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapCopier.cs index 723aeae7f..edc63cc51 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapCopier.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapCopier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapFactory.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapFactory.cs index b000d40e8..7ba71b132 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapFactory.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapVisitor.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapVisitor.cs index 1c95e226b..5f717d4cd 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapVisitor.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ColumnMapVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Query.InternalTrees diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Command.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Command.cs index 0dabf7fa1..7f16a5a68 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Command.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Command.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Dump.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Dump.cs index 8933a9946..a7fecfd71 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Dump.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Dump.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ExplicitDiscriminatorMap.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ExplicitDiscriminatorMap.cs index 594d9d4e6..9376a4d3e 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ExplicitDiscriminatorMap.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ExplicitDiscriminatorMap.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Metadata.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Metadata.cs index 5ee20c008..acb8bc50b 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Metadata.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Metadata.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/NodeCounter.cs b/System.Data.Entity/System/Data/Query/InternalTrees/NodeCounter.cs index 5261c4858..77690a6ad 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/NodeCounter.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/NodeCounter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/NodeInfo.cs b/System.Data.Entity/System/Data/Query/InternalTrees/NodeInfo.cs index d4bcc4cb9..c169ff2f1 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/NodeInfo.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/NodeInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -52,8 +52,8 @@ internal void InitFrom(IEnumerable varSet) internal void InitFrom(IEnumerable varSet, bool ignoreParameters) { m_keys.InitFrom(varSet, ignoreParameters); - // - + // Bug 434541: An empty set of keys is not the same as "no" keys. + // Caveat Emptor m_noKeys = false; } internal void InitFrom(KeyVec left, KeyVec right) diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Nodes.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Nodes.cs index d8c3bcc4a..639678818 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Nodes.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Nodes.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/OpCopier.cs b/System.Data.Entity/System/Data/Query/InternalTrees/OpCopier.cs index 864ae4f80..d083bf8e4 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/OpCopier.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/OpCopier.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- // Interesting cases: Unnest diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Ops.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Ops.cs index ffa517fde..5f2ef19de 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Ops.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Ops.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Query.InternalTrees diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/PhysicalOps.cs b/System.Data.Entity/System/Data/Query/InternalTrees/PhysicalOps.cs index 932a39e14..4a6c55295 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/PhysicalOps.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/PhysicalOps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/RelOps.cs b/System.Data.Entity/System/Data/Query/InternalTrees/RelOps.cs index 4e513fd7c..2f69f2fe6 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/RelOps.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/RelOps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/RelPropertyHelper.cs b/System.Data.Entity/System/Data/Query/InternalTrees/RelPropertyHelper.cs index de5fb678f..75ff85423 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/RelPropertyHelper.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/RelPropertyHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Rule.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Rule.cs index b766b729d..b75f77f8b 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Rule.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Rule.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/RulePatternOps.cs b/System.Data.Entity/System/Data/Query/InternalTrees/RulePatternOps.cs index ec10161a8..add95f189 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/RulePatternOps.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/RulePatternOps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/RuleProcessor.cs b/System.Data.Entity/System/Data/Query/InternalTrees/RuleProcessor.cs index 2d43a1cb7..98e344496 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/RuleProcessor.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/RuleProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/ScalarOps.cs b/System.Data.Entity/System/Data/Query/InternalTrees/ScalarOps.cs index c9c554ad6..f02af32dc 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/ScalarOps.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/ScalarOps.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Vars.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Vars.cs index de6ed1425..b9f865f5e 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Vars.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Vars.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/InternalTrees/Visitors.cs b/System.Data.Entity/System/Data/Query/InternalTrees/Visitors.cs index 73d0a5de3..6dc5c0f5f 100644 --- a/System.Data.Entity/System/Data/Query/InternalTrees/Visitors.cs +++ b/System.Data.Entity/System/Data/Query/InternalTrees/Visitors.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Query.InternalTrees diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/AggregatePushdown.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/AggregatePushdown.cs index db69808fa..9bf364d3b 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/AggregatePushdown.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/AggregatePushdown.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/CTreeGenerator.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/CTreeGenerator.cs index 98e9d1d3b..62aa38cec 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/CTreeGenerator.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/CTreeGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- //using System.Diagnostics; // Please use PlanCompiler.Assert instead of Debug.Assert in this class... @@ -1047,7 +1047,7 @@ public override DbExpression Visit(CastOp op, Node n) /// public override DbExpression Visit(SoftCastOp op, Node n) { - // Microsoft 9/21/06 - temporarily removing check here + // [....] 9/21/06 - temporarily removing check here // because the assert wrongly fails in some cases where the types are promotable, // but the facets are not. Put this back when that issue is solved. // diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/CodeGen.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/CodeGen.cs index 2d8ad0d32..6d762ddef 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/CodeGen.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/CodeGen.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapProcessor.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapProcessor.cs index d2d6aa35c..e32537304 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapProcessor.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapTranslator.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapTranslator.cs index 793729bde..a6b1ad761 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapTranslator.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ColumnMapTranslator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/CommandPlan.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/CommandPlan.cs index afafe6188..3cbfa654f 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/CommandPlan.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/CommandPlan.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ConstraintManager.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ConstraintManager.cs index 483fd2d00..70c0f09db 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ConstraintManager.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ConstraintManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ITreeGenerator.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ITreeGenerator.cs index 6998a5568..a32447777 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ITreeGenerator.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ITreeGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- //using System.Diagnostics; // Please use PlanCompiler.Assert instead of Debug.Assert in this class... diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/JoinElimination.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/JoinElimination.cs index 82daa4395..f157f9cf3 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/JoinElimination.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/JoinElimination.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/JoinGraph.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/JoinGraph.cs index 476eb9b61..170d81de8 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/JoinGraph.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/JoinGraph.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -1126,8 +1126,8 @@ private static IEnumerable> CreateOrderedKeyV /// queries faster when at least one OUTER JOIN statement is still present in the SQL query. If we /// convert all OUTER JOIN statements into INNER JOINS then these optimizations don't kick in. In /// order to maintain compatibility to .NET 4.0 we had to create a special case for SQL CE. - /// See DevDiv - + /// See DevDiv bug #462067 for more details. Also see bug DevDev2 bug#488375 for the UseFx40CompatMode check. + /// private void TryTurnLeftOuterJoinsIntoInnerJoins() { foreach (AugmentedJoinNode augmentedJoinNode in m_vertexes.OfType().Where(j => j.Node.Op.OpType == OpType.LeftOuterJoin && j.JoinEdges.Count > 0)) @@ -1503,9 +1503,9 @@ private void MarkTableAsEliminated(AugmentedTableNode tableNode, AugmentedTab for (int i = 0; i < tableVars.Count; i++) { // - // - - + // Bug 446708: Make sure that the "replacement" column is + // referenced, if the the current column is referenced + // if (tableNode.Table.ReferencedColumns.IsSet(tableVars[i])) { m_varMap[tableVars[i]] = replacementVars[i]; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/KeyPullup.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/KeyPullup.cs index 7a39349c2..976c8adc1 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/KeyPullup.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/KeyPullup.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/NestPullup.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/NestPullup.cs index a39594765..41b2629eb 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/NestPullup.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/NestPullup.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -2161,15 +2161,15 @@ private Node ConvertToSingleStreamNest(Node nestNode, Dictionary KeyVec drivingNodeKeys = Command.PullupKeys(drivingNode); if (drivingNodeKeys.NoKeys) { - // Microsoft: In this case we used to wrap drivingNode into a projection that would also project Edm.NewGuid() thus giving us a synthetic key. - // This solution did not work however due to a - - - - - - - + // [....]: In this case we used to wrap drivingNode into a projection that would also project Edm.NewGuid() thus giving us a synthetic key. + // This solution did not work however due to a bug in SQL Server that allowed pulling non-deterministic functions above joins and applies, thus + // producing incorrect results. SQL Server bug was filed in "sqlbuvsts01\Sql Server" database as #725272. + // The only known path how we can get a keyless drivingNode is if + // - drivingNode is over a TVF call + // - TVF is declared as Collection(Row) is SSDL (the only form of TVF definitions at the moment) + // - TVF is not mapped to entities + // Note that if TVF is mapped to entities via function import mapping, and the user query is actually the call of the + // function import, we infer keys for the TVF from the c-space entity keys and their mappings. throw EntityUtil.KeysRequiredForNesting(); } @@ -2494,9 +2494,9 @@ private Node BuildUnionAllSubqueryForNestOp(NestBaseOp nestOp, Node nestNode, Va { newDrivingNode = OpCopier.Copy(Command, drivingNode, drivingNodeVars, out newDrivingNodeVars); // - // - - + // Bug 450245: If we copied the driver node, then references to driver node vars + // from the collection subquery must be patched up + // VarRemapper varRemapper = new VarRemapper(this.Command); for (int j = 0; j < drivingNodeVars.Count; j++) { @@ -2505,7 +2505,7 @@ private Node BuildUnionAllSubqueryForNestOp(NestBaseOp nestOp, Node nestNode, Va // Remap all references in the current subquery varRemapper.RemapSubtree(nestNode.Children[i]); - // + // Bug 479183: Remap the flattened element vars newFlattenedElementVars = varRemapper.RemapVarList(nestOp.CollectionInfo[i - 1].FlattenedElementVars); // Create a cross apply for all but the first collection diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/NominalTypeEliminator.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/NominalTypeEliminator.cs index 869ad2309..5cdb77d54 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/NominalTypeEliminator.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/NominalTypeEliminator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; @@ -1936,9 +1936,9 @@ public override Node Visit(CaseOp op, Node n) // If the CaseOp returns a simple type, then we don't need to do // anything special. // - // - - + // Bug 480780: We must perform further processing, if the result + // type is not a scalar + // // If the CaseOp returns a collection, then we need to create a // new CaseOp of the new and improved collection type. Similarly diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/Normalizer.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/Normalizer.cs index f780e6b3c..f41d761c7 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/Normalizer.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/Normalizer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompiler.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompiler.cs index f58f7ff54..32bdecec2 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompiler.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompiler.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompilerUtil.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompilerUtil.cs index 7a3f91e64..4a92d1bbd 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompilerUtil.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/PlanCompilerUtil.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/PreProcessor.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/PreProcessor.cs index be7bc6eef..b3a359ed1 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/PreProcessor.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/PreProcessor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- //using System.Diagnostics; // Please use PlanCompiler.Assert instead of Debug.Assert in this class... @@ -1283,8 +1283,8 @@ private Node VisitNavPropertyOp(PropertyOp op, Node n) // and if the parent is already visited that rel op parent would be part of the subtree resulting from the parent. // If the parent is not visited it would be a rel op parent higher in the tree (also valid), and leaves less room // for join elimination. - // The original out-of-order visitation was put in place to work around a - + // The original out-of-order visitation was put in place to work around a bug that has been fixed. + // bool visitChildLater = IsNavigationPropertyOverVarRef(n.Child0); if (!visitChildLater) { diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/Predicate.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/Predicate.cs index 39bbeb37e..f977e3a03 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/Predicate.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/Predicate.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ProjectionPruner.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ProjectionPruner.cs index 412494ef0..9c91918b7 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ProjectionPruner.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ProjectionPruner.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyPushdownHelper.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyPushdownHelper.cs index 3fe9a9cdb..32bcd16df 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyPushdownHelper.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyPushdownHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -393,7 +393,7 @@ public override void Visit(GetEntityRefOp op, Node n) ScalarOp childOp = n.Child0.Op as ScalarOp; PlanCompiler.Assert(childOp != null, "input to GetEntityRefOp is not a ScalarOp?"); - // + // bug 428542 - the child is of the entity type; not this op md.EntityType entityType = TypeHelpers.GetEdmType(childOp.Type); PropertyRefList desiredProperties = GetIdentityProperties(entityType); diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyRef.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyRef.cs index 103296c73..f23a813a3 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyRef.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/PropertyRef.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/ProviderCommandInfoUtils.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/ProviderCommandInfoUtils.cs index 1e1978f87..4d81cb045 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/ProviderCommandInfoUtils.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/ProviderCommandInfoUtils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/StructuredTypeInfo.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/StructuredTypeInfo.cs index c7b074c9c..149274a41 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/StructuredTypeInfo.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/StructuredTypeInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -113,11 +113,11 @@ internal class StructuredTypeInfo private StructuredTypeInfo(HashSet typesNeedingNullSentinel) { - // - - - - + // Bug 428351: Make the type->typeInfo dictionary use ref equality for + // types. The problem is that records (and other transient types) can + // compare equal, even if they are not reference-equal, and this causes + // us trouble down the road when we try to compare properties. + // Type unification is a good thing, but it needs to happen earlier somewhere m_typeInfoMap = new Dictionary(TypeUsageEqualityComparer.Instance); m_typeInfoMapPopulated = false; m_typesNeedingNullSentinel = typesNeedingNullSentinel; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/SubqueryTrackingVisitor.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/SubqueryTrackingVisitor.cs index 437a0cc3e..6ec1d822c 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/SubqueryTrackingVisitor.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/SubqueryTrackingVisitor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/TransformationRules.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/TransformationRules.cs index 15dcb8587..99ace7694 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/TransformationRules.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/TransformationRules.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; @@ -4206,24 +4206,24 @@ static bool ProcessGroupByOpWithNoAggregates(RuleProcessingContext context, Node /// the group by operation uses all the columns of X as the key. /// Additionally, the top-level physical projection must only expose one variable. If it exposes /// more than one (more than just the aggregate itself), then this rule must not apply. - /// This is a fix for devdiv - - - - - - - - - - - - - - - - - + /// This is a fix for devdiv bug 851732. Since now we're supporting NewRecordOp nodes as + /// part of the GroupBy aggregate variable computations, we are also respecting the fact that + /// group by (e => e) means that we're grouping by all columns of entity e. This was not a + /// problem when the NewRecordOp node was not being processed since this caused the GroupBy + /// statement to be simplified to a form with no keys and no output columns. The generated SQL + /// is correct, but it is different from what it used to be and may be incompatible if the + /// entity contains fields with datatypes that do not support being grouped by, such as blobs + /// and images. + /// This rule simplifies the tree so that we remain compatible with the way we were generating + /// queries that contain group by (e => e). + /// What this does is enabling the tree to take a shape that further optimization can convert + /// into an expression that groups by the key of the table and calls the aggregate function + /// as expected. + /// + /// Rule processing context + /// Current ProjectOp node + /// modified subtree + /// Transformation status private static bool ProcessGroupByOpOnAllInputColumnsWithAggregateOperation(RuleProcessingContext context, Node n, out Node newNode) { newNode = n; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/TypeInfo.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/TypeInfo.cs index d87b08c64..b76210602 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/TypeInfo.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/TypeInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/TypeUtils.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/TypeUtils.cs index daf8c53a8..c0bc872b5 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/TypeUtils.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/TypeUtils.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/VarInfo.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/VarInfo.cs index b207bd75b..a3c7575f3 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/VarInfo.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/VarInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/VarRefManager.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/VarRefManager.cs index a996bbc08..cea3d2d86 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/VarRefManager.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/VarRefManager.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/PlanCompiler/VarRemapper.cs b/System.Data.Entity/System/Data/Query/PlanCompiler/VarRemapper.cs index df62621b5..e700c5416 100644 --- a/System.Data.Entity/System/Data/Query/PlanCompiler/VarRemapper.cs +++ b/System.Data.Entity/System/Data/Query/PlanCompiler/VarRemapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataReader.cs b/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataReader.cs index 1fb083d05..0e2c6696e 100644 --- a/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataReader.cs +++ b/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataReader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Query.ResultAssembly { diff --git a/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataRecord.cs b/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataRecord.cs index 997a26479..2e8af6ba6 100644 --- a/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataRecord.cs +++ b/System.Data.Entity/System/Data/Query/ResultAssembly/BridgeDataRecord.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.Query.ResultAssembly { diff --git a/System.Data.Entity/System/Data/Spatial/DbGeography.cs b/System.Data.Entity/System/Data/Spatial/DbGeography.cs index 37ed063d3..43a680f7b 100644 --- a/System.Data.Entity/System/Data/Spatial/DbGeography.cs +++ b/System.Data.Entity/System/Data/Spatial/DbGeography.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Common.Internal; diff --git a/System.Data.Entity/System/Data/Spatial/DbGeographyWellKnownValue.cs b/System.Data.Entity/System/Data/Spatial/DbGeographyWellKnownValue.cs index 38cab49fe..575afd3e3 100644 --- a/System.Data.Entity/System/Data/Spatial/DbGeographyWellKnownValue.cs +++ b/System.Data.Entity/System/Data/Spatial/DbGeographyWellKnownValue.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- using System.Runtime.Serialization; diff --git a/System.Data.Entity/System/Data/Spatial/DbGeometry.cs b/System.Data.Entity/System/Data/Spatial/DbGeometry.cs index 8dd321698..53b79d8ac 100644 --- a/System.Data.Entity/System/Data/Spatial/DbGeometry.cs +++ b/System.Data.Entity/System/Data/Spatial/DbGeometry.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Common.Internal; diff --git a/System.Data.Entity/System/Data/Spatial/DbGeometryWellKnownValue.cs b/System.Data.Entity/System/Data/Spatial/DbGeometryWellKnownValue.cs index 411faca56..ec64ff979 100644 --- a/System.Data.Entity/System/Data/Spatial/DbGeometryWellKnownValue.cs +++ b/System.Data.Entity/System/Data/Spatial/DbGeometryWellKnownValue.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- using System.Runtime.Serialization; diff --git a/System.Data.Entity/System/Data/Spatial/DbSpatialServices.cs b/System.Data.Entity/System/Data/Spatial/DbSpatialServices.cs index 2650b3e44..e248ee0ca 100644 --- a/System.Data.Entity/System/Data/Spatial/DbSpatialServices.cs +++ b/System.Data.Entity/System/Data/Spatial/DbSpatialServices.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/Spatial/DefaultSpatialServices.cs b/System.Data.Entity/System/Data/Spatial/DefaultSpatialServices.cs index 70768b841..0552d5a0a 100644 --- a/System.Data.Entity/System/Data/Spatial/DefaultSpatialServices.cs +++ b/System.Data.Entity/System/Data/Spatial/DefaultSpatialServices.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Common.Internal; diff --git a/System.Data.Entity/System/Data/Spatial/ExtensionMethods.cs b/System.Data.Entity/System/Data/Spatial/ExtensionMethods.cs index 47f885566..010b131af 100644 --- a/System.Data.Entity/System/Data/Spatial/ExtensionMethods.cs +++ b/System.Data.Entity/System/Data/Spatial/ExtensionMethods.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Spatial.Internal; diff --git a/System.Data.Entity/System/Data/Spatial/Internal/SpatialExceptions.cs b/System.Data.Entity/System/Data/Spatial/Internal/SpatialExceptions.cs index 2a9a718bb..bd7744137 100644 --- a/System.Data.Entity/System/Data/Spatial/Internal/SpatialExceptions.cs +++ b/System.Data.Entity/System/Data/Spatial/Internal/SpatialExceptions.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.Spatial.Internal diff --git a/System.Data.Entity/System/Data/Spatial/SpatialHelpers.cs b/System.Data.Entity/System/Data/Spatial/SpatialHelpers.cs index af25ebd1a..df940de75 100644 --- a/System.Data.Entity/System/Data/Spatial/SpatialHelpers.cs +++ b/System.Data.Entity/System/Data/Spatial/SpatialHelpers.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Diagnostics; using System.Data.Metadata.Edm; diff --git a/System.Data.Entity/System/Data/SqlClient/IDbSpatialValue.cs b/System.Data.Entity/System/Data/SqlClient/IDbSpatialValue.cs index ab7dd297c..9334ccfa3 100644 --- a/System.Data.Entity/System/Data/SqlClient/IDbSpatialValue.cs +++ b/System.Data.Entity/System/Data/SqlClient/IDbSpatialValue.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Spatial; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/DmlSqlGenerator.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/DmlSqlGenerator.cs index 204292f95..b17cc1734 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/DmlSqlGenerator.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/DmlSqlGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.SqlClient.SqlGen diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/JoinSymbol.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/JoinSymbol.cs index 75d807857..1d60e4299 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/JoinSymbol.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/JoinSymbol.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/OptionalColumn.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/OptionalColumn.cs index 9670a2365..b2c88e582 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/OptionalColumn.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/OptionalColumn.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ConformanceChecker.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ConformanceChecker.cs index ce48bf2d0..9b6d3bc90 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ConformanceChecker.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ConformanceChecker.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.SqlClient.SqlGen diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ExpressionRewriter.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ExpressionRewriter.cs index f5493efc8..1fa8b4ca6 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ExpressionRewriter.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/Sql8ExpressionRewriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlBuilder.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlBuilder.cs index f4ffc565d..c680a0dc1 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlBuilder.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlFunctionCallHandler.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlFunctionCallHandler.cs index c4a0316f6..f749d5cf2 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlFunctionCallHandler.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlFunctionCallHandler.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.SqlClient.SqlGen @@ -1608,7 +1608,7 @@ private static SqlBuilder HandleCanonicalFunctionStartsWith(SqlGenerator sqlgen, // consistently return NULL as the result. // However, if instead we use the optimized LIKE translation when the search param is a DbNullExpression, // only SQL Server 2005 yields a True instead of a DbNull as compared to SQL Server 2008 and 2000. This is - // + // bug 32315 in LIKE in SQL Server 2005. result.Append("CHARINDEX( "); result.Append(args[1].Accept(sqlgen)); result.Append(", "); diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlGenerator.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlGenerator.cs index ad5f46fd0..b09cca657 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlGenerator.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlGenerator.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.SqlClient.SqlGen @@ -2495,7 +2495,7 @@ public override ISqlFragment Visit(DbSkipExpression e) //Create the resulting statement //See CreateNewSelectStatement, it is very similar - //Future Enhancement (Microsoft): Refactor to avoid duplication with CreateNewSelectStatement if we + //Future Enhancement ([....]): Refactor to avoid duplication with CreateNewSelectStatement if we // don't switch to using ExtensionExpression here SqlSelectStatement result = new SqlSelectStatement(); result.From.Append("( "); @@ -3694,7 +3694,7 @@ private void AddSortKeys(SqlBuilder orderByClause, IList sortKeys) { orderByClause.Append(separator); orderByClause.Append(sortClause.Expression.Accept(this)); - // + // Bug 431021: COLLATE clause must precede ASC/DESC Debug.Assert(sortClause.Collation != null); if (!String.IsNullOrEmpty(sortClause.Collation)) { diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectClauseBuilder.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectClauseBuilder.cs index 83d2b2479..8c3b203bd 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectClauseBuilder.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectClauseBuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectStatement.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectStatement.cs index 3893137a5..d44940d8d 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectStatement.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlSelectStatement.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlWriter.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlWriter.cs index 439738387..f8e4e2f06 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlWriter.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SqlWriter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/Symbol.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/Symbol.cs index 5257812e0..f5e8f20b3 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/Symbol.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/Symbol.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolPair.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolPair.cs index b1684aa77..5624db4cb 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolPair.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolPair.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolTable.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolTable.cs index 3cf8d038d..b47c8e69f 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolTable.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolTable.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolUsageManager.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolUsageManager.cs index 7f9152076..d0572b75e 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolUsageManager.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/SymbolUsageManager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlGen/TopClause.cs b/System.Data.Entity/System/Data/SqlClient/SqlGen/TopClause.cs index e09e2252f..5bd2c195a 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlGen/TopClause.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlGen/TopClause.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlProviderManifest.cs b/System.Data.Entity/System/Data/SqlClient/SqlProviderManifest.cs index 2553a4a33..3a0a4d3d0 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlProviderManifest.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlProviderManifest.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlProviderServices.cs b/System.Data.Entity/System/Data/SqlClient/SqlProviderServices.cs index a917faa6c..aa28e6af8 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlProviderServices.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlProviderServices.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data.Entity/System/Data/SqlClient/SqlProviderUtilities.cs b/System.Data.Entity/System/Data/SqlClient/SqlProviderUtilities.cs index 425b97d10..283abf3e6 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlProviderUtilities.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlProviderUtilities.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlSpatialDataReader.cs b/System.Data.Entity/System/Data/SqlClient/SqlSpatialDataReader.cs index ef7b9c6a1..607dd1e24 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlSpatialDataReader.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlSpatialDataReader.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Common.Utils; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.Generated.cs b/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.Generated.cs index 6d749c83a..4007c8146 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.Generated.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.Generated.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //-------------------------------------------------------------------------- // This file is automatically generated and should not be changed directly. // diff --git a/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.cs b/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.cs index d9e787050..cd5a2dec0 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlSpatialServices.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlTypesAssembly.cs b/System.Data.Entity/System/Data/SqlClient/SqlTypesAssembly.cs index c9213bb25..ee3eff1e5 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlTypesAssembly.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlTypesAssembly.cs @@ -4,7 +4,7 @@ // // // @owner willa -// @backupOwner Microsoft +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.Entity/System/Data/SqlClient/SqlVersion.cs b/System.Data.Entity/System/Data/SqlClient/SqlVersion.cs index e9fc500e2..360a25990 100644 --- a/System.Data.Entity/System/Data/SqlClient/SqlVersion.cs +++ b/System.Data.Entity/System/Data/SqlClient/SqlVersion.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data.SqlClient diff --git a/System.Data.Entity/System/Data/UpdateException.cs b/System.Data.Entity/System/Data/UpdateException.cs index 739893c67..7a1698868 100644 --- a/System.Data.Entity/System/Data/UpdateException.cs +++ b/System.Data.Entity/System/Data/UpdateException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Data diff --git a/System.Data.Entity/Util/AppSettings.cs b/System.Data.Entity/Util/AppSettings.cs index 2617ed2df..9877ddace 100644 --- a/System.Data.Entity/Util/AppSettings.cs +++ b/System.Data.Entity/Util/AppSettings.cs @@ -4,7 +4,7 @@ // // // @owner daobando -// @backupOwner Microsoft +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Specialized; diff --git a/System.Data.Linq/ChangeConflicts.cs b/System.Data.Linq/ChangeConflicts.cs index 5ce354335..815335272 100644 --- a/System.Data.Linq/ChangeConflicts.cs +++ b/System.Data.Linq/ChangeConflicts.cs @@ -279,7 +279,7 @@ public void Resolve(RefreshMode refreshMode, bool autoResolveDeletes) { private void ResolveDelete() { Debug.Assert(this.IsDeleted); // If the user is attempting to update an entity that no longer exists - // in the database, we first need to sync the delete into the local cache. + // in the database, we first need to [....] the delete into the local cache. if (!trackedObject.IsDeleted) { trackedObject.ConvertToDeleted(); } @@ -287,7 +287,7 @@ private void ResolveDelete() { // As the object have been deleted, it needs to leave the cache this.Session.Context.Services.RemoveCachedObjectLike(trackedObject.Type, trackedObject.Original); - // Now that our cache is in sync, we accept the changes + // Now that our cache is in [....], we accept the changes this.trackedObject.AcceptChanges(); this.isResolved = true; } diff --git a/System.Data.Linq/ChangeDirector.cs b/System.Data.Linq/ChangeDirector.cs index 74f9bf151..96fc7db3b 100644 --- a/System.Data.Linq/ChangeDirector.cs +++ b/System.Data.Linq/ChangeDirector.cs @@ -45,14 +45,14 @@ private enum UpdateType { Insert, Update, Delete }; private enum AutoSyncBehavior { ApplyNewAutoSync, RollbackSavedValues } DataContext context; - [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="Microsoft: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] + [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="[....]: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] List> syncRollbackItems; internal StandardChangeDirector(DataContext context) { this.context = context; } - [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="Microsoft: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] + [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="[....]: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] private List> SyncRollbackItems { get { if (syncRollbackItems == null) { @@ -89,7 +89,7 @@ internal override int DynamicInsert(TrackedObject item) { IEnumerable facts = (IEnumerable)this.context.Provider.Execute(cmd).ReturnValue; object[] syncResults = (object[])facts.FirstOrDefault(); if (syncResults != null) { - // sync any auto gen or computed members + // [....] any auto gen or computed members AutoSyncMembers(syncResults, item, UpdateType.Insert, AutoSyncBehavior.ApplyNewAutoSync); return 1; } @@ -142,7 +142,7 @@ internal override int DynamicUpdate(TrackedObject item) { IEnumerable facts = (IEnumerable)this.context.Provider.Execute(cmd).ReturnValue; object[] syncResults = (object[])facts.FirstOrDefault(); if (syncResults != null) { - // sync any auto gen or computed members + // [....] any auto gen or computed members AutoSyncMembers(syncResults, item, UpdateType.Update, AutoSyncBehavior.ApplyNewAutoSync); return 1; } @@ -204,7 +204,7 @@ internal override void AppendDeleteText(TrackedObject item, StringBuilder append } } - [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="Microsoft: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] + [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="[....]: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] internal override void RollbackAutoSync() { // Rolls back any AutoSync values that may have been set already // Those values are no longer valid since the transaction will be rolled back on the server @@ -222,7 +222,7 @@ internal override void RollbackAutoSync() { } } - [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="Microsoft: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] + [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="[....]: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] internal override void ClearAutoSyncRollback() { this.syncRollbackItems = null; } @@ -260,7 +260,7 @@ private Expression CreateAutoSync(List membersToSync, Expression private static List GetAutoSyncMembers(MetaType metaType, UpdateType updateType) { List membersToSync = new List(); foreach (MetaDataMember metaMember in metaType.PersistentDataMembers.OrderBy(m => m.Ordinal)) { - // add all auto generated members for the specified update type to the auto-sync list + // add all auto generated members for the specified update type to the auto-[....] list if ((updateType == UpdateType.Insert && metaMember.AutoSync == AutoSync.OnInsert) || (updateType == UpdateType.Update && metaMember.AutoSync == AutoSync.OnUpdate) || metaMember.AutoSync == AutoSync.Always) { @@ -272,14 +272,14 @@ private static List GetAutoSyncMembers(MetaType metaType, Update /// /// Synchronize the specified item by copying in data from the specified results. - /// Used to sync members after successful insert or update, but also used to rollback to previous values if a failure + /// Used to [....] members after successful insert or update, but also used to rollback to previous values if a failure /// occurs on other entities in the same SubmitChanges batch. /// /// - /// If AutoSyncBehavior.ApplyNewAutoSync, the current value of the property is saved before the sync occurs. This is used for normal synchronization after a successful update/insert. - /// Otherwise, the current value is not saved. This is used for rollback operations when something in the SubmitChanges batch failed, rendering the previously-sync'd values invalid. + /// If AutoSyncBehavior.ApplyNewAutoSync, the current value of the property is saved before the [....] occurs. This is used for normal synchronization after a successful update/insert. + /// Otherwise, the current value is not saved. This is used for rollback operations when something in the SubmitChanges batch failed, rendering the previously-[....]'d values invalid. /// - [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="Microsoft: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] + [SuppressMessage("Microsoft.MSInternal", "CA908:AvoidTypesThatRequireJitCompilationInPrecompiledAssemblies", Justification="[....]: FxCop bug Dev10:423110 -- List> is not supposed to be flagged as a violation.")] private void AutoSyncMembers(object[] syncResults, TrackedObject item, UpdateType updateType, AutoSyncBehavior autoSyncBehavior) { System.Diagnostics.Debug.Assert(item != null); System.Diagnostics.Debug.Assert(item.IsNew || item.IsPossiblyModified, "AutoSyncMembers should only be called for new and modified objects."); diff --git a/System.Data.Linq/ChangeProcessor.cs b/System.Data.Linq/ChangeProcessor.cs index 0affa3cb6..4eaa79b5a 100644 --- a/System.Data.Linq/ChangeProcessor.cs +++ b/System.Data.Linq/ChangeProcessor.cs @@ -115,9 +115,9 @@ internal void SubmitChanges(ConflictMode failureMode) { // if we have accumulated any failed updates, throw the exception now if (conflicts.Count > 0) { - // First we need to rollback any value that have already been auto-sync'd, since the values are no longer valid on the server + // First we need to rollback any value that have already been auto-[....]'d, since the values are no longer valid on the server changeDirector.RollbackAutoSync(); - // Also rollback any dependent items that were sync'd, since their parent values may have been rolled back + // Also rollback any dependent items that were [....]'d, since their parent values may have been rolled back foreach (TrackedObject syncDependentItem in syncDependentItems) { Debug.Assert(syncDependentItem.IsNew || syncDependentItem.IsPossiblyModified, "SynchDependent data should only be rolled back for new and modified objects."); syncDependentItem.SynchDependentData(); diff --git a/System.Data.Linq/ChangeTracker.cs b/System.Data.Linq/ChangeTracker.cs index 4e850afa9..76d80426b 100644 --- a/System.Data.Linq/ChangeTracker.cs +++ b/System.Data.Linq/ChangeTracker.cs @@ -560,7 +560,7 @@ internal void StartTracking() { } } - // Return value indicates whether or not any data was actually sync'd + // Return value indicates whether or not any data was actually [....]'d internal override bool SynchDependentData() { bool valueWasSet = false; diff --git a/System.Data.Linq/CompiledQuery.cs b/System.Data.Linq/CompiledQuery.cs index ee789b785..275883b02 100644 --- a/System.Data.Linq/CompiledQuery.cs +++ b/System.Data.Linq/CompiledQuery.cs @@ -31,7 +31,7 @@ public LambdaExpression Expression { get { return this.query; } } - [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Microsoft: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] + [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "[....]: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -44,7 +44,7 @@ public static Func Compile(Expression Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -57,7 +57,7 @@ public static Func Compile(Express } } - [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Microsoft: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] + [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "[....]: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -70,7 +70,7 @@ public static Func Compile Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -83,7 +83,7 @@ public static Func Compile Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -96,7 +96,7 @@ public static Func Compile Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -109,7 +109,7 @@ public static Func Compile Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -122,7 +122,7 @@ public static Func Com } } - [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Microsoft: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] + [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "[....]: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -135,7 +135,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -148,7 +148,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -161,7 +161,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -174,7 +174,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -187,7 +187,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -200,7 +200,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -213,7 +213,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); @@ -226,7 +226,7 @@ public static Func Compile(Expression> query) where TArg0 : DataContext { if (query == null) { Error.ArgumentNull("query"); diff --git a/System.Data.Linq/DataContext.cs b/System.Data.Linq/DataContext.cs index 822c6ea1b..5d7fb47e7 100644 --- a/System.Data.Linq/DataContext.cs +++ b/System.Data.Linq/DataContext.cs @@ -352,7 +352,7 @@ internal void CheckInSubmitChanges() { /// The type of the entity objects. In case of a persistent hierarchy /// the entity specified must be the base type of the hierarchy. /// - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public Table GetTable() where TEntity : class { CheckDispose(); MetaTable metaTable = this.services.Model.GetTable(typeof(TEntity)); @@ -483,7 +483,7 @@ public void SubmitChanges() { /// You can override this method to implement common conflict resolution behaviors. /// /// Determines how SubmitChanges handles conflicts. - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Microsoft: In the middle of attempting to rollback a transaction, outer transaction is thrown.")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "[....]: In the middle of attempting to rollback a transaction, outer transaction is thrown.")] public virtual void SubmitChanges(ConflictMode failureMode) { CheckDispose(); CheckNotInSubmitChanges(); @@ -718,7 +718,7 @@ public int ExecuteCommand(string command, params object[] parameters) { /// The query specified in the server's native query language. /// The parameter values to use for the query. /// An IEnumerable sequence of objects. - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public IEnumerable ExecuteQuery(string query, params object[] parameters) { CheckDispose(); if (query == null) { @@ -786,7 +786,7 @@ internal protected IExecuteResult ExecuteMethodCall(object instance, MethodInfo /// The reflection MethodInfo for the method to invoke. /// The parameters for the method call. /// The returned query object - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] internal protected IQueryable CreateMethodCallQuery(object instance, MethodInfo methodInfo, params object[] parameters) { CheckDispose(); if (instance == null) { @@ -884,7 +884,7 @@ internal protected void ExecuteDynamicDelete(object entity) { /// The element type of the resulting sequence /// The DbDataReader to translate /// The translated sequence of objects - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public IEnumerable Translate(DbDataReader reader) { CheckDispose(); return (IEnumerable)this.Translate(typeof(TResult), reader); @@ -999,7 +999,7 @@ public interface ITable : IQueryable /// ITable is the common interface for DataContext tables. It can be used as the source /// of a dynamic/runtime-generated query. /// - [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="Microsoft: Meant to represent a database table which is delayed loaded and doesn't provide collection semantics.")] + [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="[....]: Meant to represent a database table which is delayed loaded and doesn't provide collection semantics.")] public interface ITable : IQueryable { /// /// The DataContext containing this Table. @@ -1102,7 +1102,7 @@ public interface ITable : IQueryable { /// persisted in the database. Use it as a source of queries and to add/insert and remove/delete entities. /// /// - [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="Microsoft: Meant to represent a database table which is delayed loaded and doesn't provide collection semantics.")] + [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="[....]: Meant to represent a database table which is delayed loaded and doesn't provide collection semantics.")] public sealed class Table : IQueryable, IQueryProvider, IEnumerable, IQueryable, IEnumerable, ITable, IListSource, ITable where TEntity : class { DataContext context; @@ -1156,7 +1156,7 @@ IQueryable IQueryProvider.CreateQuery(Expression expression) { return (IQueryable)Activator.CreateInstance(dqType, new object[] { this.context, expression }); } - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] IQueryable IQueryProvider.CreateQuery(Expression expression) { if (expression == null) { throw Error.ArgumentNull("expression"); @@ -1171,7 +1171,7 @@ object IQueryProvider.Execute(Expression expression) { return this.context.Provider.Execute(expression).ReturnValue; } - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] TResult IQueryProvider.Execute(Expression expression) { return (TResult)this.context.Provider.Execute(expression).ReturnValue; } @@ -1680,7 +1680,7 @@ public override string ToString() { } } - [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "Microsoft: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] + [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "[....]: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] public struct ModifiedMemberInfo { MemberInfo member; object current; diff --git a/System.Data.Linq/DataShape.cs b/System.Data.Linq/DataShape.cs index 940b746fa..e46bb6ee1 100644 --- a/System.Data.Linq/DataShape.cs +++ b/System.Data.Linq/DataShape.cs @@ -17,8 +17,8 @@ sealed public class DataLoadOptions { /// /// Describe a property that is automatically loaded when the containing instance is loaded /// - [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Microsoft: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] - [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Microsoft: Need to provide static typing.")] + [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "[....]: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] + [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "[....]: Need to provide static typing.")] public void LoadWith(Expression> expression) { if (expression == null) { throw Error.ArgumentNull("expression"); @@ -41,8 +41,8 @@ public void LoadWith(LambdaExpression expression) { /// /// Place a subquery on the given association. /// - [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "Microsoft: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] - [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "Microsoft: Need to provide static typing.")] + [SuppressMessage("Microsoft.Design", "CA1006:DoNotNestGenericTypesInMemberSignatures", Justification = "[....]: Generic types are an important part of Linq APIs and they could not exist without nested generic support.")] + [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters", Justification = "[....]: Need to provide static typing.")] public void AssociateWith(Expression> expression) { if (expression == null) { throw Error.ArgumentNull("expression"); @@ -234,7 +234,7 @@ private void ValidateTypeGraphAcyclic() { } edges = newEdges; } - throw new InvalidOperationException("Bug in ValidateTypeGraphAcyclic"); // Getting here means a + throw new InvalidOperationException("Bug in ValidateTypeGraphAcyclic"); // Getting here means a bug. } private static Type GetIncludeTarget(MemberInfo mi) { diff --git a/System.Data.Linq/DbConvert.cs b/System.Data.Linq/DbConvert.cs index 7d21b20de..03af1adc4 100644 --- a/System.Data.Linq/DbConvert.cs +++ b/System.Data.Linq/DbConvert.cs @@ -15,12 +15,12 @@ namespace System.Data.Linq { public static class DBConvert { private static Type[] StringArg = new Type[] { typeof(string) }; - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public static T ChangeType(object value) { return (T)ChangeType(value, typeof(T)); } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] public static object ChangeType(object value, Type type) { if (value == null) diff --git a/System.Data.Linq/IdentityManager.cs b/System.Data.Linq/IdentityManager.cs index dbc4eae8f..414c19343 100644 --- a/System.Data.Linq/IdentityManager.cs +++ b/System.Data.Linq/IdentityManager.cs @@ -97,8 +97,8 @@ static KeyManager GetKeyManager(MetaType type) { #region Nested type definitions // These types are internal rather than private to work around - // CLR - + // CLR bug #117419 related to type visibility under partial trust + // in nested class scenarios. internal abstract class KeyManager { internal abstract Type KeyType { get; } diff --git a/System.Data.Linq/Mapping/MetaModel.cs b/System.Data.Linq/Mapping/MetaModel.cs index 68b69b3de..d07e222ba 100644 --- a/System.Data.Linq/Mapping/MetaModel.cs +++ b/System.Data.Linq/Mapping/MetaModel.cs @@ -501,7 +501,7 @@ public abstract class MetaAccessor { /// /// The instance to set the value into. /// The value to set. - [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification="Microsoft: Needs to handle classes and structs.")] + [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification="[....]: Needs to handle classes and structs.")] [SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference", Justification="Unknown reason.")] public abstract void SetBoxedValue(ref object instance, object value); /// diff --git a/System.Data.Linq/Provider/IProvider.cs b/System.Data.Linq/Provider/IProvider.cs index 98438415b..56eccaa93 100644 --- a/System.Data.Linq/Provider/IProvider.cs +++ b/System.Data.Linq/Provider/IProvider.cs @@ -140,8 +140,8 @@ internal static class DataManipulation { /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "[....]: The method is being used to represent a method signature")] public static TResult Insert(TEntity item, Func resultSelector) { throw new NotImplementedException(); } @@ -152,7 +152,7 @@ public static TResult Insert(TEntity item, Func /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] public static int Insert(TEntity item) { throw new NotImplementedException(); } @@ -166,9 +166,9 @@ public static int Insert(TEntity item) { /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "[....]: The method is being used to represent a method signature")] public static TResult Update(TEntity item, Func check, Func resultSelector) { throw new NotImplementedException(); } @@ -181,8 +181,8 @@ public static TResult Update(TEntity item, Func /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "resultSelector", Justification = "[....]: The method is being used to represent a method signature")] public static TResult Update(TEntity item, Func resultSelector) { throw new NotImplementedException(); } @@ -194,8 +194,8 @@ public static TResult Update(TEntity item, Func /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "[....]: The method is being used to represent a method signature")] public static int Update(TEntity item, Func check) { throw new NotImplementedException(); } @@ -206,7 +206,7 @@ public static int Update(TEntity item, Func check) { /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] public static int Update(TEntity item) { throw new NotImplementedException(); } @@ -218,8 +218,8 @@ public static int Update(TEntity item) { /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "check", Justification = "[....]: The method is being used to represent a method signature")] public static int Delete(TEntity item, Func check) { throw new NotImplementedException(); } @@ -230,7 +230,7 @@ public static int Delete(TEntity item, Func check) { /// /// /// - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "Microsoft: The method is being used to represent a method signature")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "item", Justification = "[....]: The method is being used to represent a method signature")] public static int Delete(TEntity item) { throw new NotImplementedException(); } diff --git a/System.Data.Linq/SqlClient/Common/SqlVisitor.cs b/System.Data.Linq/SqlClient/Common/SqlVisitor.cs index 87d874585..9f35835e4 100644 --- a/System.Data.Linq/SqlClient/Common/SqlVisitor.cs +++ b/System.Data.Linq/SqlClient/Common/SqlVisitor.cs @@ -9,7 +9,7 @@ internal abstract class SqlVisitor { int nDepth; // Visit a SqlNode - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification="Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification="[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] internal virtual SqlNode Visit(SqlNode node) { diff --git a/System.Data.Linq/SqlClient/Query/Funcletizer.cs b/System.Data.Linq/SqlClient/Query/Funcletizer.cs index 50ccc2c6d..57d09b761 100644 --- a/System.Data.Linq/SqlClient/Query/Funcletizer.cs +++ b/System.Data.Linq/SqlClient/Query/Funcletizer.cs @@ -142,7 +142,7 @@ internal ExpressionVisitor() { } [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] internal virtual Expression Visit(Expression exp) { if (exp == null) return exp; diff --git a/System.Data.Linq/SqlClient/Query/QueryConverter.cs b/System.Data.Linq/SqlClient/Query/QueryConverter.cs index a9135481d..55ae51ee9 100644 --- a/System.Data.Linq/SqlClient/Query/QueryConverter.cs +++ b/System.Data.Linq/SqlClient/Query/QueryConverter.cs @@ -143,7 +143,7 @@ internal SqlNode ConvertInner(Expression node, Expression dominantExpression) { return result; } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] private SqlNode VisitInner(Expression node) { if (node == null) return null; diff --git a/System.Data.Linq/SqlClient/Query/SqlBinder.cs b/System.Data.Linq/SqlClient/Query/SqlBinder.cs index 6d5c6e615..26645270a 100644 --- a/System.Data.Linq/SqlClient/Query/SqlBinder.cs +++ b/System.Data.Linq/SqlClient/Query/SqlBinder.cs @@ -1266,7 +1266,7 @@ internal SqlExpression ConvertToExpression(SqlNode node) { throw Error.UnexpectedNode(node.NodeType); } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] internal SqlExpression ConvertToFetchedExpression(SqlNode node) { diff --git a/System.Data.Linq/SqlClient/Query/SqlComparer.cs b/System.Data.Linq/SqlClient/Query/SqlComparer.cs index d70c0becb..06a76c701 100644 --- a/System.Data.Linq/SqlClient/Query/SqlComparer.cs +++ b/System.Data.Linq/SqlClient/Query/SqlComparer.cs @@ -13,7 +13,7 @@ internal class SqlComparer { internal SqlComparer() { } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] [SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] diff --git a/System.Data.Linq/SqlClient/Query/SqlDeflator.cs b/System.Data.Linq/SqlClient/Query/SqlDeflator.cs index ed4f0e66e..b290c007c 100644 --- a/System.Data.Linq/SqlClient/Query/SqlDeflator.cs +++ b/System.Data.Linq/SqlClient/Query/SqlDeflator.cs @@ -236,7 +236,7 @@ internal override SqlSelect VisitSelect(SqlSelect select) { return select; } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification="Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification="[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] private void CheckJoinCondition(SqlExpression expr) { switch (expr.NodeType) { case SqlNodeType.And: { diff --git a/System.Data.Linq/SqlClient/Query/SqlFlattener.cs b/System.Data.Linq/SqlClient/Query/SqlFlattener.cs index 9717a97a0..9b7d7de01 100644 --- a/System.Data.Linq/SqlClient/Query/SqlFlattener.cs +++ b/System.Data.Linq/SqlClient/Query/SqlFlattener.cs @@ -20,7 +20,7 @@ internal SqlNode Flatten(SqlNode node) { } class Visitor : SqlVisitor { - [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Microsoft: part of our standard visitor pattern")] + [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "[....]: part of our standard visitor pattern")] SqlFactory sql; SqlColumnizer columnizer; bool isTopLevel; diff --git a/System.Data.Linq/SqlClient/Query/SqlMethodCallConverter.cs b/System.Data.Linq/SqlClient/Query/SqlMethodCallConverter.cs index 79be6fe37..ddbca5a93 100644 --- a/System.Data.Linq/SqlClient/Query/SqlMethodCallConverter.cs +++ b/System.Data.Linq/SqlClient/Query/SqlMethodCallConverter.cs @@ -939,7 +939,7 @@ internal override SqlExpression VisitMethodCall(SqlMethodCall mc) { //Recognized pattern has set return value so return if (returnValue != null) { - // Assert here to verify that actual translation stays in sync with + // Assert here to verify that actual translation stays in [....] with // method support logic Debug.Assert(GetMethodSupport(mc) == MethodSupport.Method); return returnValue; @@ -973,7 +973,7 @@ internal override SqlExpression VisitMethodCall(SqlMethodCall mc) { returnValue = TranslateDateTimeOffsetInstanceMethod(mc); } if (returnValue != null) { - // Assert here to verify that actual translation stays in sync with + // Assert here to verify that actual translation stays in [....] with // method support logic Debug.Assert(GetMethodSupport(mc) == MethodSupport.Method); return returnValue; @@ -2159,7 +2159,7 @@ private SqlExpression TranslateMathMethod(SqlMethodCall mc) { throw GetMethodSupportException(mc); } - [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "Microsoft: These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] + [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "[....]: These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] internal override SqlNode VisitMember(SqlMember m) { SqlExpression exp = this.VisitExpression(m.Expression); MemberInfo member = m.Member; diff --git a/System.Data.Linq/SqlClient/Reader/ObjectReaderCompiler.cs b/System.Data.Linq/SqlClient/Reader/ObjectReaderCompiler.cs index 70507c245..44139f927 100644 --- a/System.Data.Linq/SqlClient/Reader/ObjectReaderCompiler.cs +++ b/System.Data.Linq/SqlClient/Reader/ObjectReaderCompiler.cs @@ -35,18 +35,18 @@ namespace Implementation { [SuppressMessage("Microsoft.Design", "CA1012:AbstractTypesShouldNotHaveConstructors", Justification = "Unknown reason.")] public abstract class ObjectMaterializer where TDataReader : DbDataReader { // These are public fields rather than properties for access speed - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public int[] Ordinals; [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Globals", Justification = "Spelling is correct.")] - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public object[] Globals; - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public object[] Locals; - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public object[] Arguments; - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public TDataReader DataReader; - [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "Microsoft: This is a public type that is not intended for public use.")] + [SuppressMessage("Microsoft.Design", "CA1051:DoNotDeclareVisibleInstanceFields", Justification = "[....]: This is a public type that is not intended for public use.")] public DbDataReader BufferReader; public ObjectMaterializer() { @@ -57,16 +57,16 @@ public ObjectMaterializer() { public abstract void SendEntityMaterialized(int globalMetaType, object instance); public abstract IEnumerable ExecuteSubQuery(int iSubQuery, object[] args); - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public abstract IEnumerable GetLinkSource(int globalLink, int localFactory, object[] keyValues); - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public abstract IEnumerable GetNestedLinkSource(int globalLink, int localFactory, object instance); public abstract bool Read(); public abstract bool CanDeferLoad { get; } [SuppressMessage("Microsoft.Design", "CA1000:DoNotDeclareStaticMembersOnGenericTypes", Justification = "xiaoruda: The method has to be static because it's used in our generated code and there is no instance of the type.")] - [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Microsoft: Generic parameters are required for strong-typing of the return type.")] + [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "[....]: Generic parameters are required for strong-typing of the return type.")] public static IEnumerable Convert(IEnumerable source) { foreach (object value in source) { yield return DBConvert.ChangeType(value); @@ -717,7 +717,7 @@ private Type Generate(SqlNode node) { return this.Generate(node, null); } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Justification = "These issues are related to our use of if-then and case statements for node types, which adds to the complexity count however when reviewed they are easy to navigate and understand.")] private Type Generate(SqlNode node, LocalBuilder locInstance) { #if DEBUG @@ -2212,7 +2212,7 @@ private void GenerateLoadMember(MemberInfo mi) { } } - [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", Justification = "Microsoft: The variable tc for which the rule fires is used in both a Debug.Assert and in a switch statement")] + [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals", Justification = "[....]: The variable tc for which the rule fires is used in both a Debug.Assert and in a switch statement")] private void GenerateArrayAssign(Type type) { // This method was copied out of the expression compiler codebase. // Since DLINQ doesn't currently consume array indexers most of this @@ -2263,7 +2263,7 @@ private void GenerateArrayAssign(Type type) { } } - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "address", Justification = "Microsoft: See comments in source. Usage commented out to improve code coverage test")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "address", Justification = "[....]: See comments in source. Usage commented out to improve code coverage test")] private Type GenerateArrayAccess(Type type, bool address) { // This method was copied out of the expression compiler codebase. // Since DLINQ doesn't currently consume array indexers most of this @@ -2517,7 +2517,7 @@ internal bool IsBuffered { get { return this.BufferReader != null; } } - [SuppressMessage("Microsoft.Globalization", "CA1306:SetLocaleForDataTypes", Justification = "Microsoft: Used only as a buffer and never used for string comparison.")] + [SuppressMessage("Microsoft.Globalization", "CA1306:SetLocaleForDataTypes", Justification = "[....]: Used only as a buffer and never used for string comparison.")] internal void Buffer() { if (this.BufferReader == null && (this.hasCurrentRow || !this.hasRead)) { if (this.session.IsBuffered) { @@ -2801,7 +2801,7 @@ public bool IsBuffered { get { return this.buffer != null; } } - [SuppressMessage("Microsoft.Globalization", "CA1306:SetLocaleForDataTypes", Justification = "Microsoft: Used only as a buffer and never used for string comparison.")] + [SuppressMessage("Microsoft.Globalization", "CA1306:SetLocaleForDataTypes", Justification = "[....]: Used only as a buffer and never used for string comparison.")] public void Buffer() { if (this.buffer == null) { if (this.currentReader != null && !this.currentReader.IsBuffered) { diff --git a/System.Data.Linq/SqlClient/SqlMethods.cs b/System.Data.Linq/SqlClient/SqlMethods.cs index da3696d31..e11bca1e8 100644 --- a/System.Data.Linq/SqlClient/SqlMethods.cs +++ b/System.Data.Linq/SqlClient/SqlMethods.cs @@ -562,8 +562,8 @@ public static int DateDiffNanosecond(DateTimeOffset startDate, DateTimeOffset en /// The string that is to be matched. /// The pattern which may involve wildcards %,_,[,],^. /// true if there is a match. - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "pattern", Justification = "Microsoft: Method is a placeholder for a server-side method.")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "matchExpression", Justification = "Microsoft: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "pattern", Justification = "[....]: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "matchExpression", Justification = "[....]: Method is a placeholder for a server-side method.")] public static bool Like(string matchExpression, string pattern) { throw Error.SqlMethodOnlyForSql(MethodInfo.GetCurrentMethod()); } @@ -576,9 +576,9 @@ public static bool Like(string matchExpression, string pattern) { /// The pattern which may involve wildcards %,_,[,],^. /// The escape character to use in front of %,_,[,],^ if they are not used as wildcards. /// true if there is a match. - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "pattern", Justification = "Microsoft: Method is a placeholder for a server-side method.")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "matchExpression", Justification = "Microsoft: Method is a placeholder for a server-side method.")] - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "escapeCharacter", Justification = "Microsoft: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "pattern", Justification = "[....]: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "matchExpression", Justification = "[....]: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "escapeCharacter", Justification = "[....]: Method is a placeholder for a server-side method.")] public static bool Like(string matchExpression, string pattern, char escapeCharacter) { throw Error.SqlMethodOnlyForSql(MethodInfo.GetCurrentMethod()); } @@ -591,7 +591,7 @@ public static bool Like(string matchExpression, string pattern, char escapeChara /// /// The string to take the length of. /// length of the string - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "Microsoft: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "[....]: Method is a placeholder for a server-side method.")] internal static int RawLength(string value) { throw Error.SqlMethodOnlyForSql(MethodInfo.GetCurrentMethod()); } @@ -602,7 +602,7 @@ internal static int RawLength(string value) { /// /// The byte array to take the length of. /// length of the array - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "Microsoft: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "[....]: Method is a placeholder for a server-side method.")] internal static int RawLength(byte[] value) { throw Error.SqlMethodOnlyForSql(MethodInfo.GetCurrentMethod()); } @@ -613,7 +613,7 @@ internal static int RawLength(byte[] value) { /// /// The Binary value to take the length of. /// length of the Binary - [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "Microsoft: Method is a placeholder for a server-side method.")] + [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value", Justification = "[....]: Method is a placeholder for a server-side method.")] internal static int RawLength(Binary value) { throw Error.SqlMethodOnlyForSql(MethodInfo.GetCurrentMethod()); } diff --git a/System.Data.Linq/SqlClient/SqlProvider.cs b/System.Data.Linq/SqlClient/SqlProvider.cs index 437759cb9..f3dce0d1c 100644 --- a/System.Data.Linq/SqlClient/SqlProvider.cs +++ b/System.Data.Linq/SqlClient/SqlProvider.cs @@ -738,7 +738,7 @@ void IProvider.DeleteDatabase() { } } - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification="Microsoft: Code needs to return false regarless of exception.")] + [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification="[....]: Code needs to return false regarless of exception.")] [ResourceExposure(ResourceScope.None)] // Exposure is via other methods that set dbName. [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] // File.Exists method call. bool IProvider.DatabaseExists() { @@ -1779,7 +1779,7 @@ class ExecuteResult : IExecuteResult, IDisposable { IObjectReaderSession session; int iReturnParameter = -1; object value; - [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Microsoft: used in an assert in ReturnValue.set")] + [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "[....]: used in an assert in ReturnValue.set")] bool useReturnValue; bool isDisposed; diff --git a/System.Data.Linq/SqlClient/SqlTypeSystemProvider.cs b/System.Data.Linq/SqlClient/SqlTypeSystemProvider.cs index f71e86597..06bb4d3af 100644 --- a/System.Data.Linq/SqlClient/SqlTypeSystemProvider.cs +++ b/System.Data.Linq/SqlClient/SqlTypeSystemProvider.cs @@ -1316,7 +1316,7 @@ internal override ProviderType ChangeTypeFamilyTo(ProviderType type, ProviderTyp } } - [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "Microsoft: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] + [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Justification = "[....]: Cast is dependent on node type and casts do not happen unecessarily in a single code path.")] internal override ProviderType GetBestType(ProviderType typeA, ProviderType typeB) { // first determine the type precedence SqlType bestType = (SqlType)(typeA.ComparePrecedenceTo(typeB) > 0 ? typeA : typeB); diff --git a/System.Data.Linq/Types.cs b/System.Data.Linq/Types.cs index d132e20d5..c6d89a010 100644 --- a/System.Data.Linq/Types.cs +++ b/System.Data.Linq/Types.cs @@ -17,7 +17,7 @@ internal static class SourceState { internal static readonly IEnumerable Assigned = (IEnumerable)new T[] { }; } - [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "Microsoft: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] + [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification = "[....]: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] public struct Link { T underlyingValue; IEnumerable source; @@ -80,7 +80,7 @@ public T Value { } } - [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification="Microsoft: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] + [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes", Justification="[....]: Types are never compared to each other. When comparisons happen it is against the entities that are represented by these constructs.")] public struct EntityRef where TEntity : class { IEnumerable source; @@ -146,7 +146,7 @@ internal TEntity UnderlyingValue { } } - [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="Microsoft: Naming chosen to represent a different concept from a collection because it is delayed loaded.")] + [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix", Justification="[....]: Naming chosen to represent a different concept from a collection because it is delayed loaded.")] public sealed class EntitySet : IList, IList, IListSource where TEntity : class { IEnumerable source; @@ -213,7 +213,7 @@ public TEntity this[int index] { } } - [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "Microsoft: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] + [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "[....]: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] public void Add(TEntity entity) { if (entity == null) { throw Error.ArgumentNull("entity"); @@ -279,7 +279,7 @@ public void Clear() { OnListChanged(ListChangedType.Reset, 0); } - [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "Microsoft: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] + [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "[....]: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] public bool Contains(TEntity entity) { return IndexOf(entity) >= 0; } @@ -311,13 +311,13 @@ IEnumerator IEnumerable.GetEnumerator() { } } - [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "Microsoft: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] + [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "[....]: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] public int IndexOf(TEntity entity) { Load(); return entities.IndexOf(entity); } - [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "1#", Justification = "Microsoft: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] + [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "1#", Justification = "[....]: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] public void Insert(int index, TEntity entity) { Load(); if (index < 0 || index > Count) @@ -406,7 +406,7 @@ private void OnModified() { isModified = true; } - [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "Microsoft: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] + [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", MessageId = "0#", Justification = "[....]: Naming the parameter entity makes it more discoverable because it is clear what type of data should be added to this collection.")] public bool Remove(TEntity entity) { if (entity == null || entity == onRemoveEntity) return false; CheckModify(); @@ -758,7 +758,7 @@ public T Current { } } - [SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces", Justification = "Microsoft: The name clearly describes function and the namespace is under a DLinq namespace which will make the distinction clear.")] + [SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces", Justification = "[....]: The name clearly describes function and the namespace is under a DLinq namespace which will make the distinction clear.")] [DataContract] [Serializable] public sealed class Binary : IEquatable { diff --git a/System.Data.Linq/misc/SecurityUtils.cs b/System.Data.Linq/misc/SecurityUtils.cs index 159dedbb6..76e02fafb 100644 --- a/System.Data.Linq/misc/SecurityUtils.cs +++ b/System.Data.Linq/misc/SecurityUtils.cs @@ -8,11 +8,11 @@ */ -#if Microsoft_NAMESPACE +#if WINFORMS_NAMESPACE namespace System.Windows.Forms #elif DRAWING_NAMESPACE namespace System.Drawing -#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY +#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY namespace System.Internal #elif SYSTEM_NAMESPACE namespace System @@ -127,7 +127,7 @@ internal static object SecureCreateInstance(Type type, object[] args, bool allow return Activator.CreateInstance(type, flags, null, args, null); } -#if (!Microsoft_NAMESPACE) +#if (!WINFORMS_NAMESPACE) /// /// This helper method provides safe access to Activator.CreateInstance. diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs index 393358762..6490ddfb9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/GenerateHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Globalization; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs index 3f284be5a..c99ee63ec 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/IteratorDescriptor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs index 064edcd75..85589508b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/OptimizerPatterns.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/StaticDataManager.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/StaticDataManager.cs index c04cebf1e..366f26d8d 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/StaticDataManager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/StaticDataManager.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/TailCallAnalyzer.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/TailCallAnalyzer.cs index 86ab9c3a2..343293ebb 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/TailCallAnalyzer.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/TailCallAnalyzer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILAnnotation.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILAnnotation.cs index 5c339d4f0..d029da0d7 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILAnnotation.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILAnnotation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Reflection; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILConstructAnalyzer.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILConstructAnalyzer.cs index 26daac8b9..c2c530141 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILConstructAnalyzer.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILConstructAnalyzer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILModule.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILModule.cs index e47912e44..2df1e23e2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILModule.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILModule.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILOptimizerVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILOptimizerVisitor.cs index 21d44654c..e1c869221 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILOptimizerVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlILOptimizerVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlTypeHelper.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlTypeHelper.cs index 3bb04f749..90b2c09d0 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlTypeHelper.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlTypeHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlVisitor.cs index f33d6a9c5..786be8983 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/IlGen/XmlIlVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/ListBase.cs b/System.Data.SqlXml/System/Xml/Xsl/ListBase.cs index 9e9364891..dbabda6f9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/ListBase.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/ListBase.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Pair.cs b/System.Data.SqlXml/System/Xml/Xsl/Pair.cs index 46a8ad5e5..4cc21c06a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Pair.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Pair.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilBinary.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilBinary.cs index c1982324c..1121c090b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilBinary.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilBinary.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilChoice.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilChoice.cs index 25139afcd..b9645a0c1 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilChoice.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilChoice.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilCloneVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilCloneVisitor.cs index 540ef9b57..12da6caa4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilCloneVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilCloneVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilDataSource.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilDataSource.cs index ae4964e2c..49f29d1d4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilDataSource.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilDataSource.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilExpression.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilExpression.cs index 08aacbff0..f2050d46d 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilExpression.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilExpression.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFactory.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFactory.cs index 8d941c659..743ae9829 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFactory.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFunction.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFunction.cs index 6cbfabcc8..c08b149dc 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFunction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilFunction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvoke.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvoke.cs index 4d8970b40..a99d6b5ed 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvoke.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvoke.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeEarlyBound.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeEarlyBound.cs index 4a8807191..4acb8d3e5 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeEarlyBound.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeEarlyBound.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeLateBound.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeLateBound.cs index 33b9dd55c..57ffa6189 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeLateBound.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilInvokeLateBound.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilIterator.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilIterator.cs index 51eafb533..04e1cdb89 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilIterator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilList.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilList.cs index 63f885868..8ac1d26c9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilList.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLiteral.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLiteral.cs index ac2480a4a..b20c678d8 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLiteral.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLiteral.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLoop.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLoop.cs index aeb4e0274..73702017f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLoop.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilLoop.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilName.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilName.cs index 7387507ce..1558795a5 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilName.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilName.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilNode.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilNode.cs index 6eefb53f2..40201b071 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilNode.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilNode.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilParameter.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilParameter.cs index 3fdcf6c02..357800ea0 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilParameter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilParameter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternFactory.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternFactory.cs index 28cdbe335..5798d4c33 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternFactory.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternVisitor.cs index bdd237a48..4b86398a2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilPatternVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReference.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReference.cs index f06089201..bf28cf11f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReference.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReference.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReplaceVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReplaceVisitor.cs index 3c422a891..e33515460 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReplaceVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilReplaceVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilScopedVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilScopedVisitor.cs index 556a6d331..a3bcfd59d 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilScopedVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilScopedVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilSortKey.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilSortKey.cs index c4b8b9211..a7d76b242 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilSortKey.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilSortKey.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilStrConcat.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilStrConcat.cs index 173955974..011075c45 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilStrConcat.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilStrConcat.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTargetType.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTargetType.cs index de1bcc1e6..ae27ad547 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTargetType.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTargetType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTernary.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTernary.cs index 493f12eaf..317891a50 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTernary.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTernary.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTypeChecker.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTypeChecker.cs index 0d10556e9..850c4c8d8 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTypeChecker.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilTypeChecker.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilUnary.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilUnary.cs index 4d1fbed67..4980715ef 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilUnary.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilUnary.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilValidationVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilValidationVisitor.cs index 9ebe9a2dc..678bf547f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilValidationVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilValidationVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilVisitor.cs index 5e5b5543e..ce86057f3 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlReader.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlReader.cs index eebd0d843..5a53a3e95 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlReader.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlWriter.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlWriter.cs index e53c663f9..83253ea5a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlWriter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/QilXmlWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/SubstitutionList.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/SubstitutionList.cs index 32868e6a1..223e5fbaf 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/SubstitutionList.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/SubstitutionList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QIL/WhitespaceRule.cs b/System.Data.SqlXml/System/Xml/Xsl/QIL/WhitespaceRule.cs index 914f12963..ca7ed1811 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QIL/WhitespaceRule.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QIL/WhitespaceRule.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/QueryReaderSettings.cs b/System.Data.SqlXml/System/Xml/Xsl/QueryReaderSettings.cs index 26cd3fc5d..d8ed8752b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/QueryReaderSettings.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/QueryReaderSettings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/ContentIterators.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/ContentIterators.cs index 02b7678ee..e13600336 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/ContentIterators.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/ContentIterators.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DecimalFormatter.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DecimalFormatter.cs index 43f6ee629..0662261d1 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DecimalFormatter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DecimalFormatter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DocumentOrderComparer.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DocumentOrderComparer.cs index 0d074a55d..07abd470b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DocumentOrderComparer.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DocumentOrderComparer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DodSequenceMerge.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DodSequenceMerge.cs index 89d230005..39928a7b4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/DodSequenceMerge.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/DodSequenceMerge.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/EarlyBoundInfo.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/EarlyBoundInfo.cs index 790cf9977..e6e31f979 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/EarlyBoundInfo.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/EarlyBoundInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/NumberFormatter.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/NumberFormatter.cs index 500a168de..2aef5b0da 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/NumberFormatter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/NumberFormatter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/RtfNavigator.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/RtfNavigator.cs index 42e3c1960..f31249e16 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/RtfNavigator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/RtfNavigator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Threading; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/SetIterators.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/SetIterators.cs index dbf8c20c8..62a4e8592 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/SetIterators.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/SetIterators.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/SiblingIterators.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/SiblingIterators.cs index 06c38ce39..d48459e9e 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/SiblingIterators.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/SiblingIterators.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/StringConcat.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/StringConcat.cs index b20f293db..6b41ec7c6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/StringConcat.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/StringConcat.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/TreeIterators.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/TreeIterators.cs index 05afae41b..a3cdf4903 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/TreeIterators.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/TreeIterators.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.ComponentModel; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleLookup.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleLookup.cs index 5a7dea1a3..3aa9ab535 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleLookup.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleLookup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleReader.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleReader.cs index 17207a418..4668e1522 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleReader.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/WhitespaceRuleReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.IO; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAggregates.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAggregates.cs index 7c4d0394b..902ffdf86 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAggregates.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAggregates.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAttributeCache.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAttributeCache.cs index c35eb8fc2..6f39cb3e4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAttributeCache.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlAttributeCache.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.Runtime { diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlCollation.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlCollation.cs index e06f6d902..956c2a654 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlCollation.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlCollation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlExtensionFunction.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlExtensionFunction.cs index 0425c8e83..d51ded1fa 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlExtensionFunction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlExtensionFunction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILIndex.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILIndex.cs index 679637e17..f03904573 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILIndex.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILIndex.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILStorageConverter.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILStorageConverter.cs index ad7f029ed..222ec5c05 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILStorageConverter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlILStorageConverter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlIterators.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlIterators.cs index d5f189c21..24e3a96a8 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlIterators.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlIterators.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorFilter.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorFilter.cs index 2e91ddc8a..6b8eb8264 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorFilter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorFilter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Xml; using System.Xml.XPath; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorStack.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorStack.cs index ab5d5cdc8..214b75582 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorStack.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlNavigatorStack.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryContext.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryContext.cs index 644bfa8c2..ca621b66b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryContext.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryContext.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryOutput.cs index 275b9e2bc..6fd3ce9e5 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; using System.ComponentModel; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryRuntime.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryRuntime.cs index 15d5db990..782a2e12c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryRuntime.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryRuntime.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.IO; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQuerySequence.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQuerySequence.cs index 727040cd6..2c01291b6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQuerySequence.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQuerySequence.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryStaticData.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryStaticData.cs index 7ca2d40b9..b3bae005f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryStaticData.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlQueryStaticData.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlRawWriterWrapper.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlRawWriterWrapper.cs index f08e0effe..c8766cfd0 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlRawWriterWrapper.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlRawWriterWrapper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.IO; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSequenceWriter.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSequenceWriter.cs index 1b974e927..f5538b75e 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSequenceWriter.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSequenceWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKey.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKey.cs index 793d287c5..772ffd6b4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKey.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKey.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKeyAccumulator.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKeyAccumulator.cs index d1f241b3a..3516c6724 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKeyAccumulator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XmlSortKeyAccumulator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XslNumber.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XslNumber.cs index 631232ac8..343dd36d7 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XslNumber.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XslNumber.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltConvert.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltConvert.cs index 93752e860..885ccaca9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltConvert.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltConvert.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltFunctions.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltFunctions.cs index 032279a4b..473cef5a4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltFunctions.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltFunctions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltLibrary.cs b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltLibrary.cs index 0f148d6ee..6f9b8236b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltLibrary.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Runtime/XsltLibrary.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Specialized; diff --git a/System.Data.SqlXml/System/Xml/Xsl/SourceLineInfo.cs b/System.Data.SqlXml/System/Xml/Xsl/SourceLineInfo.cs index 46f24679d..0e6659090 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/SourceLineInfo.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/SourceLineInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathBuilder.cs b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathBuilder.cs index 8f78d159c..b2ef65f8c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathBuilder.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; @@ -294,7 +294,7 @@ QilNode BuildAxisFilter(QilNode qilAxis, XPathAxis xpathAxis, XPathNodeType node // // - // ToDo: remove this code when IlGen + // ToDo: remove this code when IlGen bug will be fixed. if (qilAxis.NodeType == QilNodeType.Filter) { QilLoop filter = (QilLoop) qilAxis; filter.Body = f.And(filter.Body, diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathCompileException.cs b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathCompileException.cs index 81e25627a..570a32cf4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathCompileException.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathCompileException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Runtime.Serialization; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathParser.cs b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathParser.cs index 7b6b55429..516775489 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathParser.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathParser.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathQilFactory.cs b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathQilFactory.cs index 1bfc27441..6afc15b2f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathQilFactory.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathQilFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathScanner.cs b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathScanner.cs index 11f966e07..996dbaa4e 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathScanner.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPath/XPathScanner.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // http://www.w3.org/TR/xpath#exprlex //------------------------------------------------------------------------------ diff --git a/System.Data.SqlXml/System/Xml/Xsl/XPathConvert.cs b/System.Data.SqlXml/System/Xml/Xsl/XPathConvert.cs index 56d11f51c..5d2c9671e 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XPathConvert.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XPathConvert.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ /** @@ -2676,7 +2676,7 @@ public static unsafe double StringToDouble(string s) { } break; default: - // MSXML has a + // MSXML has a bug, we should not allow whitespace after a minus sign if (IsWhitespace(ch) && sign > 0) { pch = SkipWhitespace(pch); goto LRestart; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlILCommand.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlILCommand.cs index f0117615d..684b75fea 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlILCommand.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlILCommand.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] // http://webdata/xml/specs/querylowlevel.xml //------------------------------------------------------------------------------ diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlIlGenerator.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlIlGenerator.cs index 5952f556b..4075e22a2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlIlGenerator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlIlGenerator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlQualifiedNameTest.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlQualifiedNameTest.cs index d82d7ad71..394d5273a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlQualifiedNameTest.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlQualifiedNameTest.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryCardinality.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryCardinality.cs index c8131e706..7c6554630 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryCardinality.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryCardinality.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryType.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryType.cs index 84692be81..4e7c0eb74 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryType.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryType.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryTypeFactory.cs b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryTypeFactory.cs index 2548bb2d5..14cd425cb 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XmlQueryTypeFactory.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XmlQueryTypeFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XslException.cs b/System.Data.SqlXml/System/Xml/Xsl/XslException.cs index 1a896ddb1..2462fc6a6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XslException.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XslException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.CodeDom.Compiler; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Compiler.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Compiler.cs index 68fb7af2a..624f7b9d0 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Compiler.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Compiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.CodeDom.Compiler; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/CompilerScopeManager.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/CompilerScopeManager.cs index 4704df6db..c8bd252ef 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/CompilerScopeManager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/CompilerScopeManager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Focus.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Focus.cs index a110803de..d93962dbb 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Focus.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Focus.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/InvokeGenerator.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/InvokeGenerator.cs index a323e01e8..0f82b468e 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/InvokeGenerator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/InvokeGenerator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/KeyMatchBuilder.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/KeyMatchBuilder.cs index 4417d0be0..404e153ae 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/KeyMatchBuilder.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/KeyMatchBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Keywords.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Keywords.cs index 0ab7f5dcd..66d1532a1 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Keywords.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Keywords.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/MatcherBuilder.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/MatcherBuilder.cs index 22715a247..70f110b6f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/MatcherBuilder.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/MatcherBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/OutputScopeManager.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/OutputScopeManager.cs index 07506f558..4bdfe9285 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/OutputScopeManager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/OutputScopeManager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGenerator.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGenerator.cs index f73f9ab58..d29bc0ca3 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGenerator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGenerator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // http://www.w3.org/TR/xslt.html // http://www.w3.org/TR/xslt20/ //------------------------------------------------------------------------------ diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs index 2f606d8cf..7f0d17f22 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilGeneratorEnv.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilStrConcatenator.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilStrConcatenator.cs index fe1f4dd31..ba2c0dc22 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilStrConcatenator.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/QilStrConcatenator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; using System.Xml; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Scripts.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Scripts.cs index 86a5392f9..a5ea461c0 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Scripts.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Scripts.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // http://devdiv/Documents/Whidbey/CLR/CurrentSpecs/BCL/CodeDom%20Activation.doc //------------------------------------------------------------------------------ @@ -301,7 +301,7 @@ private Assembly CompileAssembly(List scriptsForLang) { // If GenerateInMemory == true, then CodeDom loads the compiled assembly using Assembly.Load(byte[]) // instead of Assembly.Load(AssemblyName). That means the assembly will be loaded in the anonymous - // context (http://blogs.msdn.com/Microsoft/archive/2003/05/29/57143.aspx), and its dependencies can only + // context (http://blogs.msdn.com/[....]/archive/2003/05/29/57143.aspx), and its dependencies can only // be loaded from the Load context or using AssemblyResolve event. However we want to use the LoadFrom // context to preload all dependencies specified by , so we turn off // GenerateInMemory here. diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Stylesheet.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Stylesheet.cs index 96f094bd7..d2b5a731c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/Stylesheet.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/Stylesheet.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternBuilder.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternBuilder.cs index efad6709d..8143836c4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternBuilder.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternParser.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternParser.cs index 4a88b7656..ad786e07f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternParser.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XPathPatternParser.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAst.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAst.cs index b1dc09df0..758047cef 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAst.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAst.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Text; diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs index 87f96419f..e94a5891a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslAstAnalyzer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Globalization; @@ -668,7 +668,7 @@ private XslFlags ProcessVarPar(VarPar node) { if (node.Select != null) { if (node.Content.Count != 0) { // In case of incorrect stylesheet, variable or parameter may have both a 'select' attribute and non-empty content - // NOTE: This code must be in sync with recovery logic in QilGenerator + // NOTE: This code must be in [....] with recovery logic in QilGenerator result = xpathAnalyzer.Analyze(node.Select) | VisitChildren(node) | XslFlags.AnyType; typeDonor = null; } else { diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslVisitor.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslVisitor.cs index 28c95f3a3..5311a8321 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslVisitor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XslVisitor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.Xslt { diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltInput.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltInput.cs index b50961a43..931285174 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltInput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltInput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ //#define XSLT2 diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltLoader.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltLoader.cs index c2037e36f..1bf0ee63a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltLoader.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltLoader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ //#define XSLT2 diff --git a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltQilFactory.cs b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltQilFactory.cs index 78e9e6db9..4fcca15bf 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltQilFactory.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/Xslt/XsltQilFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Action.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Action.cs index 31c38905c..ead808b5f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Action.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Action.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ActionFrame.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ActionFrame.cs index d76ef0996..21f5fb062 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ActionFrame.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ActionFrame.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyImportsAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyImportsAction.cs index db9430ed1..fada5fa30 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyImportsAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyImportsAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyTemplatesAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyTemplatesAction.cs index 0cecb4220..a81dd223f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyTemplatesAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ApplyTemplatesAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeAction.cs index c26a03b44..f85ccb333 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeSetAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeSetAction.cs index ede0aef75..c227f0287 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeSetAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AttributeSetAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Avt.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Avt.cs index 282c31f4b..6b2cdcac8 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Avt.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Avt.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AvtEvent.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AvtEvent.cs index 687eaad3e..f88243faf 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AvtEvent.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/AvtEvent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BeginEvent.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BeginEvent.cs index 95ca244b9..2cf53f05f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BeginEvent.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BeginEvent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BuilderInfo.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BuilderInfo.cs index 3f0644ff7..20886ec8c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BuilderInfo.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/BuilderInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CallTemplateAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CallTemplateAction.cs index 70354f28d..b21604d00 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CallTemplateAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CallTemplateAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ChooseAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ChooseAction.cs index 85cc21906..0bc970758 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ChooseAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ChooseAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CommentAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CommentAction.cs index 67c7503bf..32dabbf8b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CommentAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CommentAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CompiledAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CompiledAction.cs index c6476fe60..51ae00815 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CompiledAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CompiledAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs index 437bb1ef9..1af4378a4 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ContainerAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ContainerAction.cs index c197c1c44..7fd963341 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ContainerAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ContainerAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAction.cs index cb7d325be..12f1ed03f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAttributesAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAttributesAction.cs index ed717e944..47f8d3cd6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAttributesAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyAttributesAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyCodeAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyCodeAction.cs index b46cf13de..073e16956 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyCodeAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyCodeAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNamespacesAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNamespacesAction.cs index cebaadebf..b3e3e34ab 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNamespacesAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNamespacesAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNodesetAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNodesetAction.cs index 4c7457f01..3d9a487a5 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNodesetAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyNodesetAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyOfAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyOfAction.cs index e316fd82d..5207f98bd 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyOfAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/CopyOfAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { @@ -48,8 +48,8 @@ internal override void Execute(Processor processor, ActionFrame frame) { object result = query.Evaluate(frame.NodeSet); if (result is XPathNodeIterator) { - // we cash this query because otherwise current() works incorrectly. - + // we cash this query because otherwise current() works incorrectly. Bug#382166. + // To be perfect we should use frame.NewNodeSet here processor.PushActionFrame(CopyNodeSetAction.GetAction(), new XPathArrayIterator(query)); frame.State = NodeSetCopied; break; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DbgCompiler.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DbgCompiler.cs index c39c6d2b7..8190e5578 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DbgCompiler.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DbgCompiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DocumentScope.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DocumentScope.cs index 8a47aa826..610897581 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DocumentScope.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/DocumentScope.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ElementAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ElementAction.cs index 26ff1bc9f..0df55f379 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ElementAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ElementAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/EndEvent.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/EndEvent.cs index 70f1c8d33..266f2177a 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/EndEvent.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/EndEvent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Event.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Event.cs index 62b638fe0..d97f6440d 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Event.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Event.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ForeachAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ForeachAction.cs index bc12dbe72..a932cab37 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ForeachAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ForeachAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/HtmlProps.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/HtmlProps.cs index e60a2f880..81eac3d35 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/HtmlProps.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/HtmlProps.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/IfAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/IfAction.cs index 71001f3a2..c224c0661 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/IfAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/IfAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScope.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScope.cs index 66b85807e..39236053d 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScope.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScope.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScopeManager.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScopeManager.cs index 2cbbdc32f..b1c1afae2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScopeManager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/InputScopeManager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/MessageAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/MessageAction.cs index d8da70f8c..e2807e7fb 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/MessageAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/MessageAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceDecl.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceDecl.cs index 9329cbfef..71dab6766 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceDecl.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceDecl.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceEvent.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceEvent.cs index eeeeb6faf..1420c525b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceEvent.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NamespaceEvent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorInput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorInput.cs index ce6688e4d..563aaf5f2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorInput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorInput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorOutput.cs index f29c63dd6..d722905f1 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NavigatorOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NewInstructionAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NewInstructionAction.cs index 53769e706..5f84c647b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NewInstructionAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NewInstructionAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NumberAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NumberAction.cs index 85038e93b..553b74574 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NumberAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/NumberAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { @@ -417,7 +417,7 @@ private XPathNodeType BasicNodeType(XPathNodeType type) { } } - // Microsoft: perf. + // [....]: perf. // for each call to xsl:number Format() will build new NumberingFormat object. // in case of no AVTs we can build this object at compile time and reuse it on execution time. // even partial step in this d---- will be usefull (when cFormats == 0) diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutKeywords.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutKeywords.cs index 266ce0038..dadea9c70 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutKeywords.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutKeywords.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScope.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScope.cs index e27e57e04..7de7e8bfb 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScope.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScope.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScopeManager.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScopeManager.cs index a5e152603..dfefae839 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScopeManager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/OutputScopeManager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/PrefixQname.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/PrefixQname.cs index ed1beb49e..062f765e9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/PrefixQname.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/PrefixQname.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ProcessingInstructionAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ProcessingInstructionAction.cs index 4bcf3d01a..40a5ae886 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ProcessingInstructionAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ProcessingInstructionAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Processor.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Processor.cs index 9a86ec723..740dc7db7 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Processor.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Processor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ReaderOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ReaderOutput.cs index 4829e224d..b8f45d089 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ReaderOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ReaderOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RecordBuilder.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RecordBuilder.cs index ff1e8bb68..1ca009325 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RecordBuilder.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RecordBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RootAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RootAction.cs index 72cc4990b..f1fc2fcf3 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RootAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/RootAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SequentialOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SequentialOutput.cs index 11ada9cad..1f3765247 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SequentialOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SequentialOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SortAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SortAction.cs index deebec192..7eac8559c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SortAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/SortAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StateMachine.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StateMachine.cs index a8c602bb2..bf0e413c9 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StateMachine.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StateMachine.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StringOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StringOutput.cs index b4c69f80c..4a1f20f78 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StringOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/StringOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Stylesheet.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Stylesheet.cs index 0bf9d41df..9cc9876d6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Stylesheet.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Stylesheet.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateAction.cs index f728fec60..b4eedce6b 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateBaseAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateBaseAction.cs index 3ac17a2dd..bdd82f3b8 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateBaseAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateBaseAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateLookupAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateLookupAction.cs index 063d58991..d8168cbd6 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateLookupAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TemplateLookupAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Templatemanager.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Templatemanager.cs index 36811a5b4..b54551b6c 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Templatemanager.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Templatemanager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextAction.cs index f93e6025e..d7b207870 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextEvent.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextEvent.cs index 480f72fcb..7f57aaa93 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextEvent.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextEvent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOnlyOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOnlyOutput.cs index e4a18741d..cf608ab72 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOnlyOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOnlyOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOutput.cs index 2fa2cb546..ca039a174 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TextOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TheQuery.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TheQuery.cs index 08238b490..206b6dbd5 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TheQuery.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/TheQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/UseAttributesetsAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/UseAttributesetsAction.cs index 6d1838f9e..fbc238812 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/UseAttributesetsAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/UseAttributesetsAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ValueOfAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ValueOfAction.cs index ac4d48f69..d0fc7e3b7 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ValueOfAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/ValueOfAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/VariableAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/VariableAction.cs index e57a25999..95f606353 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/VariableAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/VariableAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WithParamAction.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WithParamAction.cs index c02c45ea8..175d2409f 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WithParamAction.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WithParamAction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WriterOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WriterOutput.cs index 57a02cfa1..3778c9dc2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WriterOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/WriterOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs index 6e7a9a33b..a6c74c175 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltCompileContext.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { @@ -467,7 +467,7 @@ public static XPathResultType GetXPathType(Type type) { if (typeof(XPathNodeIterator).IsAssignableFrom(type)) { return XPathResultType.NodeSet; } - // Microsoft: It be better to check that type is realy object and otherwise return XPathResultType.Error + // [....]: It be better to check that type is realy object and otherwise return XPathResultType.Error return XPathResultType.Any; case TypeCode.DateTime : return XPathResultType.Error; diff --git a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs index 0df2f0ab5..45197e4c2 100644 --- a/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs +++ b/System.Data.SqlXml/System/Xml/Xsl/XsltOld/XsltOutput.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl.XsltOld { diff --git a/System.Data/Microsoft/SqlServer/Server/MemoryRecordBuffer.cs b/System.Data/Microsoft/SqlServer/Server/MemoryRecordBuffer.cs index 54c1f5b04..1a7317d87 100644 --- a/System.Data/Microsoft/SqlServer/Server/MemoryRecordBuffer.cs +++ b/System.Data/Microsoft/SqlServer/Server/MemoryRecordBuffer.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/MetadataUtilsSmi.cs b/System.Data/Microsoft/SqlServer/Server/MetadataUtilsSmi.cs index 776bc2cfc..2a267bd12 100644 --- a/System.Data/Microsoft/SqlServer/Server/MetadataUtilsSmi.cs +++ b/System.Data/Microsoft/SqlServer/Server/MetadataUtilsSmi.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiConnection.cs b/System.Data/Microsoft/SqlServer/Server/SmiConnection.cs index 7907a61aa..593b27447 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiConnection.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiConnection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiContext.cs b/System.Data/Microsoft/SqlServer/Server/SmiContext.cs index 5c500135f..413e2a2cf 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiContext.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiContext.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiContextFactory.cs b/System.Data/Microsoft/SqlServer/Server/SmiContextFactory.cs index df636c295..7554c9393 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiContextFactory.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiContextFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiEventSink.cs b/System.Data/Microsoft/SqlServer/Server/SmiEventSink.cs index 4c2822539..c7d2556b1 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiEventSink.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiEventSink.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiEventSink_Default.cs b/System.Data/Microsoft/SqlServer/Server/SmiEventSink_Default.cs index 8a0dfdae5..089ced09e 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiEventSink_Default.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiEventSink_Default.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiEventSink_DeferedProcessing.cs b/System.Data/Microsoft/SqlServer/Server/SmiEventSink_DeferedProcessing.cs index 80f1b99bb..624a6dfa1 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiEventSink_DeferedProcessing.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiEventSink_DeferedProcessing.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiEventStream.cs b/System.Data/Microsoft/SqlServer/Server/SmiEventStream.cs index 9daeb29c4..baaeda5c0 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiEventStream.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiEventStream.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiGettersStream.cs b/System.Data/Microsoft/SqlServer/Server/SmiGettersStream.cs index f81df2468..c904b107b 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiGettersStream.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiGettersStream.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiMetaData.cs b/System.Data/Microsoft/SqlServer/Server/SmiMetaData.cs index 49b2e68c1..ed861e021 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiMetaData.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiMetaData.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiMetaDataProperty.cs b/System.Data/Microsoft/SqlServer/Server/SmiMetaDataProperty.cs index 1ea6845ef..b4fc70fd1 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiMetaDataProperty.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiMetaDataProperty.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiRecordBuffer.cs b/System.Data/Microsoft/SqlServer/Server/SmiRecordBuffer.cs index 3be8d9974..822183327 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiRecordBuffer.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiRecordBuffer.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiRequestExecutor.cs b/System.Data/Microsoft/SqlServer/Server/SmiRequestExecutor.cs index 947907293..4bf089f22 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiRequestExecutor.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiRequestExecutor.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiSettersStream.cs b/System.Data/Microsoft/SqlServer/Server/SmiSettersStream.cs index 95428f6d8..c32aa7f27 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiSettersStream.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiSettersStream.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SmiTypedGetterSetter.cs b/System.Data/Microsoft/SqlServer/Server/SmiTypedGetterSetter.cs index 14a25627a..ca6a630fd 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiTypedGetterSetter.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiTypedGetterSetter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/Microsoft/SqlServer/Server/SmiXetterAccessMap.cs b/System.Data/Microsoft/SqlServer/Server/SmiXetterAccessMap.cs index d782ff587..075099219 100644 --- a/System.Data/Microsoft/SqlServer/Server/SmiXetterAccessMap.cs +++ b/System.Data/Microsoft/SqlServer/Server/SmiXetterAccessMap.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SqlDataRecord.cs b/System.Data/Microsoft/SqlServer/Server/SqlDataRecord.cs index eba515f8e..9bb16a1e5 100644 --- a/System.Data/Microsoft/SqlServer/Server/SqlDataRecord.cs +++ b/System.Data/Microsoft/SqlServer/Server/SqlDataRecord.cs @@ -2,10 +2,10 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SqlRecordBuffer.cs b/System.Data/Microsoft/SqlServer/Server/SqlRecordBuffer.cs index 2882b8fe9..b719507e8 100644 --- a/System.Data/Microsoft/SqlServer/Server/SqlRecordBuffer.cs +++ b/System.Data/Microsoft/SqlServer/Server/SqlRecordBuffer.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs b/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs index f89c1a83b..4ab4a259e 100644 --- a/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs +++ b/System.Data/Microsoft/SqlServer/Server/SqlTriggerContext.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] // daltodov //------------------------------------------------------------------------------ diff --git a/System.Data/Microsoft/SqlServer/Server/ValueUtilsSmi.cs b/System.Data/Microsoft/SqlServer/Server/ValueUtilsSmi.cs index 0e143e186..6d9b8cbe2 100644 --- a/System.Data/Microsoft/SqlServer/Server/ValueUtilsSmi.cs +++ b/System.Data/Microsoft/SqlServer/Server/ValueUtilsSmi.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { @@ -1830,8 +1830,8 @@ internal static void FillCompatibleITypedSettersFromReader( SmiEventSink_Default // In order for us to get here we would have to have an // invalid instance of SqlDbType, or one would have to add // new member to SqlDbType without adding a case in this - // switch, hence the assert - it must be - + // switch, hence the assert - it must be bug in our code + // not invalid user parameters. Debug.Assert( false, "unsupported DbType:" + metaData[i].SqlDbType.ToString() ); throw ADP.NotSupported(); @@ -2022,8 +2022,8 @@ internal static void FillCompatibleSettersFromReader(SmiEventSink_Default sink, // In order for us to get here we would have to have an // invalid instance of SqlDbType, or one would have to add // new member to SqlDbType without adding a case in this - // switch, hence the assert - it must be - + // switch, hence the assert - it must be bug in our code + // not invalid user parameters. Debug.Assert(false, "unsupported DbType:" + metaData[i].SqlDbType.ToString()); throw ADP.NotSupported(); diff --git a/System.Data/Microsoft/SqlServer/Server/sqlcontext.cs b/System.Data/Microsoft/SqlServer/Server/sqlcontext.cs index 5634702a7..0696bedbb 100644 --- a/System.Data/Microsoft/SqlServer/Server/sqlcontext.cs +++ b/System.Data/Microsoft/SqlServer/Server/sqlcontext.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] // daltodov //------------------------------------------------------------------------------ diff --git a/System.Data/Microsoft/SqlServer/Server/sqlpipe.cs b/System.Data/Microsoft/SqlServer/Server/sqlpipe.cs index a8abcbd16..d1b39923f 100644 --- a/System.Data/Microsoft/SqlServer/Server/sqlpipe.cs +++ b/System.Data/Microsoft/SqlServer/Server/sqlpipe.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] // daltodov //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/BaseCollection.cs b/System.Data/System/Data/BaseCollection.cs index 90a3c41bf..af0bc90ef 100644 --- a/System.Data/System/Data/BaseCollection.cs +++ b/System.Data/System/Data/BaseCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/CodeGen/StrongTypingException.cs b/System.Data/System/Data/CodeGen/StrongTypingException.cs index 1141adebe..62eb1dcc3 100644 --- a/System.Data/System/Data/CodeGen/StrongTypingException.cs +++ b/System.Data/System/Data/CodeGen/StrongTypingException.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/CodeGen/datacache.cs b/System.Data/System/Data/CodeGen/datacache.cs index dc0705b26..26f3d320a 100644 --- a/System.Data/System/Data/CodeGen/datacache.cs +++ b/System.Data/System/Data/CodeGen/datacache.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -351,7 +351,7 @@ private CodeTypeDeclaration CreateTypedTable(DataTable table) { } dataTableClass.Members.Add(constructor); - //\\ internal DataTableClass(DataTable table) : base(table.TableName) { // Microsoft : Assuming incoming table always associated with DataSet + //\\ internal DataTableClass(DataTable table) : base(table.TableName) { // [....] : Assuming incoming table always associated with DataSet //\\ if (table.CaseSensitive != table.DataSet.CaseSensitive) //\\ this.CaseSensitive = table.CaseSensitive; //\\ if (table.Locale.ToString() != table.DataSet.Locale.ToString()) diff --git a/System.Data/System/Data/ColumnTypeConverter.cs b/System.Data/System/Data/ColumnTypeConverter.cs index c3fb2cbdf..69df720e1 100644 --- a/System.Data/System/Data/ColumnTypeConverter.cs +++ b/System.Data/System/Data/ColumnTypeConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ /* diff --git a/System.Data/System/Data/Common/ActivityCorrelator.cs b/System.Data/System/Data/Common/ActivityCorrelator.cs index e40cbc2c5..4fc17b4eb 100644 --- a/System.Data/System/Data/Common/ActivityCorrelator.cs +++ b/System.Data/System/Data/Common/ActivityCorrelator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common diff --git a/System.Data/System/Data/Common/AdapterUtil.cs b/System.Data/System/Data/Common/AdapterUtil.cs index c10ef2849..b2fd8d6fd 100644 --- a/System.Data/System/Data/Common/AdapterUtil.cs +++ b/System.Data/System/Data/Common/AdapterUtil.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -74,7 +74,7 @@ static internal Exception ExceptionWithStackTrace(Exception e) } // NOTE: Initializing a Task in SQL CLR requires the "UNSAFE" permission set (http://msdn.microsoft.com/en-us/library/ms172338.aspx) - // Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features (See Dev11 + // Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features (See Dev11 Bug #193253) static private Task _trueTask = null; static internal Task TrueTask { get { @@ -1845,6 +1845,7 @@ static internal Exception InvalidArgumentValue(string methodName) { internal const int DefaultCommandTimeout = 30; internal const int DefaultConnectionTimeout = DbConnectionStringDefaults.ConnectTimeout; internal const float FailoverTimeoutStep = 0.08F; // fraction of timeout to use for fast failover connections + internal const int FirstTransparentAttemptTimeout = 500; // The first login attempt in Transparent network IP Resolution // security issue, don't rely upon static public readonly values - AS/URT 109635 static internal readonly String StrEmpty = ""; // String.Empty diff --git a/System.Data/System/Data/Common/BigIntegerStorage.cs b/System.Data/System/Data/Common/BigIntegerStorage.cs index e26e96596..d3544903d 100644 --- a/System.Data/System/Data/Common/BigIntegerStorage.cs +++ b/System.Data/System/Data/Common/BigIntegerStorage.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/BooleanStorage.cs b/System.Data/System/Data/Common/BooleanStorage.cs index cc64c9506..de174a86b 100644 --- a/System.Data/System/Data/Common/BooleanStorage.cs +++ b/System.Data/System/Data/Common/BooleanStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/ByteStorage.cs b/System.Data/System/Data/Common/ByteStorage.cs index d41d1576b..12a9df123 100644 --- a/System.Data/System/Data/Common/ByteStorage.cs +++ b/System.Data/System/Data/Common/ByteStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/CharStorage.cs b/System.Data/System/Data/Common/CharStorage.cs index f1baf809a..b03c0df2c 100644 --- a/System.Data/System/Data/Common/CharStorage.cs +++ b/System.Data/System/Data/Common/CharStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBCommand.cs b/System.Data/System/Data/Common/DBCommand.cs index cc4399fe3..3a2e01b26 100644 --- a/System.Data/System/Data/Common/DBCommand.cs +++ b/System.Data/System/Data/Common/DBCommand.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBCommandBuilder.cs b/System.Data/System/Data/Common/DBCommandBuilder.cs index 4205f9599..9744b25b2 100644 --- a/System.Data/System/Data/Common/DBCommandBuilder.cs +++ b/System.Data/System/Data/Common/DBCommandBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBConnection.cs b/System.Data/System/Data/Common/DBConnection.cs index 52f045005..e9967e0c0 100644 --- a/System.Data/System/Data/Common/DBConnection.cs +++ b/System.Data/System/Data/Common/DBConnection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBConnectionString.cs b/System.Data/System/Data/Common/DBConnectionString.cs index 42e1b6bb1..ed7b7b4c5 100644 --- a/System.Data/System/Data/Common/DBConnectionString.cs +++ b/System.Data/System/Data/Common/DBConnectionString.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -251,7 +251,7 @@ internal DBConnectionString Intersect(DBConnectionString entry) { //Debug.WriteLine("14/15/16 this AllowOnly and entry AllowOnly but no restrictions"); } - // verify _hasPassword & _parsetable are in sync between Everett/Whidbey + // verify _hasPassword & _parsetable are in [....] between Everett/Whidbey Debug.Assert(!_hasPassword || ContainsKey(KEY.Password) || ContainsKey(KEY.Pwd), "OnDeserialized password mismatch this"); Debug.Assert(null == entry || !entry._hasPassword || entry.ContainsKey(KEY.Password) || entry.ContainsKey(KEY.Pwd), "OnDeserialized password mismatch entry"); diff --git a/System.Data/System/Data/Common/DBDataPermission.cs b/System.Data/System/Data/Common/DBDataPermission.cs index ed6140309..46c2906ef 100644 --- a/System.Data/System/Data/Common/DBDataPermission.cs +++ b/System.Data/System/Data/Common/DBDataPermission.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBDataPermissionAttribute.cs b/System.Data/System/Data/Common/DBDataPermissionAttribute.cs index 518e2c521..0d22095d6 100644 --- a/System.Data/System/Data/Common/DBDataPermissionAttribute.cs +++ b/System.Data/System/Data/Common/DBDataPermissionAttribute.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBParameter.cs b/System.Data/System/Data/Common/DBParameter.cs index 4a0ba3574..be9208922 100644 --- a/System.Data/System/Data/Common/DBParameter.cs +++ b/System.Data/System/Data/Common/DBParameter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBSchemaRow.cs b/System.Data/System/Data/Common/DBSchemaRow.cs index 25850cffe..06cf3ac14 100644 --- a/System.Data/System/Data/Common/DBSchemaRow.cs +++ b/System.Data/System/Data/Common/DBSchemaRow.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DBSchemaTable.cs b/System.Data/System/Data/Common/DBSchemaTable.cs index c6c891727..8a548a5fa 100644 --- a/System.Data/System/Data/Common/DBSchemaTable.cs +++ b/System.Data/System/Data/Common/DBSchemaTable.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataAdapter.cs b/System.Data/System/Data/Common/DataAdapter.cs index e36220920..1dbda9747 100644 --- a/System.Data/System/Data/Common/DataAdapter.cs +++ b/System.Data/System/Data/Common/DataAdapter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataColumnMapping.cs b/System.Data/System/Data/Common/DataColumnMapping.cs index f6a843e2c..acaf957c5 100644 --- a/System.Data/System/Data/Common/DataColumnMapping.cs +++ b/System.Data/System/Data/Common/DataColumnMapping.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataColumnMappingCollection.cs b/System.Data/System/Data/Common/DataColumnMappingCollection.cs index b37e75603..615616092 100644 --- a/System.Data/System/Data/Common/DataColumnMappingCollection.cs +++ b/System.Data/System/Data/Common/DataColumnMappingCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataRecordInternal.cs b/System.Data/System/Data/Common/DataRecordInternal.cs index 659db8d52..9c8a7d31e 100644 --- a/System.Data/System/Data/Common/DataRecordInternal.cs +++ b/System.Data/System/Data/Common/DataRecordInternal.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataStorage.cs b/System.Data/System/Data/Common/DataStorage.cs index cf66ff06e..69087c233 100644 --- a/System.Data/System/Data/Common/DataStorage.cs +++ b/System.Data/System/Data/Common/DataStorage.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataTableMapping.cs b/System.Data/System/Data/Common/DataTableMapping.cs index bbb0276ca..96567755f 100644 --- a/System.Data/System/Data/Common/DataTableMapping.cs +++ b/System.Data/System/Data/Common/DataTableMapping.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DataTableMappingCollection.cs b/System.Data/System/Data/Common/DataTableMappingCollection.cs index a235804a3..9ef089404 100644 --- a/System.Data/System/Data/Common/DataTableMappingCollection.cs +++ b/System.Data/System/Data/Common/DataTableMappingCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DateTimeOffsetStorage.cs b/System.Data/System/Data/Common/DateTimeOffsetStorage.cs index 457dc17f2..b92e6fc6f 100644 --- a/System.Data/System/Data/Common/DateTimeOffsetStorage.cs +++ b/System.Data/System/Data/Common/DateTimeOffsetStorage.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DateTimeStorage.cs b/System.Data/System/Data/Common/DateTimeStorage.cs index 4ff7014c5..cce489890 100644 --- a/System.Data/System/Data/Common/DateTimeStorage.cs +++ b/System.Data/System/Data/Common/DateTimeStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbConnectionOptions.cs b/System.Data/System/Data/Common/DbConnectionOptions.cs index 43b8e22a3..11257cc6d 100644 --- a/System.Data/System/Data/Common/DbConnectionOptions.cs +++ b/System.Data/System/Data/Common/DbConnectionOptions.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbConnectionPoolKey.cs b/System.Data/System/Data/Common/DbConnectionPoolKey.cs index 6ab3ddbb1..9142ef6dd 100644 --- a/System.Data/System/Data/Common/DbConnectionPoolKey.cs +++ b/System.Data/System/Data/Common/DbConnectionPoolKey.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common diff --git a/System.Data/System/Data/Common/DbConnectionStringBuilder.cs b/System.Data/System/Data/Common/DbConnectionStringBuilder.cs index 5192551a1..780bd97c9 100644 --- a/System.Data/System/Data/Common/DbConnectionStringBuilder.cs +++ b/System.Data/System/Data/Common/DbConnectionStringBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -382,7 +382,7 @@ protected virtual void GetProperties(Hashtable propertyDescriptors) { } // all keywords in Keys list that do not have strongly typed property, ODBC case - // ignore 'Workaround Oracle + // ignore 'Workaround Oracle Bug 914652' via IsFixedSize if (!IsFixedSize) { attributes = null; foreach(string keyword in Keys) { diff --git a/System.Data/System/Data/Common/DbConnectionStringCommon.cs b/System.Data/System/Data/Common/DbConnectionStringCommon.cs index f943f272b..e1981b6b9 100644 --- a/System.Data/System/Data/Common/DbConnectionStringCommon.cs +++ b/System.Data/System/Data/Common/DbConnectionStringCommon.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -716,39 +716,40 @@ internal static class DbConnectionStringDefaults { internal const bool OmitOracleConnectionName = false; // SqlClient - internal const ApplicationIntent ApplicationIntent = System.Data.SqlClient.ApplicationIntent.ReadWrite; - internal const string ApplicationName = ".Net SqlClient Data Provider"; - internal const bool AsynchronousProcessing = false; - internal const string AttachDBFilename = ""; - internal const int ConnectTimeout = 15; - internal const bool ConnectionReset = true; - internal const bool ContextConnection = false; - internal const string CurrentLanguage = ""; - internal const string DataSource = ""; - internal const bool Encrypt = false; - internal const bool Enlist = true; - internal const string FailoverPartner = ""; - internal const string InitialCatalog = ""; - internal const bool IntegratedSecurity = false; - internal const int LoadBalanceTimeout = 0; // default of 0 means don't use - internal const bool MultipleActiveResultSets = false; - internal const bool MultiSubnetFailover = false; - internal const int MaxPoolSize = 100; - internal const int MinPoolSize = 0; - internal const string NetworkLibrary = ""; - internal const int PacketSize = 8000; - internal const string Password = ""; - internal const bool PersistSecurityInfo = false; - internal const bool Pooling = true; - internal const bool TrustServerCertificate = false; - internal const string TypeSystemVersion = "Latest"; - internal const string UserID = ""; - internal const bool UserInstance = false; - internal const bool Replication = false; - internal const string WorkstationID = ""; - internal const string TransactionBinding = "Implicit Unbind"; - internal const int ConnectRetryCount = 1; - internal const int ConnectRetryInterval = 10; + internal const ApplicationIntent ApplicationIntent = System.Data.SqlClient.ApplicationIntent.ReadWrite; + internal const string ApplicationName = ".Net SqlClient Data Provider"; + internal const bool AsynchronousProcessing = false; + internal const string AttachDBFilename = ""; + internal const int ConnectTimeout = 15; + internal const bool ConnectionReset = true; + internal const bool ContextConnection = false; + internal const string CurrentLanguage = ""; + internal const string DataSource = ""; + internal const bool Encrypt = false; + internal const bool Enlist = true; + internal const string FailoverPartner = ""; + internal const string InitialCatalog = ""; + internal const bool IntegratedSecurity = false; + internal const int LoadBalanceTimeout = 0; // default of 0 means don't use + internal const bool MultipleActiveResultSets = false; + internal const bool MultiSubnetFailover = false; + internal const bool TransparentNetworkIPResolution = true; + internal const int MaxPoolSize = 100; + internal const int MinPoolSize = 0; + internal const string NetworkLibrary = ""; + internal const int PacketSize = 8000; + internal const string Password = ""; + internal const bool PersistSecurityInfo = false; + internal const bool Pooling = true; + internal const bool TrustServerCertificate = false; + internal const string TypeSystemVersion = "Latest"; + internal const string UserID = ""; + internal const bool UserInstance = false; + internal const bool Replication = false; + internal const string WorkstationID = ""; + internal const string TransactionBinding = "Implicit Unbind"; + internal const int ConnectRetryCount = 1; + internal const int ConnectRetryInterval = 10; internal static readonly SqlAuthenticationMethod Authentication = SqlAuthenticationMethod.NotSpecified; internal static readonly SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Disabled; } @@ -791,31 +792,33 @@ internal static class DbConnectionStringKeywords { internal const string OmitOracleConnectionName = "Omit Oracle Connection Name"; // SqlClient - internal const string ApplicationIntent = "ApplicationIntent"; - internal const string ApplicationName = "Application Name"; - internal const string AsynchronousProcessing = "Asynchronous Processing"; - internal const string AttachDBFilename = "AttachDbFilename"; - internal const string ConnectTimeout = "Connect Timeout"; - internal const string ConnectionReset = "Connection Reset"; - internal const string ContextConnection = "Context Connection"; - internal const string CurrentLanguage = "Current Language"; - internal const string Encrypt = "Encrypt"; - internal const string FailoverPartner = "Failover Partner"; - internal const string InitialCatalog = "Initial Catalog"; - internal const string MultipleActiveResultSets = "MultipleActiveResultSets"; - internal const string MultiSubnetFailover = "MultiSubnetFailover"; - internal const string NetworkLibrary = "Network Library"; - internal const string PacketSize = "Packet Size"; - internal const string Replication = "Replication"; - internal const string TransactionBinding = "Transaction Binding"; - internal const string TrustServerCertificate = "TrustServerCertificate"; - internal const string TypeSystemVersion = "Type System Version"; - internal const string UserInstance = "User Instance"; - internal const string WorkstationID = "Workstation ID"; - internal const string ConnectRetryCount = "ConnectRetryCount"; - internal const string ConnectRetryInterval = "ConnectRetryInterval"; - internal const string Authentication = "Authentication"; - internal const string ColumnEncryptionSetting = "Column Encryption Setting"; + internal const string ApplicationIntent = "ApplicationIntent"; + internal const string ApplicationName = "Application Name"; + internal const string AsynchronousProcessing = "Asynchronous Processing"; + internal const string AttachDBFilename = "AttachDbFilename"; + internal const string ConnectTimeout = "Connect Timeout"; + internal const string ConnectionReset = "Connection Reset"; + internal const string ContextConnection = "Context Connection"; + internal const string CurrentLanguage = "Current Language"; + internal const string Encrypt = "Encrypt"; + internal const string FailoverPartner = "Failover Partner"; + internal const string InitialCatalog = "Initial Catalog"; + internal const string MultipleActiveResultSets = "MultipleActiveResultSets"; + internal const string MultiSubnetFailover = "MultiSubnetFailover"; + internal const string TransparentNetworkIPResolution = "TransparentNetworkIPResolution"; + internal const string NetworkLibrary = "Network Library"; + internal const string PacketSize = "Packet Size"; + internal const string Replication = "Replication"; + internal const string TransactionBinding = "Transaction Binding"; + internal const string TrustServerCertificate = "TrustServerCertificate"; + internal const string TypeSystemVersion = "Type System Version"; + internal const string UserInstance = "User Instance"; + internal const string WorkstationID = "Workstation ID"; + internal const string ConnectRetryCount = "ConnectRetryCount"; + internal const string ConnectRetryInterval = "ConnectRetryInterval"; + internal const string Authentication = "Authentication"; + internal const string Certificate = "Certificate"; + internal const string ColumnEncryptionSetting = "Column Encryption Setting"; // common keywords (OleDb, OracleClient, SqlClient) internal const string DataSource = "Data Source"; diff --git a/System.Data/System/Data/Common/DbDataAdapter.cs b/System.Data/System/Data/Common/DbDataAdapter.cs index 0950ab8f2..2db823111 100644 --- a/System.Data/System/Data/Common/DbDataAdapter.cs +++ b/System.Data/System/Data/Common/DbDataAdapter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbDataReader.cs b/System.Data/System/Data/Common/DbDataReader.cs index c4c8318d0..abee96850 100644 --- a/System.Data/System/Data/Common/DbDataReader.cs +++ b/System.Data/System/Data/Common/DbDataReader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbDataSourceEnumerator.cs b/System.Data/System/Data/Common/DbDataSourceEnumerator.cs index 4071a35a8..8b2f5d6e1 100644 --- a/System.Data/System/Data/Common/DbDataSourceEnumerator.cs +++ b/System.Data/System/Data/Common/DbDataSourceEnumerator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbException.cs b/System.Data/System/Data/Common/DbException.cs index 0a912d552..f11303762 100644 --- a/System.Data/System/Data/Common/DbException.cs +++ b/System.Data/System/Data/Common/DbException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbParameterCollection.cs b/System.Data/System/Data/Common/DbParameterCollection.cs index 2f400cca1..b4e5bb234 100644 --- a/System.Data/System/Data/Common/DbParameterCollection.cs +++ b/System.Data/System/Data/Common/DbParameterCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs b/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs index 92ec37fcd..6411c47e8 100644 --- a/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs +++ b/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbProviderFactories.cs b/System.Data/System/Data/Common/DbProviderFactories.cs index 9d3253620..7490e8ac3 100644 --- a/System.Data/System/Data/Common/DbProviderFactories.cs +++ b/System.Data/System/Data/Common/DbProviderFactories.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs b/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs index 4ad569cd8..505e734ce 100644 --- a/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs +++ b/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -17,9 +17,9 @@ namespace System.Data.Common { using System.Xml; // VSTFDevDiv # 624213: System.Data.Common.DbProviderFactories.GetFactoryClasses() still gets OracleClient provider in ClientSku environment. - // NOTES: As part of this - - + // NOTES: As part of this bug fix, the decision was taken to make it consistent and to remove all the framework + // providers from the list in the machine.config file. The DbProviderFactories section of the machine.config will contain only + // custom providers names and details. internal enum DbProvidersIndex : int { Odbc = 0, diff --git a/System.Data/System/Data/Common/DbProviderFactory.cs b/System.Data/System/Data/Common/DbProviderFactory.cs index f0c8fd478..4235679cc 100644 --- a/System.Data/System/Data/Common/DbProviderFactory.cs +++ b/System.Data/System/Data/Common/DbProviderFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs b/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs index 1f13d32d6..a213939a2 100644 --- a/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs +++ b/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DbTransaction.cs b/System.Data/System/Data/Common/DbTransaction.cs index 8a3ae9046..467e740f8 100644 --- a/System.Data/System/Data/Common/DbTransaction.cs +++ b/System.Data/System/Data/Common/DbTransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DecimalStorage.cs b/System.Data/System/Data/Common/DecimalStorage.cs index b8aeda1b8..b9f8f6784 100644 --- a/System.Data/System/Data/Common/DecimalStorage.cs +++ b/System.Data/System/Data/Common/DecimalStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/DoubleStorage.cs b/System.Data/System/Data/Common/DoubleStorage.cs index b11514c7d..15af90c02 100644 --- a/System.Data/System/Data/Common/DoubleStorage.cs +++ b/System.Data/System/Data/Common/DoubleStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/FieldNameLookup.cs b/System.Data/System/Data/Common/FieldNameLookup.cs index 5ae728795..41df2b1aa 100644 --- a/System.Data/System/Data/Common/FieldNameLookup.cs +++ b/System.Data/System/Data/Common/FieldNameLookup.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Common/GreenMethods.cs b/System.Data/System/Data/Common/GreenMethods.cs index ced5a58d8..8aff41ed3 100644 --- a/System.Data/System/Data/Common/GreenMethods.cs +++ b/System.Data/System/Data/Common/GreenMethods.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Common/HandlerBase.cs b/System.Data/System/Data/Common/HandlerBase.cs index 3762aa488..99945fe78 100644 --- a/System.Data/System/Data/Common/HandlerBase.cs +++ b/System.Data/System/Data/Common/HandlerBase.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/Int16Storage.cs b/System.Data/System/Data/Common/Int16Storage.cs index 0c62a2043..8d1d0b2a0 100644 --- a/System.Data/System/Data/Common/Int16Storage.cs +++ b/System.Data/System/Data/Common/Int16Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/Int32Storage.cs b/System.Data/System/Data/Common/Int32Storage.cs index 1a59d7e12..870bd1093 100644 --- a/System.Data/System/Data/Common/Int32Storage.cs +++ b/System.Data/System/Data/Common/Int32Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/Int64Storage.cs b/System.Data/System/Data/Common/Int64Storage.cs index 26a81b6fa..f50062992 100644 --- a/System.Data/System/Data/Common/Int64Storage.cs +++ b/System.Data/System/Data/Common/Int64Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/MultipartIdentifier.cs b/System.Data/System/Data/Common/MultipartIdentifier.cs index a2a077043..531dfa1df 100644 --- a/System.Data/System/Data/Common/MultipartIdentifier.cs +++ b/System.Data/System/Data/Common/MultipartIdentifier.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/NameValuePair.cs b/System.Data/System/Data/Common/NameValuePair.cs index f0b7cdc17..bcf188908 100644 --- a/System.Data/System/Data/Common/NameValuePair.cs +++ b/System.Data/System/Data/Common/NameValuePair.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/NameValuePermission.cs b/System.Data/System/Data/Common/NameValuePermission.cs index f2088dba9..9f705d256 100644 --- a/System.Data/System/Data/Common/NameValuePermission.cs +++ b/System.Data/System/Data/Common/NameValuePermission.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/ObjectStorage.cs b/System.Data/System/Data/Common/ObjectStorage.cs index eb3a09d9c..f4c90546b 100644 --- a/System.Data/System/Data/Common/ObjectStorage.cs +++ b/System.Data/System/Data/Common/ObjectStorage.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/RowUpdatedEventArgs.cs b/System.Data/System/Data/Common/RowUpdatedEventArgs.cs index 132952ed7..04af7fa7e 100644 --- a/System.Data/System/Data/Common/RowUpdatedEventArgs.cs +++ b/System.Data/System/Data/Common/RowUpdatedEventArgs.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/RowUpdatingEventArgs.cs b/System.Data/System/Data/Common/RowUpdatingEventArgs.cs index 50c8c0492..1f6c6918c 100644 --- a/System.Data/System/Data/Common/RowUpdatingEventArgs.cs +++ b/System.Data/System/Data/Common/RowUpdatingEventArgs.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SByteStorage.cs b/System.Data/System/Data/Common/SByteStorage.cs index 66b546597..0ef3d5edb 100644 --- a/System.Data/System/Data/Common/SByteStorage.cs +++ b/System.Data/System/Data/Common/SByteStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SQLConvert.cs b/System.Data/System/Data/Common/SQLConvert.cs index 19b823a39..4c1b691fc 100644 --- a/System.Data/System/Data/Common/SQLConvert.cs +++ b/System.Data/System/Data/Common/SQLConvert.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs index 578f222bd..752435570 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -90,7 +90,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlBinary newValue = new SqlBinary(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs index 23c9b8c01..d8f70c87a 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlByte newValue = new SqlByte(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs index 4cbce35fa..da7d794b7 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -89,7 +89,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlBinary newValue = new SqlBinary(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs index 3bdfb3698..c8af7abb4 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -91,7 +91,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlString newValue = new SqlString(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs index 39a1fd72e..60753ae43 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -121,7 +121,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlDateTime newValue = new SqlDateTime(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs index 18ff10728..e6a92bf1b 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -186,7 +186,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlDecimal newValue = new SqlDecimal(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs index bf09c21e2..8833b829f 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlDouble newValue = new SqlDouble(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs index 497364a79..79c818060 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -90,7 +90,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlGuid newValue = new SqlGuid(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs b/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs index 37fd532da..aff67bae5 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlInt16 newValue = new SqlInt16(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs b/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs index b8a2c0eb3..4a31af610 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlInt32 newValue = new SqlInt32(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs b/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs index 5c1b344e0..eb608d338 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlInt64 newValue = new SqlInt64(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs index e50b9d5a6..fc4a344a3 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlMoney newValue = new SqlMoney(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs index f946bd632..d6c69725e 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlSingle newValue = new SqlSingle(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs index c822097f3..7201b55c5 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -144,7 +144,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlString newValue = new SqlString(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs b/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs index 8c07aa864..53fd2a92a 100644 --- a/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -119,7 +119,7 @@ override public void SetCapacity(int capacity) { override public object ConvertXmlToObject(string s) { SqlBoolean newValue = new SqlBoolean(); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs b/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs index 1817b74d4..1637442fe 100644 --- a/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -140,7 +140,7 @@ override public object ConvertXmlToObject(string s) { if (implementsIXmlSerializable) { object Obj = System.Activator.CreateInstance (DataType, true); - string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, + string tempStr =string.Concat("", s, ""); // this is done since you can give fragmet to reader, bug 98767 StringReader strReader = new StringReader(tempStr); using (XmlTextReader xmlTextReader = new XmlTextReader(strReader)) { diff --git a/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs b/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs index 8f3a03926..be6cc6e52 100644 --- a/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs +++ b/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SafeNativeMethods.cs b/System.Data/System/Data/Common/SafeNativeMethods.cs index 5e1c0ffc3..5f8bf6d36 100644 --- a/System.Data/System/Data/Common/SafeNativeMethods.cs +++ b/System.Data/System/Data/Common/SafeNativeMethods.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Common/SchemaTableColumn.cs b/System.Data/System/Data/Common/SchemaTableColumn.cs index 3995656fb..69df0612c 100644 --- a/System.Data/System/Data/Common/SchemaTableColumn.cs +++ b/System.Data/System/Data/Common/SchemaTableColumn.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs b/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs index c4ab9bc5a..80a961919 100644 --- a/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs +++ b/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/SingleStorage.cs b/System.Data/System/Data/Common/SingleStorage.cs index 2379ea758..1f1c8b451 100644 --- a/System.Data/System/Data/Common/SingleStorage.cs +++ b/System.Data/System/Data/Common/SingleStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/StringStorage.cs b/System.Data/System/Data/Common/StringStorage.cs index 2885f9b9a..7125e5d85 100644 --- a/System.Data/System/Data/Common/StringStorage.cs +++ b/System.Data/System/Data/Common/StringStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/System.Data_BID.cs b/System.Data/System/Data/Common/System.Data_BID.cs index d70b1c6c0..8cff81a5d 100644 --- a/System.Data/System/Data/Common/System.Data_BID.cs +++ b/System.Data/System/Data/Common/System.Data_BID.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //----------------------------------------------------------------------------------------------- using System; diff --git a/System.Data/System/Data/Common/TimeSpanStorage.cs b/System.Data/System/Data/Common/TimeSpanStorage.cs index b46bf5fb2..bf931fc47 100644 --- a/System.Data/System/Data/Common/TimeSpanStorage.cs +++ b/System.Data/System/Data/Common/TimeSpanStorage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/UInt16Storage.cs b/System.Data/System/Data/Common/UInt16Storage.cs index 3b44d9ada..5bafd626b 100644 --- a/System.Data/System/Data/Common/UInt16Storage.cs +++ b/System.Data/System/Data/Common/UInt16Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/UInt32Storage.cs b/System.Data/System/Data/Common/UInt32Storage.cs index 19d2d3f72..d2701c49d 100644 --- a/System.Data/System/Data/Common/UInt32Storage.cs +++ b/System.Data/System/Data/Common/UInt32Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/UInt64Storage.cs b/System.Data/System/Data/Common/UInt64Storage.cs index 8b727fdde..1242f279c 100644 --- a/System.Data/System/Data/Common/UInt64Storage.cs +++ b/System.Data/System/Data/Common/UInt64Storage.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/UnsafeNativeMethods.cs b/System.Data/System/Data/Common/UnsafeNativeMethods.cs index 5a595c9ef..47a1abb70 100644 --- a/System.Data/System/Data/Common/UnsafeNativeMethods.cs +++ b/System.Data/System/Data/Common/UnsafeNativeMethods.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Common/dbdatarecord.cs b/System.Data/System/Data/Common/dbdatarecord.cs index 2f56981aa..7c140b1af 100644 --- a/System.Data/System/Data/Common/dbdatarecord.cs +++ b/System.Data/System/Data/Common/dbdatarecord.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Common/dbenumerator.cs b/System.Data/System/Data/Common/dbenumerator.cs index 5377586b7..758d60629 100644 --- a/System.Data/System/Data/Common/dbenumerator.cs +++ b/System.Data/System/Data/Common/dbenumerator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/Constraint.cs b/System.Data/System/Data/Constraint.cs index 0d9bd2e24..ff25eb8f6 100644 --- a/System.Data/System/Data/Constraint.cs +++ b/System.Data/System/Data/Constraint.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/ConstraintCollection.cs b/System.Data/System/Data/ConstraintCollection.cs index a38733788..357723bae 100644 --- a/System.Data/System/Data/ConstraintCollection.cs +++ b/System.Data/System/Data/ConstraintCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/ConstraintConverter.cs b/System.Data/System/Data/ConstraintConverter.cs index 1564f89dd..176866fa5 100644 --- a/System.Data/System/Data/ConstraintConverter.cs +++ b/System.Data/System/Data/ConstraintConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/ConstraintEnumerator.cs b/System.Data/System/Data/ConstraintEnumerator.cs index 8e4c2b991..72c20a474 100644 --- a/System.Data/System/Data/ConstraintEnumerator.cs +++ b/System.Data/System/Data/ConstraintEnumerator.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DBConcurrencyException.cs b/System.Data/System/Data/DBConcurrencyException.cs index 5197faec7..a7724df44 100644 --- a/System.Data/System/Data/DBConcurrencyException.cs +++ b/System.Data/System/Data/DBConcurrencyException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataColumn.cs b/System.Data/System/Data/DataColumn.cs index e6894dff0..cacc19d4e 100644 --- a/System.Data/System/Data/DataColumn.cs +++ b/System.Data/System/Data/DataColumn.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -1822,7 +1822,7 @@ internal AutoIncrementValue Clone() { } /// the auto stepped value with Int64 representation - /// use unchecked behavior for Dev10 + /// use unchecked behavior for Dev10 Bug 568510 internal sealed class AutoIncrementInt64 : AutoIncrementValue { /// the last returned auto incremented value private System.Int64 current; diff --git a/System.Data/System/Data/DataColumnChangeEvent.cs b/System.Data/System/Data/DataColumnChangeEvent.cs index 2c05d2f25..080d166c7 100644 --- a/System.Data/System/Data/DataColumnChangeEvent.cs +++ b/System.Data/System/Data/DataColumnChangeEvent.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataColumnCollection.cs b/System.Data/System/Data/DataColumnCollection.cs index d486143a9..4a8f8119c 100644 --- a/System.Data/System/Data/DataColumnCollection.cs +++ b/System.Data/System/Data/DataColumnCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataColumnPropertyDescriptor.cs b/System.Data/System/Data/DataColumnPropertyDescriptor.cs index e99ccf43b..48d581f57 100644 --- a/System.Data/System/Data/DataColumnPropertyDescriptor.cs +++ b/System.Data/System/Data/DataColumnPropertyDescriptor.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataError.cs b/System.Data/System/Data/DataError.cs index 5cd3c8022..ca3cae694 100644 --- a/System.Data/System/Data/DataError.cs +++ b/System.Data/System/Data/DataError.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataException.cs b/System.Data/System/Data/DataException.cs index 50f42cbe7..f8de1c1bf 100644 --- a/System.Data/System/Data/DataException.cs +++ b/System.Data/System/Data/DataException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -13,7 +13,7 @@ namespace System.Data { using System.Globalization; using System.Runtime.Serialization; - // Microsoft: This functions are major point of localization. + // [....]: This functions are major point of localization. // We need to have a rules to enforce consistency there. // The dangerous point there are the string arguments of the exported (internal) methods. // This string can be argument, table or constraint name but never text of exception itself. diff --git a/System.Data/System/Data/DataKey.cs b/System.Data/System/Data/DataKey.cs index 6581279d4..a5f4cb57a 100644 --- a/System.Data/System/Data/DataKey.cs +++ b/System.Data/System/Data/DataKey.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataRelation.cs b/System.Data/System/Data/DataRelation.cs index e63034c11..3838ca9ad 100644 --- a/System.Data/System/Data/DataRelation.cs +++ b/System.Data/System/Data/DataRelation.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ /***************************************************************************************************** diff --git a/System.Data/System/Data/DataRelationCollection.cs b/System.Data/System/Data/DataRelationCollection.cs index 44a1d6d2b..baec5ee44 100644 --- a/System.Data/System/Data/DataRelationCollection.cs +++ b/System.Data/System/Data/DataRelationCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -250,7 +250,7 @@ public virtual void Clear() { OnCollectionChanging(RefreshEventArgs); for (int i = count - 1; i >= 0; i--) { inTransition = this[i]; - RemoveCore(inTransition); // Microsoft : No need to go for try catch here and this will surely not throw any exception + RemoveCore(inTransition); // [....] : No need to go for try catch here and this will surely not throw any exception } OnCollectionChanged(RefreshEventArgs); inTransition = null; diff --git a/System.Data/System/Data/DataRelationPropertyDescriptor.cs b/System.Data/System/Data/DataRelationPropertyDescriptor.cs index b3885050e..c80abf5a9 100644 --- a/System.Data/System/Data/DataRelationPropertyDescriptor.cs +++ b/System.Data/System/Data/DataRelationPropertyDescriptor.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataRow.cs b/System.Data/System/Data/DataRow.cs index 06f510b31..557f5e448 100644 --- a/System.Data/System/Data/DataRow.cs +++ b/System.Data/System/Data/DataRow.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -1307,9 +1307,9 @@ private void VerifyValueFromStorage(DataColumn column, DataRowVersion version, o version = DataRowVersion.Current; } // There are various known issues detected by this assert for non-default versions, - // for example DevDiv2 - - + // for example DevDiv2 bug 73753 + // Since changes consitutute breaking change (either way customer will get another result), + // we decided not to fix them in Dev 11 Debug.Assert(valueFromStorage.Equals(column.DataExpression.Evaluate(this, version)), "Value from storage does lazily computed expression value"); } diff --git a/System.Data/System/Data/DataRowChangeEvent.cs b/System.Data/System/Data/DataRowChangeEvent.cs index 01a56d236..444f93602 100644 --- a/System.Data/System/Data/DataRowChangeEvent.cs +++ b/System.Data/System/Data/DataRowChangeEvent.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataRowCollection.cs b/System.Data/System/Data/DataRowCollection.cs index dbed8bf40..81d040e42 100644 --- a/System.Data/System/Data/DataRowCollection.cs +++ b/System.Data/System/Data/DataRowCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataRowView.cs b/System.Data/System/Data/DataRowView.cs index 059764563..64eb89f9a 100644 --- a/System.Data/System/Data/DataRowView.cs +++ b/System.Data/System/Data/DataRowView.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataSet.cs b/System.Data/System/Data/DataSet.cs index c22053312..504cdd268 100644 --- a/System.Data/System/Data/DataSet.cs +++ b/System.Data/System/Data/DataSet.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -682,7 +682,7 @@ public string Namespace { continue; if ((dt.NestedParentRelations.Length == 0) || (dt.NestedParentRelations.Length == 1 && dt.NestedParentRelations[0].ChildTable == dt)) { - // dt.SelfNestedWithOneRelation) { // this is wrong + // dt.SelfNestedWithOneRelation) { // this is wrong bug it was previous behavior if (Tables.Contains(dt.TableName, value, false, true)) throw ExceptionBuilder.DuplicateTableName2(dt.TableName, value); dt.CheckCascadingNamespaceConflict(value); @@ -1104,7 +1104,7 @@ public virtual DataSet Clone() { try { DataSet ds = (DataSet)Activator.CreateInstance(this.GetType(), true); - if (ds.Tables.Count > 0) // Microsoft : To clean up all the schema in strong typed dataset. + if (ds.Tables.Count > 0) // [....] : To clean up all the schema in strong typed dataset. ds.Reset(); //copy some original dataset properties @@ -3062,7 +3062,7 @@ internal bool ValidateLocaleConstraint() { } } - // Microsoft: may be better to rewrite this as nonrecursive? + // [....]: may be better to rewrite this as nonrecursive? internal DataTable FindTable(DataTable baseTable, PropertyDescriptor[] props, int propStart) { if (props.Length < propStart + 1) return baseTable; diff --git a/System.Data/System/Data/DataSysAttribute.cs b/System.Data/System/Data/DataSysAttribute.cs index 6022e8f8b..c0763fca7 100644 --- a/System.Data/System/Data/DataSysAttribute.cs +++ b/System.Data/System/Data/DataSysAttribute.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ /* diff --git a/System.Data/System/Data/DataTable.cs b/System.Data/System/Data/DataTable.cs index 19c99cad9..637816ef0 100644 --- a/System.Data/System/Data/DataTable.cs +++ b/System.Data/System/Data/DataTable.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -1893,7 +1893,7 @@ virtual public void EndInit() { } } } - fInitInProgress = false; // Microsoft : 77890. It is must that we set off this flag after calling FinishInitxxx(); + fInitInProgress = false; // [....] : 77890. It is must that we set off this flag after calling FinishInitxxx(); if (delayedSetPrimaryKey != null) { PrimaryKey = delayedSetPrimaryKey; delayedSetPrimaryKey = null; @@ -2150,7 +2150,7 @@ internal DataTable Clone(DataSet cloneDS) { Bid.ScopeEnter(out hscp, " %d#, cloneDS=%d\n", ObjectID, (cloneDS != null) ? cloneDS.ObjectID : 0); try { DataTable clone = CreateInstance(); - if (clone.Columns.Count > 0) // Microsoft : To clean up all the schema in strong typed dataset. + if (clone.Columns.Count > 0) // [....] : To clean up all the schema in strong typed dataset. clone.Reset(); return CloneTo(clone, cloneDS, false); } @@ -2225,8 +2225,8 @@ private DataTable CloneTo(DataTable clone, DataSet cloneDS, bool skipExpressionC clone._caseSensitiveUserSet = _caseSensitiveUserSet; clone.displayExpression = displayExpression; - clone.typeName = typeName; //Microsoft - clone.repeatableElement = repeatableElement; //Microsoft + clone.typeName = typeName; //[....] + clone.repeatableElement = repeatableElement; //[....] clone.MinimumCapacity = MinimumCapacity; clone.RemotingFormat = RemotingFormat; // clone.SerializeHierarchy = SerializeHierarchy; @@ -3548,7 +3548,7 @@ internal void SilentlySetValue(DataRow dr, DataColumn dc, DataRowVersion version bool equalValues = false; if (DataStorage.IsTypeCustomType(dc.DataType) && newValue != dc[record]) { - // if UDT storage, need to check if reference changed. See + // if UDT storage, need to check if reference changed. See bug 385182 equalValues = false; } else { @@ -3924,12 +3924,12 @@ private void SetNewRecordWorker(DataRow row, int proposedRecord, DataRowAction a } } - // Dev10 - - + // Dev10 Bug 688779: DataRowView.PropertyChanged are not raised on RejectChanges + // if the newRecord is changing, the propertychanged event should be allowed to triggered for ListChangedType.Changed or .Moved + // unless the specific condition is known that no data has changed, like DataRow.SetModified() if (!suppressEnsurePropertyChanged && !row.HasPropertyChanged && (row.newRecord != proposedRecord) - && (-1 != proposedRecord) // explictly not fixing Dev10 - && (-1 != row.newRecord)) // explictly not fixing parts of Dev10 + && (-1 != proposedRecord) // explictly not fixing Dev10 Bug 692044: DataRowView.PropertyChanged are not raised on DataTable.Delete when mixing current and original records in RowStateFilter + && (-1 != row.newRecord)) // explictly not fixing parts of Dev10 Bug 697909: when mixing current and original records in RowStateFilter { // DataRow will believe multiple edits occured and // DataView.ListChanged event w/ ListChangedType.ItemChanged will raise DataRowView.PropertyChanged event and @@ -3942,7 +3942,7 @@ private void SetNewRecordWorker(DataRow row, int proposedRecord, DataRowAction a // Check whether we need to update indexes if (LiveIndexes.Count != 0) { - // Dev10 + // Dev10 bug #463087: DataTable internal index is currupted: '5' if ((-1 == currentRecord) && (-1 != proposedRecord) && (-1 != row.oldRecord) && (proposedRecord != row.oldRecord)) { // the transition from DataRowState.Deleted -> DataRowState.Modified // with same orginal record but new current record @@ -3971,8 +3971,8 @@ private void SetNewRecordWorker(DataRow row, int proposedRecord, DataRowAction a this.recordManager[proposedRecord] = row; } - // Dev10 - + // Dev10 Bug 461199 - reset the last changed column here, after all + // DataViews have raised their DataRowView.PropertyChanged event row.ResetLastChangedColumn(); // SQLBU 278737: Record manager corruption when reentrant write operations @@ -4043,7 +4043,7 @@ internal void SetOldRecord(DataRow row, int proposedRecord) { // Check whether we need to update indexes if (LiveIndexes.Count != 0) { - // Dev10 + // Dev10 bug #463087: DataTable internal index is currupted: '5' if ((-1 == originalRecord) && (-1 != proposedRecord) && (-1 != row.newRecord) && (proposedRecord != row.newRecord)) { // the transition from DataRowState.Added -> DataRowState.Modified // with same current record but new original record @@ -4349,7 +4349,7 @@ internal DataColumn AddUniqueKey(int position) { if (position == -1) Columns.Add(key); - else { // we do have a problem and Imy idea is it is + else { // we do have a problem and Imy idea is it is bug. Ask Enzo while Code review. Why we do not set ordinal when we call AddAt? for(int i = Columns.Count -1; i >= position; i--) { this.Columns[i].SetOrdinalInternal(i+1); } @@ -5526,8 +5526,8 @@ internal XmlReadMode ReadXml(XmlReader reader, XmlReadMode mode, bool denyResolv throw ExceptionBuilder.DataTableInferenceNotSupported(); } - // Microsoft xmlload.InferSchema(xdoc, null); - // Microsoft xmlload.LoadData(xdoc); + // [....] xmlload.InferSchema(xdoc, null); + // [....] xmlload.LoadData(xdoc); } } RestoreConstraint(originalEnforceConstraint); @@ -5741,7 +5741,7 @@ internal void ReadXmlSchema(XmlReader reader, bool denyResolving) currentTable = ds.Tables[CurrentTableName, CurrentTableNamespace]; } - if (currentTable == null) { // + if (currentTable == null) { // bug fix :99186 string qTableName = string.Empty; if (!Common.ADP.IsEmpty(this.tableName)) { qTableName = (this.Namespace.Length > 0)? (this.Namespace + ":" + this.tableName):this.tableName; diff --git a/System.Data/System/Data/DataTableClearEvent.cs b/System.Data/System/Data/DataTableClearEvent.cs index 302330291..a942a9336 100644 --- a/System.Data/System/Data/DataTableClearEvent.cs +++ b/System.Data/System/Data/DataTableClearEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataTableCollection.cs b/System.Data/System/Data/DataTableCollection.cs index a05d7d457..abe20b7f9 100644 --- a/System.Data/System/Data/DataTableCollection.cs +++ b/System.Data/System/Data/DataTableCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -398,7 +398,7 @@ internal bool CanRemove(DataTable table, bool fThrowException) { for (ChildForeignKeyConstraintEnumerator constraints = new ChildForeignKeyConstraintEnumerator(dataSet, table); constraints.GetNext();) { ForeignKeyConstraint constraint = constraints.GetForeignKeyConstraint(); - if (constraint.Table == table && constraint.RelatedTable == table) // + if (constraint.Table == table && constraint.RelatedTable == table) // bug 97670 continue; if (!fThrowException) diff --git a/System.Data/System/Data/DataTableNewRowEvent.cs b/System.Data/System/Data/DataTableNewRowEvent.cs index db994c7c2..bfd0fcd7a 100644 --- a/System.Data/System/Data/DataTableNewRowEvent.cs +++ b/System.Data/System/Data/DataTableNewRowEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataTablePropertyDescriptor.cs b/System.Data/System/Data/DataTablePropertyDescriptor.cs index 3d9f30c63..a5ffd176b 100644 --- a/System.Data/System/Data/DataTablePropertyDescriptor.cs +++ b/System.Data/System/Data/DataTablePropertyDescriptor.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataTableReader.cs b/System.Data/System/Data/DataTableReader.cs index 475e6f721..90d9af9f0 100644 --- a/System.Data/System/Data/DataTableReader.cs +++ b/System.Data/System/Data/DataTableReader.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataTableReaderListener.cs b/System.Data/System/Data/DataTableReaderListener.cs index 545909a4f..66b1c720d 100644 --- a/System.Data/System/Data/DataTableReaderListener.cs +++ b/System.Data/System/Data/DataTableReaderListener.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataTableTypeConverter.cs b/System.Data/System/Data/DataTableTypeConverter.cs index dc1425682..b5a9ed888 100644 --- a/System.Data/System/Data/DataTableTypeConverter.cs +++ b/System.Data/System/Data/DataTableTypeConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataView.cs b/System.Data/System/Data/DataView.cs index 69c0ce2b6..fb93c55a2 100644 --- a/System.Data/System/Data/DataView.cs +++ b/System.Data/System/Data/DataView.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -166,7 +166,7 @@ public DataView(DataTable table, String RowFilter, string Sort, DataViewRowState /// /// Allow construction of DataView with and /// - /// This is a copy of the other DataView ctor and needs to be kept in sync + /// This is a copy of the other DataView ctor and needs to be kept in [....] internal DataView(DataTable table, System.Predicate predicate, System.Comparison comparison, DataViewRowState RowState) { GC.SuppressFinalize(this); Bid.Trace(" %d#, table=%d, RowState=%d{ds.DataViewRowState}\n", @@ -1294,7 +1294,7 @@ protected virtual void IndexListChanged(object sender, ListChangedEventArgs e) { if (ListChangedType.Reset != e.ListChangedType) { OnListChanged(e); } - if (addNewRow != null && index.RecordCount == 0) { // Microsoft : 83032 Clear the newly added row as the underlying index is reset. + if (addNewRow != null && index.RecordCount == 0) { // [....] : 83032 Clear the newly added row as the underlying index is reset. FinishAddNew(false); } if (ListChangedType.Reset == e.ListChangedType) { @@ -1511,7 +1511,7 @@ internal void SetDataViewManager(DataViewManager dataViewManager) { dataViewManager.nViews++; DataViewSetting dataViewSetting = dataViewManager.DataViewSettings[table]; try { - // Microsoft: check that we will not do unnesasary operation here if dataViewSetting.Sort == this.Sort ... + // [....]: check that we will not do unnesasary operation here if dataViewSetting.Sort == this.Sort ... applyDefaultSort = dataViewSetting.ApplyDefaultSort; DataExpression newFilter = new DataExpression(table, dataViewSetting.RowFilter); SetIndex(dataViewSetting.Sort, dataViewSetting.RowStateFilter, newFilter); diff --git a/System.Data/System/Data/DataViewListener.cs b/System.Data/System/Data/DataViewListener.cs index 0821be330..32fb4fbf6 100644 --- a/System.Data/System/Data/DataViewListener.cs +++ b/System.Data/System/Data/DataViewListener.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataViewManager.cs b/System.Data/System/Data/DataViewManager.cs index 29d032803..f597b87e8 100644 --- a/System.Data/System/Data/DataViewManager.cs +++ b/System.Data/System/Data/DataViewManager.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -300,7 +300,7 @@ string IBindingList.GetListName(PropertyDescriptor[] listAccessors) { } */ - // Microsoft: GetListName and GetItemProperties almost the same in DataView and DataViewManager + // [....]: GetListName and GetItemProperties almost the same in DataView and DataViewManager string System.ComponentModel.ITypedList.GetListName(PropertyDescriptor[] listAccessors) { DataSet dataSet = DataSet; if (dataSet == null) diff --git a/System.Data/System/Data/DataViewManagerListItemTypeDescriptor.cs b/System.Data/System/Data/DataViewManagerListItemTypeDescriptor.cs index b9ed419b4..60d96cc86 100644 --- a/System.Data/System/Data/DataViewManagerListItemTypeDescriptor.cs +++ b/System.Data/System/Data/DataViewManagerListItemTypeDescriptor.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataViewSetting.cs b/System.Data/System/Data/DataViewSetting.cs index 1072ce263..d2d4b86f4 100644 --- a/System.Data/System/Data/DataViewSetting.cs +++ b/System.Data/System/Data/DataViewSetting.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DataViewSettingCollection.cs b/System.Data/System/Data/DataViewSettingCollection.cs index cbdfa92f2..fc91e196b 100644 --- a/System.Data/System/Data/DataViewSettingCollection.cs +++ b/System.Data/System/Data/DataViewSettingCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/DefaultValueTypeConverter.cs b/System.Data/System/Data/DefaultValueTypeConverter.cs index 977867402..092a27b24 100644 --- a/System.Data/System/Data/DefaultValueTypeConverter.cs +++ b/System.Data/System/Data/DefaultValueTypeConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ /* diff --git a/System.Data/System/Data/FillErrorEventArgs.cs b/System.Data/System/Data/FillErrorEventArgs.cs index 83c581a83..ea0f9b7d9 100644 --- a/System.Data/System/Data/FillErrorEventArgs.cs +++ b/System.Data/System/Data/FillErrorEventArgs.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { // MDAC 59437 diff --git a/System.Data/System/Data/Filter/AggregateNode.cs b/System.Data/System/Data/Filter/AggregateNode.cs index 2fe5c8136..0515908cc 100644 --- a/System.Data/System/Data/Filter/AggregateNode.cs +++ b/System.Data/System/Data/Filter/AggregateNode.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/BinaryNode.cs b/System.Data/System/Data/Filter/BinaryNode.cs index 808ad9007..1e2691c82 100644 --- a/System.Data/System/Data/Filter/BinaryNode.cs +++ b/System.Data/System/Data/Filter/BinaryNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/ConstNode.cs b/System.Data/System/Data/Filter/ConstNode.cs index ae40e2269..3d3215329 100644 --- a/System.Data/System/Data/Filter/ConstNode.cs +++ b/System.Data/System/Data/Filter/ConstNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/DataExpression.cs b/System.Data/System/Data/Filter/DataExpression.cs index a61417462..2a13366e5 100644 --- a/System.Data/System/Data/Filter/DataExpression.cs +++ b/System.Data/System/Data/Filter/DataExpression.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/ExpressionNode.cs b/System.Data/System/Data/Filter/ExpressionNode.cs index 049e98aa8..bbd59d3c8 100644 --- a/System.Data/System/Data/Filter/ExpressionNode.cs +++ b/System.Data/System/Data/Filter/ExpressionNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/ExpressionParser.cs b/System.Data/System/Data/Filter/ExpressionParser.cs index c040e8e4f..0cbd98ec9 100644 --- a/System.Data/System/Data/Filter/ExpressionParser.cs +++ b/System.Data/System/Data/Filter/ExpressionParser.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/FilterException.cs b/System.Data/System/Data/Filter/FilterException.cs index 11165c62e..643744062 100644 --- a/System.Data/System/Data/Filter/FilterException.cs +++ b/System.Data/System/Data/Filter/FilterException.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/FunctionNode.cs b/System.Data/System/Data/Filter/FunctionNode.cs index 7d53c4934..97580e2d9 100644 --- a/System.Data/System/Data/Filter/FunctionNode.cs +++ b/System.Data/System/Data/Filter/FunctionNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/LookupNode.cs b/System.Data/System/Data/Filter/LookupNode.cs index e709a44a3..3b75a801c 100644 --- a/System.Data/System/Data/Filter/LookupNode.cs +++ b/System.Data/System/Data/Filter/LookupNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -92,7 +92,7 @@ internal override object Eval(DataRow row, DataRowVersion version) { if (parent == null) return DBNull.Value; - return parent[column, parent.HasVersion(version) ? version : DataRowVersion.Current]; // Microsoft : + return parent[column, parent.HasVersion(version) ? version : DataRowVersion.Current]; // [....] : Bug 76154 } internal override object Eval(int[] recordNos) { diff --git a/System.Data/System/Data/Filter/NameNode.cs b/System.Data/System/Data/Filter/NameNode.cs index efc3b139e..4ec71c0e7 100644 --- a/System.Data/System/Data/Filter/NameNode.cs +++ b/System.Data/System/Data/Filter/NameNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/Operators.cs b/System.Data/System/Data/Filter/Operators.cs index 863a0c0f0..ef806e204 100644 --- a/System.Data/System/Data/Filter/Operators.cs +++ b/System.Data/System/Data/Filter/Operators.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/UnaryNode.cs b/System.Data/System/Data/Filter/UnaryNode.cs index 2bc957117..21f4fec0c 100644 --- a/System.Data/System/Data/Filter/UnaryNode.cs +++ b/System.Data/System/Data/Filter/UnaryNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Filter/ZeroOpNode.cs b/System.Data/System/Data/Filter/ZeroOpNode.cs index 21e318aa4..e9c0ad4fa 100644 --- a/System.Data/System/Data/Filter/ZeroOpNode.cs +++ b/System.Data/System/Data/Filter/ZeroOpNode.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/ForeignKeyConstraint.cs b/System.Data/System/Data/ForeignKeyConstraint.cs index a343d699d..5afa2ecbd 100644 --- a/System.Data/System/Data/ForeignKeyConstraint.cs +++ b/System.Data/System/Data/ForeignKeyConstraint.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -343,7 +343,7 @@ internal void CascadeRollback(DataRow row) { Index childIndex = childKey.GetSortIndex( row.RowState == DataRowState.Deleted ? DataViewRowState.OriginalRows : DataViewRowState.CurrentRows); object[] key = row.GetKeyValues(parentKey, row.RowState == DataRowState.Modified ? DataRowVersion.Current : DataRowVersion.Default ); - // + // Bug : This is definitely not a proper fix. (Ref. MDAC Bug 73592) if (IsKeyNull(key)) { return; } diff --git a/System.Data/System/Data/MergeFailedEvent.cs b/System.Data/System/Data/MergeFailedEvent.cs index 3de377905..880119a67 100644 --- a/System.Data/System/Data/MergeFailedEvent.cs +++ b/System.Data/System/Data/MergeFailedEvent.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Merger.cs b/System.Data/System/Data/Merger.cs index 0d01c4987..091a03a2a 100644 --- a/System.Data/System/Data/Merger.cs +++ b/System.Data/System/Data/Merger.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/Odbc/DbDataRecord.cs b/System.Data/System/Data/Odbc/DbDataRecord.cs index ea81451b6..ac00f0d0e 100644 --- a/System.Data/System/Data/Odbc/DbDataRecord.cs +++ b/System.Data/System/Data/Odbc/DbDataRecord.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/Odbc32.cs b/System.Data/System/Data/Odbc/Odbc32.cs index 4fddaba87..63a7a6e29 100644 --- a/System.Data/System/Data/Odbc/Odbc32.cs +++ b/System.Data/System/Data/Odbc/Odbc32.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Odbc/OdbcCommand.cs b/System.Data/System/Data/Odbc/OdbcCommand.cs index 2c1f531f2..a5b4cbdf0 100644 --- a/System.Data/System/Data/Odbc/OdbcCommand.cs +++ b/System.Data/System/Data/Odbc/OdbcCommand.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcCommandBuilder.cs b/System.Data/System/Data/Odbc/OdbcCommandBuilder.cs index e94f58756..955c786fd 100644 --- a/System.Data/System/Data/Odbc/OdbcCommandBuilder.cs +++ b/System.Data/System/Data/Odbc/OdbcCommandBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcConnection.cs b/System.Data/System/Data/Odbc/OdbcConnection.cs index 7a35ef87c..bf56cc81f 100644 --- a/System.Data/System/Data/Odbc/OdbcConnection.cs +++ b/System.Data/System/Data/Odbc/OdbcConnection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcConnectionFactory.cs b/System.Data/System/Data/Odbc/OdbcConnectionFactory.cs index e72fc109f..956635682 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionFactory.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc diff --git a/System.Data/System/Data/Odbc/OdbcConnectionHandle.cs b/System.Data/System/Data/Odbc/OdbcConnectionHandle.cs index fd0b3598c..fc645f7e7 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionHandle.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionHandle.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcConnectionOpen.cs b/System.Data/System/Data/Odbc/OdbcConnectionOpen.cs index 42c134450..cbfb7691d 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionOpen.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionOpen.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcConnectionPoolProviderInfo.cs b/System.Data/System/Data/Odbc/OdbcConnectionPoolProviderInfo.cs index a48d5d741..b631eabdb 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionPoolProviderInfo.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionPoolProviderInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc diff --git a/System.Data/System/Data/Odbc/OdbcConnectionString.cs b/System.Data/System/Data/Odbc/OdbcConnectionString.cs index f9d7a4654..821449546 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionString.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionString.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/OdbcConnectionStringbuilder.cs b/System.Data/System/Data/Odbc/OdbcConnectionStringbuilder.cs index 13193c544..224cf9984 100644 --- a/System.Data/System/Data/Odbc/OdbcConnectionStringbuilder.cs +++ b/System.Data/System/Data/Odbc/OdbcConnectionStringbuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcDataAdapter.cs b/System.Data/System/Data/Odbc/OdbcDataAdapter.cs index b3bbbe129..c05c0b67f 100644 --- a/System.Data/System/Data/Odbc/OdbcDataAdapter.cs +++ b/System.Data/System/Data/Odbc/OdbcDataAdapter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcDataReader.cs b/System.Data/System/Data/Odbc/OdbcDataReader.cs index c22353954..2428b5e49 100644 --- a/System.Data/System/Data/Odbc/OdbcDataReader.cs +++ b/System.Data/System/Data/Odbc/OdbcDataReader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -545,12 +545,12 @@ override public bool IsDBNull(int i) { // item for GetInt32. This actually improves perf anyway, (even if the driver could // support it), since we are not making a seperate interop call... - // - - - - - + // Bug SQLBUVSTS01:110664 - available cases: + // 1. random access - always cache the value (as before the fix), to minimize regression risk + // 2. sequential access, fixed-size value: continue caching the value as before, again to minimize regression risk + // 3. sequential access, variable-length value: this scenario did not work properly before the fix. Fix + // it now by calling GetData(length = 0). + // 4. sequential access, cache value exists: just check the cache for DbNull (no validations done, again to minimize regressions) if (!IsCommandBehavior(CommandBehavior.SequentialAccess)) return Convert.IsDBNull(GetValue(i)); // case 1, cache the value @@ -1012,7 +1012,7 @@ private long GetBytesOrChars(int i, long dataIndex, Array buffer, bool isCharsBu if (dataIndex >= cachedObjectLength) { // no more bytes to read - // see also MDAC + // see also MDAC bug 73298 return 0; } @@ -1021,7 +1021,7 @@ private long GetBytesOrChars(int i, long dataIndex, Array buffer, bool isCharsBu // silently reduce the length to avoid regression from EVERETT lengthOfCopy = Math.Min(lengthOfCopy, buffer.Length - bufferIndex); - if (lengthOfCopy <= 0) return 0; // MDAC + if (lengthOfCopy <= 0) return 0; // MDAC Bug 73298 if (isCharsBuffer) ((string)cachedObj).CopyTo((int)dataIndex, (char[])buffer, bufferIndex, lengthOfCopy); @@ -1944,7 +1944,7 @@ private DataTable NewSchemaTable() { columns.Add(new DataColumn("BaseTableName", typeof(System.String))); columns.Add(new DataColumn("BaseColumnName", typeof(System.String))); - // MDAC + // MDAC Bug 79231 foreach (DataColumn column in columns) { column.ReadOnly = true; } @@ -2197,8 +2197,8 @@ private int RetrieveKeyInfoFromStatistics(QualifiedTableName qualifiedTableName, // devnote: this test is already done by calling method ... // if (IsClosed) return; // protect against dead connection - // MDAC - + // MDAC Bug 75928 - SQLStatisticsW damages the string passed in + // To protect the tablename we need to pass in a copy of that string String tablename1 = String.Copy(qualifiedTableName.GetTable(quoted)); // Select only unique indexes diff --git a/System.Data/System/Data/Odbc/OdbcEnvironment.cs b/System.Data/System/Data/Odbc/OdbcEnvironment.cs index e2f228c21..86685f8d2 100644 --- a/System.Data/System/Data/Odbc/OdbcEnvironment.cs +++ b/System.Data/System/Data/Odbc/OdbcEnvironment.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcEnvironmentHandle.cs b/System.Data/System/Data/Odbc/OdbcEnvironmentHandle.cs index 78d9cb709..a01fa82c9 100644 --- a/System.Data/System/Data/Odbc/OdbcEnvironmentHandle.cs +++ b/System.Data/System/Data/Odbc/OdbcEnvironmentHandle.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcError.cs b/System.Data/System/Data/Odbc/OdbcError.cs index 2a1c94411..08fbed4a1 100644 --- a/System.Data/System/Data/Odbc/OdbcError.cs +++ b/System.Data/System/Data/Odbc/OdbcError.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcErrorCollection.cs b/System.Data/System/Data/Odbc/OdbcErrorCollection.cs index 00f464349..1358b94a3 100644 --- a/System.Data/System/Data/Odbc/OdbcErrorCollection.cs +++ b/System.Data/System/Data/Odbc/OdbcErrorCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/OdbcException.cs b/System.Data/System/Data/Odbc/OdbcException.cs index 3ec043ec5..ef8ebabb0 100644 --- a/System.Data/System/Data/Odbc/OdbcException.cs +++ b/System.Data/System/Data/Odbc/OdbcException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -66,7 +66,7 @@ override public void GetObjectData(SerializationInfo si, StreamingContext contex base.GetObjectData(si, context); } - // mdac + // mdac bug 62559 - if we don't have it return nothing (empty string) override public string Source { get { if (0 < Errors.Count) { diff --git a/System.Data/System/Data/Odbc/OdbcFactory.cs b/System.Data/System/Data/Odbc/OdbcFactory.cs index da89d9bac..4637f0924 100644 --- a/System.Data/System/Data/Odbc/OdbcFactory.cs +++ b/System.Data/System/Data/Odbc/OdbcFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcHandle.cs b/System.Data/System/Data/Odbc/OdbcHandle.cs index f4deea79f..cf4362005 100644 --- a/System.Data/System/Data/Odbc/OdbcHandle.cs +++ b/System.Data/System/Data/Odbc/OdbcHandle.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcInfoMessageEvent.cs b/System.Data/System/Data/Odbc/OdbcInfoMessageEvent.cs index fed1a56fc..18ea6b2f8 100644 --- a/System.Data/System/Data/Odbc/OdbcInfoMessageEvent.cs +++ b/System.Data/System/Data/Odbc/OdbcInfoMessageEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcParameter.cs b/System.Data/System/Data/Odbc/OdbcParameter.cs index 081d5a80f..013a65cb2 100644 --- a/System.Data/System/Data/Odbc/OdbcParameter.cs +++ b/System.Data/System/Data/Odbc/OdbcParameter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ @@ -326,12 +326,12 @@ private int GetColumnSize(object value, int offset, int ordinal) { // the following code causes failure against SQL 6.5 // ERROR [HY104] [Microsoft][ODBC SQL Server Driver]Invalid precision value // - // the code causes failure if it is NOT there (remark added by Microsoft) + // the code causes failure if it is NOT there (remark added by [....]) // it causes failure with jet if it is there // // MDAC 76227: Code is required for japanese client/server tests. - // If this causes regressions with Jet please doc here including - + // If this causes regressions with Jet please doc here including bug#. ([....]) + // if ((ODBC32.SQL_TYPE.CHAR == _bindtype._sql_type) || (ODBC32.SQL_TYPE.VARCHAR == _bindtype._sql_type) || (ODBC32.SQL_TYPE.LONGVARCHAR == _bindtype._sql_type)) { @@ -707,8 +707,8 @@ internal void Bind(OdbcStatementHandle hstmt, OdbcCommand command, short ordinal if (ODBC32.SQL_C.NUMERIC == sql_c_type) { // for input/output parameters we need to adjust the scale of the input value since the convert function in - // sqlsrv32 takes this scale for the output parameter (possible - + // sqlsrv32 takes this scale for the output parameter (possible bug in sqlsrv32?) + // if ((ODBC32.SQL_PARAM.INPUT_OUTPUT == sqldirection) && (value is Decimal)) { if (scale < _internalScale) { while (scale < _internalScale) { @@ -720,8 +720,8 @@ internal void Bind(OdbcStatementHandle hstmt, OdbcCommand command, short ordinal SetInputValue(value, sql_c_type, cbValueSize, precision, 0, parameterBuffer); // for output parameters we need to write precision and scale to the buffer since the convert function in - // sqlsrv32 expects these values there (possible - + // sqlsrv32 expects these values there (possible bug in sqlsrv32?) + // if (ODBC32.SQL_PARAM.INPUT != sqldirection) { parameterBuffer.WriteInt16(_preparedValueOffset, (short)(((ushort)scale << 8) | (ushort)precision)); } diff --git a/System.Data/System/Data/Odbc/OdbcParameterCollection.cs b/System.Data/System/Data/Odbc/OdbcParameterCollection.cs index feb30a5f5..8231d988d 100644 --- a/System.Data/System/Data/Odbc/OdbcParameterCollection.cs +++ b/System.Data/System/Data/Odbc/OdbcParameterCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/OdbcPermission.cs b/System.Data/System/Data/Odbc/OdbcPermission.cs index d1560e285..b173351f6 100644 --- a/System.Data/System/Data/Odbc/OdbcPermission.cs +++ b/System.Data/System/Data/Odbc/OdbcPermission.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/OdbcReferenceCollection.cs b/System.Data/System/Data/Odbc/OdbcReferenceCollection.cs index 16636e5d2..a6e6c1422 100644 --- a/System.Data/System/Data/Odbc/OdbcReferenceCollection.cs +++ b/System.Data/System/Data/Odbc/OdbcReferenceCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcRowUpdatingEvent.cs b/System.Data/System/Data/Odbc/OdbcRowUpdatingEvent.cs index 7e36ad5e1..1f33d71ae 100644 --- a/System.Data/System/Data/Odbc/OdbcRowUpdatingEvent.cs +++ b/System.Data/System/Data/Odbc/OdbcRowUpdatingEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcStatementHandle.cs b/System.Data/System/Data/Odbc/OdbcStatementHandle.cs index 9000d8ea8..04d1157b7 100644 --- a/System.Data/System/Data/Odbc/OdbcStatementHandle.cs +++ b/System.Data/System/Data/Odbc/OdbcStatementHandle.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcTransaction.cs b/System.Data/System/Data/Odbc/OdbcTransaction.cs index 25dbd7179..610dfdb7c 100644 --- a/System.Data/System/Data/Odbc/OdbcTransaction.cs +++ b/System.Data/System/Data/Odbc/OdbcTransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/OdbcUtils.cs b/System.Data/System/Data/Odbc/OdbcUtils.cs index b5d23b8aa..5c6f11ad1 100644 --- a/System.Data/System/Data/Odbc/OdbcUtils.cs +++ b/System.Data/System/Data/Odbc/OdbcUtils.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Odbc/odbcmetadatacollectionnames.cs b/System.Data/System/Data/Odbc/odbcmetadatacollectionnames.cs index a7cafce8a..ab10d4aa0 100644 --- a/System.Data/System/Data/Odbc/odbcmetadatacollectionnames.cs +++ b/System.Data/System/Data/Odbc/odbcmetadatacollectionnames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/odbcmetadatacolumnnames.cs b/System.Data/System/Data/Odbc/odbcmetadatacolumnnames.cs index bbd591fb1..513cf0f35 100644 --- a/System.Data/System/Data/Odbc/odbcmetadatacolumnnames.cs +++ b/System.Data/System/Data/Odbc/odbcmetadatacolumnnames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Odbc { diff --git a/System.Data/System/Data/Odbc/odbcmetadatafactory.cs b/System.Data/System/Data/Odbc/odbcmetadatafactory.cs index 7b48811f6..87281ad3b 100644 --- a/System.Data/System/Data/Odbc/odbcmetadatafactory.cs +++ b/System.Data/System/Data/Odbc/odbcmetadatafactory.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft -// Microsoft +// [....] +// [....] // //------------------------------------------------------------------------------ @@ -579,7 +579,7 @@ private DataTable GetDataSourceInformationCollection(string [] restrictions, dataSourceInformation[DbMetaDataColumnNames.DataSourceProductVersionNormalized] = ServerVersionNormalized; - // values that are the same for all ODBC drivers. See + // values that are the same for all ODBC drivers. See bug 105333 dataSourceInformation[DbMetaDataColumnNames.ParameterMarkerFormat] = "?"; dataSourceInformation[DbMetaDataColumnNames.ParameterMarkerPattern] = "\\?"; dataSourceInformation[DbMetaDataColumnNames.ParameterNameMaxLength] = 0; diff --git a/System.Data/System/Data/OleDb/ColumnBinding.cs b/System.Data/System/Data/OleDb/ColumnBinding.cs index 89b83e35c..05a211e2c 100644 --- a/System.Data/System/Data/OleDb/ColumnBinding.cs +++ b/System.Data/System/Data/OleDb/ColumnBinding.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/DBBindings.cs b/System.Data/System/Data/OleDb/DBBindings.cs index 4b802a209..60350f468 100644 --- a/System.Data/System/Data/OleDb/DBBindings.cs +++ b/System.Data/System/Data/OleDb/DBBindings.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/DBPropSet.cs b/System.Data/System/Data/OleDb/DBPropSet.cs index f6128fcf3..7157e6c7e 100644 --- a/System.Data/System/Data/OleDb/DBPropSet.cs +++ b/System.Data/System/Data/OleDb/DBPropSet.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/OLEDB_Enum.cs b/System.Data/System/Data/OleDb/OLEDB_Enum.cs index 9eaa3c0e0..40d7250e0 100644 --- a/System.Data/System/Data/OleDb/OLEDB_Enum.cs +++ b/System.Data/System/Data/OleDb/OLEDB_Enum.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OLEDB_Util.cs b/System.Data/System/Data/OleDb/OLEDB_Util.cs index 9a5c4818b..66c7ead9d 100644 --- a/System.Data/System/Data/OleDb/OLEDB_Util.cs +++ b/System.Data/System/Data/OleDb/OLEDB_Util.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbCommand.cs b/System.Data/System/Data/OleDb/OleDbCommand.cs index 34c26ef0f..a835d94e7 100644 --- a/System.Data/System/Data/OleDb/OleDbCommand.cs +++ b/System.Data/System/Data/OleDb/OleDbCommand.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbCommandBuilder.cs b/System.Data/System/Data/OleDb/OleDbCommandBuilder.cs index 7e6b55777..f7e15dd4f 100644 --- a/System.Data/System/Data/OleDb/OleDbCommandBuilder.cs +++ b/System.Data/System/Data/OleDb/OleDbCommandBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbConnection.cs b/System.Data/System/Data/OleDb/OleDbConnection.cs index 251146a92..b721af209 100644 --- a/System.Data/System/Data/OleDb/OleDbConnection.cs +++ b/System.Data/System/Data/OleDb/OleDbConnection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbConnectionFactory.cs b/System.Data/System/Data/OleDb/OleDbConnectionFactory.cs index 28815c855..81a539608 100644 --- a/System.Data/System/Data/OleDb/OleDbConnectionFactory.cs +++ b/System.Data/System/Data/OleDb/OleDbConnectionFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb diff --git a/System.Data/System/Data/OleDb/OleDbConnectionInternal.cs b/System.Data/System/Data/OleDb/OleDbConnectionInternal.cs index 67e120b14..83b463ed4 100644 --- a/System.Data/System/Data/OleDb/OleDbConnectionInternal.cs +++ b/System.Data/System/Data/OleDb/OleDbConnectionInternal.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbConnectionPoolGroupProviderInfo.cs b/System.Data/System/Data/OleDb/OleDbConnectionPoolGroupProviderInfo.cs index 6c48b2565..88200afba 100644 --- a/System.Data/System/Data/OleDb/OleDbConnectionPoolGroupProviderInfo.cs +++ b/System.Data/System/Data/OleDb/OleDbConnectionPoolGroupProviderInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb diff --git a/System.Data/System/Data/OleDb/OleDbDataAdapter.cs b/System.Data/System/Data/OleDb/OleDbDataAdapter.cs index f9e2e640c..c1301ded6 100644 --- a/System.Data/System/Data/OleDb/OleDbDataAdapter.cs +++ b/System.Data/System/Data/OleDb/OleDbDataAdapter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/OleDbDataReader.cs b/System.Data/System/Data/OleDb/OleDbDataReader.cs index 55fdaa58b..16a4393ed 100644 --- a/System.Data/System/Data/OleDb/OleDbDataReader.cs +++ b/System.Data/System/Data/OleDb/OleDbDataReader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { @@ -1168,7 +1168,7 @@ static internal OleDbException NextResults(UnsafeNativeMethods.IMultipleResults static private void NextResultsInfinite() { // MDAC 72738 Bid.Trace(" System.Data.OleDb.OleDbDataReader: 2000 IMultipleResult.GetResult(NULL, DBRESULTFLAG_DEFAULT, IID_NULL, NULL, NULL) iterations with 0 records affected. Stopping suspect infinite loop. To work-around try using ExecuteReader() and iterating through results with NextResult().\n"); - // Microsoft's suggestion is that we debug assert so that users will learn of MSOLAP's misbehavior and not call ExecuteNonQuery + // [....]'s suggestion is that we debug assert so that users will learn of MSOLAP's misbehavior and not call ExecuteNonQuery Debug.Assert(false, " System.Data.OleDb.OleDbDataReader: 2000 IMultipleResult.GetResult(NULL, DBRESULTFLAG_DEFAULT, IID_NULL, NULL, NULL) iterations with 0 records affected. Stopping suspect infinite loop. To work-around try using ExecuteReader() and iterating through results with NextResult().\n"); } diff --git a/System.Data/System/Data/OleDb/OleDbEnumerator.cs b/System.Data/System/Data/OleDb/OleDbEnumerator.cs index fdd83b9c0..25b0e2765 100644 --- a/System.Data/System/Data/OleDb/OleDbEnumerator.cs +++ b/System.Data/System/Data/OleDb/OleDbEnumerator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbError.cs b/System.Data/System/Data/OleDb/OleDbError.cs index c46ab4271..7bd40b391 100644 --- a/System.Data/System/Data/OleDb/OleDbError.cs +++ b/System.Data/System/Data/OleDb/OleDbError.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbErrorCollection.cs b/System.Data/System/Data/OleDb/OleDbErrorCollection.cs index a7410a8e3..c2e0e14f9 100644 --- a/System.Data/System/Data/OleDb/OleDbErrorCollection.cs +++ b/System.Data/System/Data/OleDb/OleDbErrorCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbException.cs b/System.Data/System/Data/OleDb/OleDbException.cs index 1b310bb8b..b34faca19 100644 --- a/System.Data/System/Data/OleDb/OleDbException.cs +++ b/System.Data/System/Data/OleDb/OleDbException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbFactory.cs b/System.Data/System/Data/OleDb/OleDbFactory.cs index 190c0019d..a89770234 100644 --- a/System.Data/System/Data/OleDb/OleDbFactory.cs +++ b/System.Data/System/Data/OleDb/OleDbFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/OleDbInfoMessageEvent.cs b/System.Data/System/Data/OleDb/OleDbInfoMessageEvent.cs index 87936250c..1af769a72 100644 --- a/System.Data/System/Data/OleDb/OleDbInfoMessageEvent.cs +++ b/System.Data/System/Data/OleDb/OleDbInfoMessageEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbMetaDataFactory.cs b/System.Data/System/Data/OleDb/OleDbMetaDataFactory.cs index 7189c9f86..99651fe5e 100644 --- a/System.Data/System/Data/OleDb/OleDbMetaDataFactory.cs +++ b/System.Data/System/Data/OleDb/OleDbMetaDataFactory.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] // Mugunm // //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/OleDb/OleDbParameter.cs b/System.Data/System/Data/OleDb/OleDbParameter.cs index ad824e1a7..745436693 100644 --- a/System.Data/System/Data/OleDb/OleDbParameter.cs +++ b/System.Data/System/Data/OleDb/OleDbParameter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbParameterCollection.cs b/System.Data/System/Data/OleDb/OleDbParameterCollection.cs index 40a210715..2ab175f7c 100644 --- a/System.Data/System/Data/OleDb/OleDbParameterCollection.cs +++ b/System.Data/System/Data/OleDb/OleDbParameterCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbPermission.cs b/System.Data/System/Data/OleDb/OleDbPermission.cs index a1a313100..d7ca1aa88 100644 --- a/System.Data/System/Data/OleDb/OleDbPermission.cs +++ b/System.Data/System/Data/OleDb/OleDbPermission.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbPropertySetGuid.cs b/System.Data/System/Data/OleDb/OleDbPropertySetGuid.cs index 4be4655a8..75e6fae13 100644 --- a/System.Data/System/Data/OleDb/OleDbPropertySetGuid.cs +++ b/System.Data/System/Data/OleDb/OleDbPropertySetGuid.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbReferenceCollection.cs b/System.Data/System/Data/OleDb/OleDbReferenceCollection.cs index ad3750c95..45f347b78 100644 --- a/System.Data/System/Data/OleDb/OleDbReferenceCollection.cs +++ b/System.Data/System/Data/OleDb/OleDbReferenceCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbRowUpdatedEvent.cs b/System.Data/System/Data/OleDb/OleDbRowUpdatedEvent.cs index 043e585d0..d4c3ccf53 100644 --- a/System.Data/System/Data/OleDb/OleDbRowUpdatedEvent.cs +++ b/System.Data/System/Data/OleDb/OleDbRowUpdatedEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbRowUpdatingEvent.cs b/System.Data/System/Data/OleDb/OleDbRowUpdatingEvent.cs index 4b20a71e3..ea1d58df0 100644 --- a/System.Data/System/Data/OleDb/OleDbRowUpdatingEvent.cs +++ b/System.Data/System/Data/OleDb/OleDbRowUpdatingEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbSchemaGuid.cs b/System.Data/System/Data/OleDb/OleDbSchemaGuid.cs index 69bac32ad..eb0b45c11 100644 --- a/System.Data/System/Data/OleDb/OleDbSchemaGuid.cs +++ b/System.Data/System/Data/OleDb/OleDbSchemaGuid.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbStruct.cs b/System.Data/System/Data/OleDb/OleDbStruct.cs index 8683055b5..49f83271b 100644 --- a/System.Data/System/Data/OleDb/OleDbStruct.cs +++ b/System.Data/System/Data/OleDb/OleDbStruct.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbTransaction.cs b/System.Data/System/Data/OleDb/OleDbTransaction.cs index 14881edbc..a5653b5a7 100644 --- a/System.Data/System/Data/OleDb/OleDbTransaction.cs +++ b/System.Data/System/Data/OleDb/OleDbTransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OleDbWrapper.cs b/System.Data/System/Data/OleDb/OleDbWrapper.cs index 433d6d499..c4a71c071 100644 --- a/System.Data/System/Data/OleDb/OleDbWrapper.cs +++ b/System.Data/System/Data/OleDb/OleDbWrapper.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/OledbConnectionStringbuilder.cs b/System.Data/System/Data/OleDb/OledbConnectionStringbuilder.cs index 9b9eb1717..bb021752e 100644 --- a/System.Data/System/Data/OleDb/OledbConnectionStringbuilder.cs +++ b/System.Data/System/Data/OleDb/OledbConnectionStringbuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/PropertyIDSet.cs b/System.Data/System/Data/OleDb/PropertyIDSet.cs index 048b30508..92d8e4bfb 100644 --- a/System.Data/System/Data/OleDb/PropertyIDSet.cs +++ b/System.Data/System/Data/OleDb/PropertyIDSet.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/PropertyInfoSet.cs b/System.Data/System/Data/OleDb/PropertyInfoSet.cs index 8f0bbf887..fb15d85b3 100644 --- a/System.Data/System/Data/OleDb/PropertyInfoSet.cs +++ b/System.Data/System/Data/OleDb/PropertyInfoSet.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/OleDb/RowBinding.cs b/System.Data/System/Data/OleDb/RowBinding.cs index 71b80127a..eb93e1ae3 100644 --- a/System.Data/System/Data/OleDb/RowBinding.cs +++ b/System.Data/System/Data/OleDb/RowBinding.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/SafeHandles.cs b/System.Data/System/Data/OleDb/SafeHandles.cs index 1351f3b11..39e1958f5 100644 --- a/System.Data/System/Data/OleDb/SafeHandles.cs +++ b/System.Data/System/Data/OleDb/SafeHandles.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/oledbconnectionstring.cs b/System.Data/System/Data/OleDb/oledbconnectionstring.cs index e1406cfc2..bb12e5de7 100644 --- a/System.Data/System/Data/OleDb/oledbconnectionstring.cs +++ b/System.Data/System/Data/OleDb/oledbconnectionstring.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/oledbmetadatacollectionnames.cs b/System.Data/System/Data/OleDb/oledbmetadatacollectionnames.cs index 9c0600b28..629e25ab9 100644 --- a/System.Data/System/Data/OleDb/oledbmetadatacollectionnames.cs +++ b/System.Data/System/Data/OleDb/oledbmetadatacollectionnames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OleDb/oledbmetadatacolumnnames.cs b/System.Data/System/Data/OleDb/oledbmetadatacolumnnames.cs index 741e79769..3e2606325 100644 --- a/System.Data/System/Data/OleDb/oledbmetadatacolumnnames.cs +++ b/System.Data/System/Data/OleDb/oledbmetadatacolumnnames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.OleDb { diff --git a/System.Data/System/Data/OperationAbortedException.cs b/System.Data/System/Data/OperationAbortedException.cs index 3eda086c7..539b0e3c1 100644 --- a/System.Data/System/Data/OperationAbortedException.cs +++ b/System.Data/System/Data/OperationAbortedException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/PrimaryKeyTypeConverter.cs b/System.Data/System/Data/PrimaryKeyTypeConverter.cs index b57494291..431f2ba83 100644 --- a/System.Data/System/Data/PrimaryKeyTypeConverter.cs +++ b/System.Data/System/Data/PrimaryKeyTypeConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/PropertyCollection.cs b/System.Data/System/Data/PropertyCollection.cs index e0532236d..0b014fd3a 100644 --- a/System.Data/System/Data/PropertyCollection.cs +++ b/System.Data/System/Data/PropertyCollection.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/ProviderBase/DataReaderContainer.cs b/System.Data/System/Data/ProviderBase/DataReaderContainer.cs index 181017f55..b6864fb8d 100644 --- a/System.Data/System/Data/ProviderBase/DataReaderContainer.cs +++ b/System.Data/System/Data/ProviderBase/DataReaderContainer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbBuffer.cs b/System.Data/System/Data/ProviderBase/DbBuffer.cs index 390d8cd51..82c4df382 100644 --- a/System.Data/System/Data/ProviderBase/DbBuffer.cs +++ b/System.Data/System/Data/ProviderBase/DbBuffer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase diff --git a/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs b/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs index a47c0532b..fee86a2e3 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionClosed.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs b/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs index 64032e8a2..c9fe482c8 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs b/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs index 9765041e3..0e5622882 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace NAMESPACE { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs b/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs index a38b620f8..73541107c 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionInternal.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { @@ -58,7 +58,7 @@ internal abstract class DbConnectionInternal { // V1.1.3300 private SysTx.Transaction _enlistedTransactionOriginal; #if DEBUG - private int _activateCount; // debug only counter to verify activate/deactivates are in sync. + private int _activateCount; // debug only counter to verify activate/deactivates are in [....]. #endif //DEBUG protected DbConnectionInternal() : this(ConnectionState.Open, true, false) { // V1.1.3300 @@ -259,15 +259,15 @@ internal bool IsEmancipated { // // That means that: // - // _pooledCount > 1 connection is in the pool multiple times (this is a serious - - - - - - - - + // _pooledCount > 1 connection is in the pool multiple times (this is a serious bug...) + // _pooledCount == 1 connection is in the pool + // _pooledCount == 0 connection is out of the pool + // _pooledCount == -1 connection is not a pooled connection; we shouldn't be here for non-pooled connections. + // _pooledCount < -1 connection out of the pool multiple times (not sure how this could happen...) + // + // Now, our job is to return TRUE when the connection is out + // of the pool and it's owning object is no longer around to + // return it. bool value = !IsTxRootWaitingForTxEnd && (_pooledCount < 1) && !_owningObject.IsAlive; return value; @@ -323,7 +323,7 @@ abstract public string ServerVersion { get; } - // this should be abstract but untill it is added to all the providers virtual will have to do Microsoft + // this should be abstract but untill it is added to all the providers virtual will have to do [....] virtual public string ServerVersionNormalized { get{ throw ADP.NotSupported(); diff --git a/System.Data/System/Data/ProviderBase/DbConnectionPool.cs b/System.Data/System/Data/ProviderBase/DbConnectionPool.cs index 7ed94a340..6c87c0229 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionPool.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionPool.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { @@ -1148,7 +1148,7 @@ internal bool TryGetConnection(DbConnection owningObject, TaskCompletionSource // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs b/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs index 31a5b968d..17fc317bb 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionPoolGroup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs b/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs index dfd1796b9..32a8ebfb2 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionPoolGroupProviderInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs b/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs index 34e8e00be..330b89fba 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionPoolIdentity.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs b/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs index 33610b618..fa3f82e55 100644 --- a/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs +++ b/System.Data/System/Data/ProviderBase/DbConnectionPoolOptions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs b/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs index 118800f7c..2408d5f4a 100644 --- a/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs +++ b/System.Data/System/Data/ProviderBase/DbMetaDataCollectionNames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs b/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs index 6d12c9169..c8237455e 100644 --- a/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs +++ b/System.Data/System/Data/ProviderBase/DbMetaDataColumnNames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs b/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs index 67025f4b5..5267928dd 100644 --- a/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs +++ b/System.Data/System/Data/ProviderBase/DbMetaDataFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs b/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs index d28d3414e..33266444b 100644 --- a/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs +++ b/System.Data/System/Data/ProviderBase/DbParameterCollectionHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace NAMESPACE diff --git a/System.Data/System/Data/ProviderBase/DbParameterHelper.cs b/System.Data/System/Data/ProviderBase/DbParameterHelper.cs index b968d12dc..7efd67b6a 100644 --- a/System.Data/System/Data/ProviderBase/DbParameterHelper.cs +++ b/System.Data/System/Data/ProviderBase/DbParameterHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace NAMESPACE { diff --git a/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs b/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs index 1f55090b4..8a1baeec7 100644 --- a/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs +++ b/System.Data/System/Data/ProviderBase/DbReferenceCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/SchemaMapping.cs b/System.Data/System/Data/ProviderBase/SchemaMapping.cs index 0118a9a64..9c0e43513 100644 --- a/System.Data/System/Data/ProviderBase/SchemaMapping.cs +++ b/System.Data/System/Data/ProviderBase/SchemaMapping.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/ProviderBase/TimeoutTimer.cs b/System.Data/System/Data/ProviderBase/TimeoutTimer.cs index 24172d3bd..8c89bab8e 100644 --- a/System.Data/System/Data/ProviderBase/TimeoutTimer.cs +++ b/System.Data/System/Data/ProviderBase/TimeoutTimer.cs @@ -5,8 +5,8 @@ // // Class used to manage timeouts in complex system operations. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase diff --git a/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs b/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs index acd00a437..298ed6091 100644 --- a/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs +++ b/System.Data/System/Data/ProviderBase/WrappedIUnknown.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.ProviderBase { diff --git a/System.Data/System/Data/Range.cs b/System.Data/System/Data/Range.cs index 6c3ea0a9c..790bf3055 100644 --- a/System.Data/System/Data/Range.cs +++ b/System.Data/System/Data/Range.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/RbTree.cs b/System.Data/System/Data/RbTree.cs index 57ab5bfa1..4048974b9 100644 --- a/System.Data/System/Data/RbTree.cs +++ b/System.Data/System/Data/RbTree.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #if DEBUG diff --git a/System.Data/System/Data/RecordManager.cs b/System.Data/System/Data/RecordManager.cs index 608f79c6f..106bfafe0 100644 --- a/System.Data/System/Data/RecordManager.cs +++ b/System.Data/System/Data/RecordManager.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/RecordsAffectedEventArgs.cs b/System.Data/System/Data/RecordsAffectedEventArgs.cs index 82322d961..9f2c8aef1 100644 --- a/System.Data/System/Data/RecordsAffectedEventArgs.cs +++ b/System.Data/System/Data/RecordsAffectedEventArgs.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/RelatedView.cs b/System.Data/System/Data/RelatedView.cs index e1aed175a..7493a8b56 100644 --- a/System.Data/System/Data/RelatedView.cs +++ b/System.Data/System/Data/RelatedView.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/RelationshipConverter.cs b/System.Data/System/Data/RelationshipConverter.cs index 2fec1c69e..dbddce219 100644 --- a/System.Data/System/Data/RelationshipConverter.cs +++ b/System.Data/System/Data/RelationshipConverter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/SQLTypes/SQLBinary.cs b/System.Data/System/Data/SQLTypes/SQLBinary.cs index e9df08a60..114fd109a 100644 --- a/System.Data/System/Data/SQLTypes/SQLBinary.cs +++ b/System.Data/System/Data/SQLTypes/SQLBinary.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLBoolean.cs b/System.Data/System/Data/SQLTypes/SQLBoolean.cs index 21f2b3df4..300eb2914 100644 --- a/System.Data/System/Data/SQLTypes/SQLBoolean.cs +++ b/System.Data/System/Data/SQLTypes/SQLBoolean.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLByte.cs b/System.Data/System/Data/SQLTypes/SQLByte.cs index bf0be8953..f72b2e843 100644 --- a/System.Data/System/Data/SQLTypes/SQLByte.cs +++ b/System.Data/System/Data/SQLTypes/SQLByte.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLBytes.cs b/System.Data/System/Data/SQLTypes/SQLBytes.cs index c8bf25e0a..1c7dd76f4 100644 --- a/System.Data/System/Data/SQLTypes/SQLBytes.cs +++ b/System.Data/System/Data/SQLTypes/SQLBytes.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** @@ -29,17 +29,17 @@ // 112296 AZA 07/06/02 Seal SqlAccess classes. // 107151 AZA 04/18/02 Track byte array buffer as well as SqlBytes in // sqlaccess. -// 107216 JXF 04/17/02 - - - - - - - - - - +// 107216 JXF 04/17/02 Bug 514927 +// 106854 JXF 04/15/02 Fix http suites due to SqlChars +// 106448 JXF 04/12/02 Bugs on sqlchars +// 106242 JXF 04/09/02 Bugs on SqlBytes/SqlChars +// 105715 JXF 04/05/02 Handle NULL properly in SqlBytes.SetLength +// 91128 JXF 10/17/01 Make SqlBytes not unsafe +// +// 04/20/01 JunFang Created. +// +// @EndHeader@ +//************************************************************************** namespace System.Data.SqlTypes { using System; diff --git a/System.Data/System/Data/SQLTypes/SQLChars.cs b/System.Data/System/Data/SQLTypes/SQLChars.cs index 4fc5106f1..0bd0bd5d0 100644 --- a/System.Data/System/Data/SQLTypes/SQLChars.cs +++ b/System.Data/System/Data/SQLTypes/SQLChars.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** @@ -28,16 +28,16 @@ // 112296 AZA 07/06/02 Seal SqlAccess classes. // 107151 AZA 04/18/02 Track byte array buffer as well as SqlBytes in // sqlaccess. -// 107216 JXF 04/17/02 - - - - - - - - - +// 107216 JXF 04/17/02 Bug 514927 +// 106854 JXF 04/15/02 Fix http suites due to SqlChars +// 106448 JXF 04/12/02 Bugs on sqlchars +// 105715 JXF 04/05/02 Handle NULL properly in SqlBytes.SetLength +// 91128 JXF 10/17/01 Make SqlBytes not unsafe +// +// 04/20/01 JunFang Created. +// +// @EndHeader@ +//************************************************************************** namespace System.Data.SqlTypes { diff --git a/System.Data/System/Data/SQLTypes/SQLDateTime.cs b/System.Data/System/Data/SQLTypes/SQLDateTime.cs index 32695a2d2..6217081b9 100644 --- a/System.Data/System/Data/SQLTypes/SQLDateTime.cs +++ b/System.Data/System/Data/SQLTypes/SQLDateTime.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** @@ -198,9 +198,9 @@ internal SqlDateTime(double dblVal) { // ISSUE: Is this code reachable? For this code to be reached there // must be a value for dblVal such that: // dblVal - (long)dblVal = 1.0 - // This seems odd, but there was a - - + // This seems odd, but there was a bug (51261) that resulted because + // there was a negative value for dblVal such that dblVal + 1.0 = 1.0 + // day ++; time -= SQLTicksPerDay; } diff --git a/System.Data/System/Data/SQLTypes/SQLDecimal.cs b/System.Data/System/Data/SQLTypes/SQLDecimal.cs index 29c4f869a..a992e479e 100644 --- a/System.Data/System/Data/SQLTypes/SQLDecimal.cs +++ b/System.Data/System/Data/SQLTypes/SQLDecimal.cs @@ -3,9 +3,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLDouble.cs b/System.Data/System/Data/SQLTypes/SQLDouble.cs index 5e25a2fc0..3aace9925 100644 --- a/System.Data/System/Data/SQLTypes/SQLDouble.cs +++ b/System.Data/System/Data/SQLTypes/SQLDouble.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLFileStream.cs b/System.Data/System/Data/SQLTypes/SQLFileStream.cs index fac7abf4d..3491985f9 100644 --- a/System.Data/System/Data/SQLTypes/SQLFileStream.cs +++ b/System.Data/System/Data/SQLTypes/SQLFileStream.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -550,8 +550,8 @@ System.IO.FileAccess access if (pathTooLong) { // SQLBUVSTS bugs 192677 and 203422: currently, FileIOPermission does not support path longer than MAX_PATH (260) - // so we cannot demand permissions for long files. We are going to open - + // so we cannot demand permissions for long files. We are going to open bug for FileIOPermission to + // support this. // In the meanwhile, we agreed to have try-catch block on the permission demand instead of checking the path length. // This way, if/when the 260-chars limitation is fixed in FileIOPermission, we will not need to change our code diff --git a/System.Data/System/Data/SQLTypes/SQLGuid.cs b/System.Data/System/Data/SQLTypes/SQLGuid.cs index 5db792cd7..46e62e844 100644 --- a/System.Data/System/Data/SQLTypes/SQLGuid.cs +++ b/System.Data/System/Data/SQLTypes/SQLGuid.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLInt16.cs b/System.Data/System/Data/SQLTypes/SQLInt16.cs index c4eb46df4..276862274 100644 --- a/System.Data/System/Data/SQLTypes/SQLInt16.cs +++ b/System.Data/System/Data/SQLTypes/SQLInt16.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLInt32.cs b/System.Data/System/Data/SQLTypes/SQLInt32.cs index 01ace91dc..70667a2d6 100644 --- a/System.Data/System/Data/SQLTypes/SQLInt32.cs +++ b/System.Data/System/Data/SQLTypes/SQLInt32.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLInt64.cs b/System.Data/System/Data/SQLTypes/SQLInt64.cs index 31b03d704..523433c9b 100644 --- a/System.Data/System/Data/SQLTypes/SQLInt64.cs +++ b/System.Data/System/Data/SQLTypes/SQLInt64.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLMoney.cs b/System.Data/System/Data/SQLTypes/SQLMoney.cs index 37ad68576..e64f46118 100644 --- a/System.Data/System/Data/SQLTypes/SQLMoney.cs +++ b/System.Data/System/Data/SQLTypes/SQLMoney.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLResource.cs b/System.Data/System/Data/SQLTypes/SQLResource.cs index 3ce29437d..679bc8ff8 100644 --- a/System.Data/System/Data/SQLTypes/SQLResource.cs +++ b/System.Data/System/Data/SQLTypes/SQLResource.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLSingle.cs b/System.Data/System/Data/SQLTypes/SQLSingle.cs index 124a7fe13..5e7aa6869 100644 --- a/System.Data/System/Data/SQLTypes/SQLSingle.cs +++ b/System.Data/System/Data/SQLTypes/SQLSingle.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLString.cs b/System.Data/System/Data/SQLTypes/SQLString.cs index be82ca477..4bc110c4c 100644 --- a/System.Data/System/Data/SQLTypes/SQLString.cs +++ b/System.Data/System/Data/SQLTypes/SQLString.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SQLUtility.cs b/System.Data/System/Data/SQLTypes/SQLUtility.cs index 253b85477..5a8e64811 100644 --- a/System.Data/System/Data/SQLTypes/SQLUtility.cs +++ b/System.Data/System/Data/SQLTypes/SQLUtility.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SqlCharStream.cs b/System.Data/System/Data/SQLTypes/SqlCharStream.cs index e270bc00b..3d77065fc 100644 --- a/System.Data/System/Data/SQLTypes/SqlCharStream.cs +++ b/System.Data/System/Data/SQLTypes/SqlCharStream.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // junfang -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** diff --git a/System.Data/System/Data/SQLTypes/SqlTypesSchemaImporter.cs b/System.Data/System/Data/SQLTypes/SqlTypesSchemaImporter.cs index 6b390b537..0d65de3b2 100644 --- a/System.Data/System/Data/SQLTypes/SqlTypesSchemaImporter.cs +++ b/System.Data/System/Data/SQLTypes/SqlTypesSchemaImporter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // dondu -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/SQLTypes/SqlXml.cs b/System.Data/System/Data/SQLTypes/SqlXml.cs index 9509cd625..d05ed2c80 100644 --- a/System.Data/System/Data/SQLTypes/SqlXml.cs +++ b/System.Data/System/Data/SQLTypes/SqlXml.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //************************************************************************** @@ -114,8 +114,8 @@ internal static XmlReader CreateSqlXmlReader(Stream stream, bool closeInput = fa try { return sqlReaderDelegate(stream, settingsToUse, null); } - // Dev11 - + // Dev11 Bug #315513: Exception type breaking change from 4.0 RTM when calling GetChars on null xml + // For particular callers, we need to wrap all exceptions inside a TargetInvocationException to simulate calling CreateSqlReader via MethodInfo.Invoke catch (Exception ex) { if ((!throwTargetInvocationExceptions) || (!ADP.IsCatchableExceptionType(ex))) { throw; @@ -244,9 +244,9 @@ void IXmlSerializable.WriteXml(XmlWriter writer) } else { - // VSTFDevDiv - - + // VSTFDevDiv Bug 197567 - [SqlXml Column Read from SQL Server 2005 Fails to XML Serialize (writes raw binary)] + // Instead of the WriteRaw use the WriteNode. As Tds sends a binary stream - Create a XmlReader to convert + // get the Xml string value from the binary and call WriteNode to pass that out to the XmlWriter. XmlReader reader = this.CreateReader(); if (reader.ReadState == ReadState.Initial) reader.Read(); diff --git a/System.Data/System/Data/SQLTypes/UnsafeNativeMethods.cs b/System.Data/System/Data/SQLTypes/UnsafeNativeMethods.cs index 7c847edac..c16394814 100644 --- a/System.Data/System/Data/SQLTypes/UnsafeNativeMethods.cs +++ b/System.Data/System/Data/SQLTypes/UnsafeNativeMethods.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Select.cs b/System.Data/System/Data/Select.cs index f9c8b7066..afac08872 100644 --- a/System.Data/System/Data/Select.cs +++ b/System.Data/System/Data/Select.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -52,7 +52,7 @@ private bool IsSupportedOperator(int op) { return ((op >= Operators.EqualTo && op <= Operators.LessOrEqual) || op == Operators.Is || op == Operators.IsNot); } - // Microsoft : Gathers all linear expressions in to this.linearExpression and all binary expressions in to their respective candidate columns expressions + // [....] : Gathers all linear expressions in to this.linearExpression and all binary expressions in to their respective candidate columns expressions private void AnalyzeExpression(BinaryNode expr) { if (this.linearExpression == this.expression) return; @@ -355,7 +355,7 @@ private void CreateIndex() { matchedCandidates = 0; if (this.linearExpression != this.expression) { IndexField[] fields = index.IndexFields; - while (matchedCandidates < j) { // Microsoft : j = index.IndexDesc.Length + while (matchedCandidates < j) { // [....] : j = index.IndexDesc.Length ColumnInfo canColumn = candidateColumns[fields[matchedCandidates].Column.Ordinal]; if (canColumn == null || canColumn.expr == null) break; @@ -417,7 +417,7 @@ private void BuildLinearExpression() { } } } -// Debug.Assert(this.linearExpression != null, "BuildLinearExpression : How come there is nothing to search linearly"); +// Debug.Assert(this.linearExpression != null, "BuildLinearExpression : How come there is nothing to search linearly"); bug 97446 } public DataRow[] SelectRows() { @@ -459,7 +459,7 @@ public DataRow[] SelectRows() { return table.NewRowArray(0); Range range; - if (matchedCandidates == 0) { // Microsoft : Either dont have rowFilter or only linear search expression + if (matchedCandidates == 0) { // [....] : Either dont have rowFilter or only linear search expression range = new Range(0, index.RecordCount-1); Debug.Assert(!needSorting, "What are we doing here if no real reuse of this index ?"); this.linearExpression = this.expression; diff --git a/System.Data/System/Data/Selection.cs b/System.Data/System/Data/Selection.cs index 0250a6a1e..6ef2dd1ea 100644 --- a/System.Data/System/Data/Selection.cs +++ b/System.Data/System/Data/Selection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -855,7 +855,7 @@ public void RecordChanged(int oldIndex, int newIndex) { OnListChanged(ListChangedType.ItemAdded, newIndex, oldIndex); } else if (newIndex == -1) { // its deleted - // Do not fix this. see + // Do not fix this. see bug Bug 271076 for explanation. OnListChanged(ListChangedType.ItemDeleted, oldIndex); } else { diff --git a/System.Data/System/Data/SimpleType.cs b/System.Data/System/Data/SimpleType.cs index e5840ccae..13ecfc5b7 100644 --- a/System.Data/System/Data/SimpleType.cs +++ b/System.Data/System/Data/SimpleType.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -38,7 +38,7 @@ internal sealed class SimpleType : ISerializable { string maxInclusive = ""; string minExclusive = ""; string minInclusive = ""; - //REMOVED: encoding due to Microsoft 2001 XDS changes + //REMOVED: encoding due to [....] 2001 XDS changes // internal string enumeration = ""; @@ -267,7 +267,7 @@ internal XmlNode ToNode(XmlDocument dc, Hashtable prefixes, bool inRemoting) { type.SetAttribute(Keywords.BASE, baseSimpleType.Name); } } - else { // Microsoft + else { // [....] type.SetAttribute(Keywords.BASE, baseSimpleType.Name); } } @@ -290,48 +290,48 @@ internal XmlNode ToNode(XmlDocument dc, Hashtable prefixes, bool inRemoting) { constraint.SetAttribute(Keywords.VALUE, maxLength.ToString(CultureInfo.InvariantCulture)); type.AppendChild(constraint); } -/* // removed due to MDAC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +/* // removed due to MDAC bug 83892 + // will be reactivated in whidbey with the proper handling + if (pattern != null && pattern.Length > 0) { + constraint = dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_PATTERN, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, pattern); + type.AppendChild(constraint); + } + if (minLength >= 0) { + constraint = dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_MINLENGTH, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, minLength.ToString()); + type.AppendChild(constraint); + } + if (minInclusive != null && minInclusive.Length > 0) { + constraint = dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_MININCLUSIVE, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, minInclusive); + type.AppendChild(constraint); + } + if (minExclusive != null && minExclusive.Length > 0) { + constraint =dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_MINEXCLUSIVE, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, minExclusive); + type.AppendChild(constraint); + } + if (maxInclusive != null && maxInclusive.Length > 0) { + constraint =dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_MAXINCLUSIVE, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, maxInclusive); + type.AppendChild(constraint); + } + if (maxExclusive != null && maxExclusive.Length > 0) { + constraint = dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_MAXEXCLUSIVE, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, maxExclusive); + type.AppendChild(constraint); + } + if (enumeration.Length > 0) { + string[] list = enumeration.TrimEnd(null).Split(null); -*/ + for (int i = 0; i < list.Length; i++) { + constraint = dc.CreateElement(Keywords.XSD_PREFIX, Keywords.XSD_ENUMERATION, Keywords.XSDNS); + constraint.SetAttribute(Keywords.VALUE, list[i]); + type.AppendChild(constraint); + } + } + */ typeNode.AppendChild(type); return typeNode; } diff --git a/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs b/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs index e8a2f8f82..4d76cab09 100644 --- a/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs +++ b/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Sql { diff --git a/System.Data/System/Data/Sql/SqlFacetAttribute.cs b/System.Data/System/Data/Sql/SqlFacetAttribute.cs index 0d3fc92f4..7b56e9852 100644 --- a/System.Data/System/Data/Sql/SqlFacetAttribute.cs +++ b/System.Data/System/Data/Sql/SqlFacetAttribute.cs @@ -3,12 +3,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/SqlFunctionAttribute.cs b/System.Data/System/Data/Sql/SqlFunctionAttribute.cs index c11a8f4ca..b1af7c807 100644 --- a/System.Data/System/Data/Sql/SqlFunctionAttribute.cs +++ b/System.Data/System/Data/Sql/SqlFunctionAttribute.cs @@ -3,12 +3,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/SqlGenericUtil.cs b/System.Data/System/Data/Sql/SqlGenericUtil.cs index e5a3b3907..db01b7ad5 100644 --- a/System.Data/System/Data/Sql/SqlGenericUtil.cs +++ b/System.Data/System/Data/Sql/SqlGenericUtil.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Sql { diff --git a/System.Data/System/Data/Sql/SqlMetaData.cs b/System.Data/System/Data/Sql/SqlMetaData.cs index fc3b3a7dc..d17f8b723 100644 --- a/System.Data/System/Data/Sql/SqlMetaData.cs +++ b/System.Data/System/Data/Sql/SqlMetaData.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { @@ -1621,7 +1621,7 @@ private void SetDefaultsForType( SqlDbType dbType ) new SqlMetaData("nvarchar", SqlDbType.NVarChar, x_lServerMaxUnicode, 0, 0, 0, x_eDefaultStringCompareOptions, false), // Placeholder for value 28 new SqlMetaData("udt", SqlDbType.Udt, - 0, 0, 0, 0, SqlCompareOptions.None, false), // SqlDbType.Udt = 29 + 0, 0, 0, 0, SqlCompareOptions.None, false), // SqlDbType.Udt = 29 Bug Fix: 302698 new SqlMetaData("table", SqlDbType.Structured, 0, 0, 0, 0, SqlCompareOptions.None, false), // SqlDbType.Structured new SqlMetaData("date", SqlDbType.Date, diff --git a/System.Data/System/Data/Sql/SqlMethodAttribute.cs b/System.Data/System/Data/Sql/SqlMethodAttribute.cs index 3203b1748..66eee2f72 100644 --- a/System.Data/System/Data/Sql/SqlMethodAttribute.cs +++ b/System.Data/System/Data/Sql/SqlMethodAttribute.cs @@ -3,13 +3,13 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims // junfang -// Microsoft +// [....] // vadimt //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/SqlNotificationRequest.cs b/System.Data/System/Data/Sql/SqlNotificationRequest.cs index 986d8f5d6..9b5149d52 100644 --- a/System.Data/System/Data/Sql/SqlNotificationRequest.cs +++ b/System.Data/System/Data/Sql/SqlNotificationRequest.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.Sql { diff --git a/System.Data/System/Data/Sql/SqlProcedureAttribute.cs b/System.Data/System/Data/Sql/SqlProcedureAttribute.cs index c88caeaea..8f28089cb 100644 --- a/System.Data/System/Data/Sql/SqlProcedureAttribute.cs +++ b/System.Data/System/Data/Sql/SqlProcedureAttribute.cs @@ -3,12 +3,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/SqlTriggerAttribute.cs b/System.Data/System/Data/Sql/SqlTriggerAttribute.cs index 303687749..dbb72b83d 100644 --- a/System.Data/System/Data/Sql/SqlTriggerAttribute.cs +++ b/System.Data/System/Data/Sql/SqlTriggerAttribute.cs @@ -3,12 +3,12 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs b/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs index f7c1307fd..56ba4a976 100644 --- a/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs +++ b/System.Data/System/Data/Sql/SqlUserDefinedAggregateAttribute.cs @@ -3,15 +3,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt // venkar -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs b/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs index 8dddb2200..2684b82fe 100644 --- a/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs +++ b/System.Data/System/Data/Sql/SqlUserDefinedTypeAttribute.cs @@ -3,15 +3,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt // venkar -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/System/Data/Sql/invalidudtexception.cs b/System.Data/System/Data/Sql/invalidudtexception.cs index 527832fdb..56efbc86f 100644 --- a/System.Data/System/Data/Sql/invalidudtexception.cs +++ b/System.Data/System/Data/Sql/invalidudtexception.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/Sql/sqlnorm.cs b/System.Data/System/Data/Sql/sqlnorm.cs index e27d86b3f..2be7f1237 100644 --- a/System.Data/System/Data/Sql/sqlnorm.cs +++ b/System.Data/System/Data/Sql/sqlnorm.cs @@ -3,14 +3,14 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt -// Microsoft +// [....] // venkar //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/Sql/sqlser.cs b/System.Data/System/Data/Sql/sqlser.cs index e4a1cada1..579818e6e 100644 --- a/System.Data/System/Data/Sql/sqlser.cs +++ b/System.Data/System/Data/Sql/sqlser.cs @@ -3,15 +3,15 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] // daltudov -// Microsoft +// [....] // beysims -// Microsoft +// [....] // vadimt // venkar -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/SqlClient/RowsCopiedEventArgs.cs b/System.Data/System/Data/SqlClient/RowsCopiedEventArgs.cs index cc294b157..0a93882a2 100644 --- a/System.Data/System/Data/SqlClient/RowsCopiedEventArgs.cs +++ b/System.Data/System/Data/SqlClient/RowsCopiedEventArgs.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlBuffer.cs b/System.Data/System/Data/SqlClient/SqlBuffer.cs index 9c4084086..f4dce919c 100644 --- a/System.Data/System/Data/SqlClient/SqlBuffer.cs +++ b/System.Data/System/Data/SqlClient/SqlBuffer.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlBulkCopy.cs b/System.Data/System/Data/SqlClient/SqlBulkCopy.cs index cd3484f13..2a4b96c02 100644 --- a/System.Data/System/Data/SqlClient/SqlBulkCopy.cs +++ b/System.Data/System/Data/SqlClient/SqlBulkCopy.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ // todo list: @@ -531,7 +531,7 @@ private string CreateInitialQuery() { } // Creates and then executes initial query to get information about the targettable - // When __isAsyncBulkCopy == false (i.e. it is Sync copy): out result contains the resulset. Returns null. + // When __isAsyncBulkCopy == false (i.e. it is [....] copy): out result contains the resulset. Returns null. // When __isAsyncBulkCopy == true (i.e. it is Async copy): This still uses the _parser.Run method synchronously and return Task. // We need to have a _parser.RunAsync to make it real async. private Task CreateAndExecuteInitialQueryAsync(out BulkCopySimpleResultSet result) { @@ -775,7 +775,8 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i SqlBulkCopyOptions.KeepNulls | SqlBulkCopyOptions.TableLock | SqlBulkCopyOptions.CheckConstraints - | SqlBulkCopyOptions.FireTriggers)) != SqlBulkCopyOptions.Default) { + | SqlBulkCopyOptions.FireTriggers + | SqlBulkCopyOptions.AllowEncryptedValueModifications)) != SqlBulkCopyOptions.Default) { bool addSeparator = false; // insert a comma character if multiple options in list ... updateBulkCommandText.Append(" with ("); if(IsCopyOption(SqlBulkCopyOptions.KeepNulls)) { @@ -794,6 +795,10 @@ private string AnalyzeTargetAndCreateUpdateBulkCommand(BulkCopySimpleResultSet i updateBulkCommandText.Append((addSeparator ? ", " : "") + "FIRE_TRIGGERS"); addSeparator = true; } + if(IsCopyOption(SqlBulkCopyOptions.AllowEncryptedValueModifications)) { + updateBulkCommandText.Append((addSeparator ? ", " : "") + "ALLOW_ENCRYPTED_VALUE_MODIFICATIONS"); + addSeparator = true; + } updateBulkCommandText.Append(")"); } return (updateBulkCommandText.ToString()); @@ -1062,7 +1067,7 @@ private object GetValueFromSourceRow(int destRowIndex, out bool isSqlType, out b // unified method to read a row from the current rowsource // When _isAsyncBulkCopy == true (i.e. async copy): returns Task when IDataReader is a DbDataReader, Null for others. - // When _isAsyncBulkCopy == false (i.e. sync copy): returns null. Uses ReadFromRowSource to get the boolean value. + // When _isAsyncBulkCopy == false (i.e. [....] copy): returns null. Uses ReadFromRowSource to get the boolean value. // "more" -- should be used by the caller only when the return value is null. private Task ReadFromRowSourceAsync(CancellationToken cts) { #if !PROJECTK @@ -1437,15 +1442,15 @@ private object ConvertValue(object value, _SqlMetaData metadata, bool isNull, re value = SqlParameter.CoerceValue(value, mt, out coercedToDataFeed, out typeChanged, false); // Convert Source Decimal Percision and Scale to Destination Percision and Scale - // Fix - - - - - - - - + // Fix Bug: 385971 sql decimal data could get corrupted on insert if the scale of + // the source and destination weren't the same. The BCP protocal, specifies the + // scale of the incoming data in the insert statement, we just tell the server we + // are inserting the same scale back. This then created a bug inside the BCP opperation + // if the scales didn't match. The fix is to do the same thing that SQL Paramater does, + // and adjust the scale before writing. In Orcas is scale adjustment should be removed from + // SqlParamater and SqlBulkCopy and Isoloated inside SqlParamater.CoerceValue, but becouse of + // where we are in the cycle, the changes must be kept at minimum, so I'm just bringing the + // code over to SqlBulkCopy. SqlDecimal sqlValue; if ((isSqlType) && (!typeChanged)) { @@ -2076,7 +2081,7 @@ private bool FireRowsCopiedEvent(long rowsCopied) { // Reads a cell and then writes it. // Read may block at this moment since there is no getValueAsync or DownStream async at this moment. // When _isAsyncBulkCopy == true: Write will return Task (when async method runs asynchronously) or Null (when async call actually ran synchronously) for performance. - // When _isAsyncBulkCopy == false: Writes are purely sync. This method reutrn null at the end. + // When _isAsyncBulkCopy == false: Writes are purely [....]. This method reutrn null at the end. // private Task ReadWriteColumnValueAsync(int col) { bool isSqlType; @@ -2387,7 +2392,7 @@ private Task CopyBatchesAsync(BulkCopySimpleResultSet internalResults, string up AsyncHelper.ContinueTask(commandTask, source, () => { Task continuedTask = CopyBatchesAsyncContinued(internalResults, updateBulkCommandText, cts, source); if (continuedTask == null) { - // Continuation finished sync, recall into CopyBatchesAsync to continue + // Continuation finished [....], recall into CopyBatchesAsync to continue CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source); } }, _connection.GetOpenTdsConnection()); @@ -2438,7 +2443,7 @@ private Task CopyBatchesAsyncContinued(BulkCopySimpleResultSet internalResults, AsyncHelper.ContinueTask(task, source, () => { Task continuedTask = CopyBatchesAsyncContinuedOnSuccess(internalResults, updateBulkCommandText, cts, source); if (continuedTask == null) { - // Continuation finished sync, recall into CopyBatchesAsync to continue + // Continuation finished [....], recall into CopyBatchesAsync to continue CopyBatchesAsync(internalResults, updateBulkCommandText, cts, source); } }, _connection.GetOpenTdsConnection(), _ => CopyBatchesAsyncContinuedOnError(cleanupParser: false), () => CopyBatchesAsyncContinuedOnError(cleanupParser: true)); @@ -2581,7 +2586,7 @@ private void CleanUpStateObjectOnError() { // The continuation part of WriteToServerInternalRest. Executes when the initial query task is completed. (see, WriteToServerInternalRest). // It carries on the source which is passed from the WriteToServerInternalRest and performs SetResult when the entire copy is done. - // The carried on source may be null in case of Sync copy. So no need to SetResult at that time. + // The carried on source may be null in case of [....] copy. So no need to SetResult at that time. // It launches the copy operation. // private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet internalResults, CancellationToken cts, TaskCompletionSource source) { @@ -2678,7 +2683,7 @@ private void WriteToServerInternalRestContinuedAsync(BulkCopySimpleResultSet int // Rest of the WriteToServerInternalAsync method. // It carries on the source from its caller WriteToServerInternal. - // source is null in case of Sync bcp. But valid in case of Async bcp. + // source is null in case of [....] bcp. But valid in case of Async bcp. // It calls the WriteToServerInternalRestContinuedAsync as a continuation of the initial query task. // private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletionSource source) { @@ -2788,7 +2793,7 @@ private void WriteToServerInternalRestAsync(CancellationToken cts, TaskCompletio } } - // This returns Task for Async, Null for Sync + // This returns Task for Async, Null for [....] // private Task WriteToServerInternalAsync(CancellationToken ctoken) { TaskCompletionSource source = null; diff --git a/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMapping.cs b/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMapping.cs index 16b85f3a2..d4166c2d9 100644 --- a/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMapping.cs +++ b/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMapping.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ // Todo: rename the file diff --git a/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMappingCollection.cs b/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMappingCollection.cs index d11c23c8c..ac37a1d92 100644 --- a/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMappingCollection.cs +++ b/System.Data/System/Data/SqlClient/SqlBulkCopyColumnMappingCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ // todo: rename the file diff --git a/System.Data/System/Data/SqlClient/SqlBulkCopyOptions.cs b/System.Data/System/Data/SqlClient/SqlBulkCopyOptions.cs index 62baf0f81..00d01449c 100644 --- a/System.Data/System/Data/SqlClient/SqlBulkCopyOptions.cs +++ b/System.Data/System/Data/SqlClient/SqlBulkCopyOptions.cs @@ -17,6 +17,7 @@ public enum SqlBulkCopyOptions { KeepNulls = 1 << 3, FireTriggers = 1 << 4, UseInternalTransaction = 1 << 5, + AllowEncryptedValueModifications = 1 << 6, } } diff --git a/System.Data/System/Data/SqlClient/SqlCachedBuffer.cs b/System.Data/System/Data/SqlClient/SqlCachedBuffer.cs index ded56bee7..5e5e2c22d 100644 --- a/System.Data/System/Data/SqlClient/SqlCachedBuffer.cs +++ b/System.Data/System/Data/SqlClient/SqlCachedBuffer.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlClientFactory.cs b/System.Data/System/Data/SqlClient/SqlClientFactory.cs index 4763dd80d..b42193a80 100644 --- a/System.Data/System/Data/SqlClient/SqlClientFactory.cs +++ b/System.Data/System/Data/SqlClient/SqlClientFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs b/System.Data/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs index 01530e81b..46d0f0da5 100644 --- a/System.Data/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs +++ b/System.Data/System/Data/SqlClient/SqlClientMetaDataCollectionNames.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient{ diff --git a/System.Data/System/Data/SqlClient/SqlClientPermission.cs b/System.Data/System/Data/SqlClient/SqlClientPermission.cs index 695b9adad..d668f1169 100644 --- a/System.Data/System/Data/SqlClient/SqlClientPermission.cs +++ b/System.Data/System/Data/SqlClient/SqlClientPermission.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStream.cs b/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStream.cs index 32ef810a4..e4e984da9 100644 --- a/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStream.cs +++ b/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStream.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStreamChars.cs b/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStreamChars.cs index 1818a2e0c..f5ae0f3df 100644 --- a/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStreamChars.cs +++ b/System.Data/System/Data/SqlClient/SqlClientWrapperSmiStreamChars.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace Microsoft.SqlServer.Server { diff --git a/System.Data/System/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs index 44357a9b3..a81efb199 100644 --- a/System.Data/System/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs +++ b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.cs @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// +// // Copyright (c) Microsoft Corporation. All rights reserved. // // balnee @@ -19,7 +19,7 @@ namespace System.Data.SqlClient /// /// Certificate Key Store Provider class /// - sealed public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKeyStoreProvider + public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncryptionKeyStoreProvider { // Constants // @@ -27,14 +27,14 @@ sealed public class SqlColumnEncryptionCertificateStoreProvider : SqlColumnEncry // Certificate provider name (CertificateStore) dont need to be localized. /// - /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys. + /// Name for the certificate key store provider. /// - internal const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP"; + public const string ProviderName = @"MSSQL_CERTIFICATE_STORE"; /// - /// Name for the certificate key store provider. + /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys. /// - internal const string ProviderName = @"MSSQL_CERTIFICATE_STORE"; + internal const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP"; /// /// LocalMachine certificate store location. Valid certificate locations are LocalMachine and CurrentUser. @@ -131,6 +131,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e } // Validate the signature length + // Signature length should be same as the key side for RSA PKCSv1.5 int signatureLength = encryptedColumnEncryptionKey.Length - currentIndex - cipherTextLength; if (signatureLength != keySizeInBytes) { @@ -139,7 +140,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e // Get ciphertext byte[] cipherText = new byte[cipherTextLength]; - Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherTextLength); + Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherText.Length); currentIndex += cipherTextLength; // Get signature diff --git a/System.Data/System/Data/SqlClient/SqlColumnEncryptionCngProvider.cs b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCngProvider.cs new file mode 100644 index 000000000..aa4561ab3 --- /dev/null +++ b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCngProvider.cs @@ -0,0 +1,414 @@ +//------------------------------------------------------------------------------ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// balnee +// krishnib +//------------------------------------------------------------------------------ +namespace System.Data.SqlClient +{ + using System; + using System.Text; + using System.Data.Common; + using System.Diagnostics; + using System.Globalization; + using System.Security; + using System.Security.Cryptography; + + /// + /// Provides implementation similar to certificate store provider. + /// A CEK encrypted with certificate provider should be decryptable by this provider and vice versa. + /// + /// Envolope Format for the encrypted column encryption key + /// version + keyPathLength + ciphertextLength + keyPath + ciphertext + signature + /// version: A single byte indicating the format version. + /// keyPathLength: Length of the keyPath. + /// ciphertextLength: ciphertext length + /// keyPath: keyPath used to encrypt the column encryption key. This is only used for troubleshooting purposes and is not verified during decryption. + /// ciphertext: Encrypted column encryption key + /// signature: Signature of the entire byte array. Signature is validated before decrypting the column encryption key. + /// + public class SqlColumnEncryptionCngProvider : SqlColumnEncryptionKeyStoreProvider + { + /// + /// Name for the CNG key store provider. + /// + public const string ProviderName = @"MSSQL_CNG_STORE"; + + /// + /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys using this provider. + /// For now, we are keeping all the providers in [....]. + /// + private const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP"; + + /// + /// Algorithm version + /// + private readonly byte[] _version = new byte[] { 0x01 }; + + /// + /// This function uses the asymmetric key specified by the key path + /// and decrypts an encrypted CEK with RSA encryption algorithm. + /// + /// Complete path of an asymmetric key in CNG + /// Asymmetric Key Encryption Algorithm + /// Encrypted Column Encryption Key + /// Plain text column encryption key + public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) + { + // Validate the input parameters + ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: true); + + if (null == encryptedColumnEncryptionKey) + { + throw SQL.NullEncryptedColumnEncryptionKey(); + } + + if (0 == encryptedColumnEncryptionKey.Length) + { + throw SQL.EmptyEncryptedColumnEncryptionKey(); + } + + // Validate encryptionAlgorithm + ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: true); + + // Create RSA Provider with the given CNG name and key name + RSACng rsaCngProvider = CreateRSACngProvider(masterKeyPath, isSystemOp: true); + + // Validate whether the key is RSA one or not and then get the key size + int keySizeInBytes = GetKeySize(rsaCngProvider); + + // Validate and decrypt the EncryptedColumnEncryptionKey + // Format is + // version + keyPathLength + ciphertextLength + keyPath + ciphervtext + signature + // + // keyPath is present in the encrypted column encryption key for identifying the original source of the asymmetric key pair and + // we will not validate it against the data contained in the CMK metadata (masterKeyPath). + + // Validate the version byte + if (encryptedColumnEncryptionKey[0] != _version[0]) + { + throw SQL.InvalidAlgorithmVersionInEncryptedCEK(encryptedColumnEncryptionKey[0], _version[0]); + } + + // Get key path length + int currentIndex = _version.Length; + UInt16 keyPathLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex); + currentIndex += sizeof(UInt16); + + // Get ciphertext length + UInt16 cipherTextLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex); + currentIndex += sizeof(UInt16); + + // Skip KeyPath + // KeyPath exists only for troubleshooting purposes and doesnt need validation. + currentIndex += keyPathLength; + + // validate the ciphertext length + if (cipherTextLength != keySizeInBytes) + { + throw SQL.InvalidCiphertextLengthInEncryptedCEKCng(cipherTextLength, keySizeInBytes, masterKeyPath); + } + + // Validate the signature length + // Signature length should be same as the key side for RSA PKCSv1.5 + int signatureLength = encryptedColumnEncryptionKey.Length - currentIndex - cipherTextLength; + if (signatureLength != keySizeInBytes) + { + throw SQL.InvalidSignatureInEncryptedCEKCng(signatureLength, keySizeInBytes, masterKeyPath); + } + + // Get ciphertext + byte[] cipherText = new byte[cipherTextLength]; + Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherText.Length); + currentIndex += cipherTextLength; + + // Get signature + byte[] signature = new byte[signatureLength]; + Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, signature, 0, signature.Length); + + // Compute the hash to validate the signature + byte[] hash; + using (SHA256Cng sha256 = new SHA256Cng()) + { + sha256.TransformFinalBlock(encryptedColumnEncryptionKey, 0, encryptedColumnEncryptionKey.Length - signature.Length); + hash = sha256.Hash; + } + + Debug.Assert(hash != null, @"hash should not be null while decrypting encrypted column encryption key."); + + // Validate the signature + if (!RSAVerifySignature(hash, signature, rsaCngProvider)) + { + throw SQL.InvalidSignature(masterKeyPath); + } + + // Decrypt the CEK + return RSADecrypt(rsaCngProvider, cipherText); + } + + /// + /// This function uses the asymmetric key specified by the key path + /// and encrypts CEK with RSA encryption algorithm. + /// + /// Complete path of an asymmetric key in AKV + /// Asymmetric Key Encryption Algorithm + /// Plain text column encryption key + /// Encrypted column encryption key + public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) + { + // Validate the input parameters + ValidateNonEmptyKeyPath(masterKeyPath, isSystemOp: false); + + if (null == columnEncryptionKey) + { + throw SQL.NullColumnEncryptionKey(); + } + else if (0 == columnEncryptionKey.Length) + { + throw SQL.EmptyColumnEncryptionKey(); + } + + // Validate encryptionAlgorithm + ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: false); + + // CreateCNGProviderWithKey + RSACng rsaCngProvider = CreateRSACngProvider(masterKeyPath, isSystemOp: false); + + // Validate whether the key is RSA one or not and then get the key size + int keySizeInBytes = GetKeySize(rsaCngProvider); + + // Construct the encryptedColumnEncryptionKey + // Format is + // version + keyPathLength + ciphertextLength + ciphertext + keyPath + signature + // + // We currently only support one version + byte[] version = new byte[] { _version[0] }; + + // Get the Unicode encoded bytes of cultureinvariant lower case masterKeyPath + byte[] masterKeyPathBytes = Encoding.Unicode.GetBytes(masterKeyPath.ToLowerInvariant()); + byte[] keyPathLength = BitConverter.GetBytes((Int16)masterKeyPathBytes.Length); + + // Encrypt the plain text + byte[] cipherText = RSAEncrypt(rsaCngProvider, columnEncryptionKey); + byte[] cipherTextLength = BitConverter.GetBytes((Int16)cipherText.Length); + Debug.Assert(cipherText.Length == keySizeInBytes, @"cipherText length does not match the RSA key size"); + + // Compute hash + // SHA-2-256(version + keyPathLength + ciphertextLength + keyPath + ciphertext) + byte[] hash; + using (SHA256Cng sha256 = new SHA256Cng()) + { + sha256.TransformBlock(version, 0, version.Length, version, 0); + sha256.TransformBlock(keyPathLength, 0, keyPathLength.Length, keyPathLength, 0); + sha256.TransformBlock(cipherTextLength, 0, cipherTextLength.Length, cipherTextLength, 0); + sha256.TransformBlock(masterKeyPathBytes, 0, masterKeyPathBytes.Length, masterKeyPathBytes, 0); + sha256.TransformFinalBlock(cipherText, 0, cipherText.Length); + hash = sha256.Hash; + } + + // Sign the hash + byte[] signedHash = RSASignHashedData(hash, rsaCngProvider); + Debug.Assert(signedHash.Length == keySizeInBytes, @"signed hash length does not match the RSA key size"); + Debug.Assert(RSAVerifySignature(hash, signedHash, rsaCngProvider), @"Invalid signature of the encrypted column encryption key computed."); + + // Construct the encrypted column encryption key + // EncryptedColumnEncryptionKey = version + keyPathLength + ciphertextLength + keyPath + ciphertext + signature + int encryptedColumnEncryptionKeyLength = version.Length + cipherTextLength.Length + keyPathLength.Length + cipherText.Length + masterKeyPathBytes.Length + signedHash.Length; + byte[] encryptedColumnEncryptionKey = new byte[encryptedColumnEncryptionKeyLength]; + + // Copy version byte + int currentIndex = 0; + Buffer.BlockCopy(version, 0, encryptedColumnEncryptionKey, currentIndex, version.Length); + currentIndex += version.Length; + + // Copy key path length + Buffer.BlockCopy(keyPathLength, 0, encryptedColumnEncryptionKey, currentIndex, keyPathLength.Length); + currentIndex += keyPathLength.Length; + + // Copy ciphertext length + Buffer.BlockCopy(cipherTextLength, 0, encryptedColumnEncryptionKey, currentIndex, cipherTextLength.Length); + currentIndex += cipherTextLength.Length; + + // Copy key path + Buffer.BlockCopy(masterKeyPathBytes, 0, encryptedColumnEncryptionKey, currentIndex, masterKeyPathBytes.Length); + currentIndex += masterKeyPathBytes.Length; + + // Copy ciphertext + Buffer.BlockCopy(cipherText, 0, encryptedColumnEncryptionKey, currentIndex, cipherText.Length); + currentIndex += cipherText.Length; + + // copy the signature + Buffer.BlockCopy(signedHash, 0, encryptedColumnEncryptionKey, currentIndex, signedHash.Length); + + return encryptedColumnEncryptionKey; + } + + /// + /// This function validates that the encryption algorithm is RSA_OAEP and if it is not, + /// then throws an exception + /// + /// Asymmetric key encryptio algorithm + /// Indicates if ADO.NET calls or the customer calls the API + private void ValidateEncryptionAlgorithm(string encryptionAlgorithm, bool isSystemOp) + { + // This validates that the encryption algorithm is RSA_OAEP + if (null == encryptionAlgorithm) + { + throw SQL.NullKeyEncryptionAlgorithm(isSystemOp); + } + + if (!string.Equals(encryptionAlgorithm, RSAEncryptionAlgorithmWithOAEP, StringComparison.OrdinalIgnoreCase)) + { + throw SQL.InvalidKeyEncryptionAlgorithm(encryptionAlgorithm, RSAEncryptionAlgorithmWithOAEP, isSystemOp); + } + } + + /// + /// Checks if the CNG key path is Empty or Null (and raises exception if they are). + /// + /// keypath containing the CNG provider name and key name + /// Indicates if ADO.NET calls or the customer calls the API + private void ValidateNonEmptyKeyPath(string masterKeyPath, bool isSystemOp) + { + if (string.IsNullOrWhiteSpace(masterKeyPath)) + { + if (null == masterKeyPath) + { + throw SQL.NullCngKeyPath(isSystemOp); + } + else + { + throw SQL.InvalidCngPath(masterKeyPath, isSystemOp); + } + } + } + + /// + /// Encrypt the text using specified CNG key. + /// + /// RSA CNG Provider. + /// Plain text Column Encryption Key. + /// Returns an encrypted blob or throws an exception if there are any errors. + private byte[] RSAEncrypt(RSACng rsaCngProvider, byte[] columnEncryptionKey) + { + Debug.Assert(columnEncryptionKey != null); + Debug.Assert(rsaCngProvider != null); + + return rsaCngProvider.Encrypt(columnEncryptionKey, RSAEncryptionPadding.OaepSHA1); + } + + /// + /// Decrypt the text using the specified CNG key. + /// + /// RSA CNG Provider. + /// Encrypted Column Encryption Key. + /// Returns the decrypted plaintext Column Encryption Key or throws an exception if there are any errors. + private byte[] RSADecrypt(RSACng rsaCngProvider, byte[] encryptedColumnEncryptionKey) + { + Debug.Assert((encryptedColumnEncryptionKey != null) && (encryptedColumnEncryptionKey.Length != 0)); + Debug.Assert(rsaCngProvider != null); + + return rsaCngProvider.Decrypt(encryptedColumnEncryptionKey, RSAEncryptionPadding.OaepSHA1); + } + + /// + /// Generates signature based on RSA PKCS#v1.5 scheme using a specified CNG Key. + /// + /// Text to sign. + /// RSA CNG Provider. + /// Signature + private byte[] RSASignHashedData(byte[] dataToSign, RSACng rsaCngProvider) + { + Debug.Assert((dataToSign != null) && (dataToSign.Length != 0)); + Debug.Assert(rsaCngProvider != null); + + return rsaCngProvider.SignData(dataToSign, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); + } + + /// + /// Verifies the given RSA PKCSv1.5 signature. + /// + /// + /// + /// RSA CNG Provider. + /// true if signature is valid, false if it is not valid + private bool RSAVerifySignature(byte[] dataToVerify, byte[] signature, RSACng rsaCngProvider) + { + Debug.Assert((dataToVerify != null) && (dataToVerify.Length != 0)); + Debug.Assert((signature != null) && (signature.Length != 0)); + Debug.Assert(rsaCngProvider != null); + + return rsaCngProvider.VerifyData(dataToVerify, signature, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1); + } + + /// + /// Gets the public Key size in bytes + /// + /// RSA CNG Provider. + /// Key size in bytes + private int GetKeySize(RSACng rsaCngProvider) + { + Debug.Assert(rsaCngProvider != null); + + return rsaCngProvider.KeySize / 8; // Convert from bits to byte + } + + /// + /// Creates a RSACng object from the given keyName + /// + /// + /// Indicates if ADO.NET calls or the customer calls the API + /// + private RSACng CreateRSACngProvider(string keyPath, bool isSystemOp) + { + // Get CNGProvider and the KeyID + string cngProviderName; + string keyIdentifier; + GetCngProviderAndKeyId(keyPath, isSystemOp, out cngProviderName, out keyIdentifier); + + CngProvider cngProvider = new CngProvider(cngProviderName); + CngKey cngKey; + + try + { + cngKey = CngKey.Open(keyIdentifier, cngProvider); + } + catch (CryptographicException) + { + throw SQL.InvalidCngKey(keyPath, cngProviderName, keyIdentifier, isSystemOp); + } + + return new RSACng(cngKey); + } + + /// + /// Extracts the CNG provider and key name from the key path + /// + /// keypath in the format [CNG Provider]\[KeyName] + /// Indicates if ADO.NET calls or the customer calls the API + /// CNG Provider + /// Key identifier inside the CNG provider + private void GetCngProviderAndKeyId(string keyPath, bool isSystemOp, out string cngProvider, out string keyIdentifier) + { + int indexOfSlash = keyPath.IndexOf(@"/"); + if (indexOfSlash == -1) + { + throw SQL.InvalidCngPath(keyPath, isSystemOp); + } + + cngProvider = keyPath.Substring(0, indexOfSlash); + keyIdentifier = keyPath.Substring(indexOfSlash + 1, keyPath.Length - (indexOfSlash + 1)); + + if (cngProvider.Length == 0) + { + throw SQL.EmptyCngName(keyPath, isSystemOp); + } + + if (keyIdentifier.Length == 0) + { + throw SQL.EmptyCngKeyId(keyPath, isSystemOp); + } + } + } +} diff --git a/System.Data/System/Data/SqlClient/SqlColumnEncryptionCspProvider.cs b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCspProvider.cs new file mode 100644 index 000000000..19ac621b3 --- /dev/null +++ b/System.Data/System/Data/SqlClient/SqlColumnEncryptionCspProvider.cs @@ -0,0 +1,462 @@ +//------------------------------------------------------------------------------ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// balnee +// krishnib +//------------------------------------------------------------------------------ +namespace System.Data.SqlClient +{ + using System; + using System.Text; + using System.Data.Common; + using System.Diagnostics; + using System.Globalization; + using System.Security; + using System.Security.Cryptography; + using Microsoft.Win32; + + /// + /// Provides implementation similar to certificate store provider. + /// A CEK encrypted with certificate store provider should be decryptable by this provider and vice versa. + /// + /// Envolope Format for the encrypted column encryption key + /// version + keyPathLength + ciphertextLength + keyPath + ciphertext + signature + /// version: A single byte indicating the format version. + /// keyPathLength: Length of the keyPath. + /// ciphertextLength: ciphertext length + /// keyPath: keyPath used to encrypt the column encryption key. This is only used for troubleshooting purposes and is not verified during decryption. + /// ciphertext: Encrypted column encryption key + /// signature: Signature of the entire byte array. Signature is validated before decrypting the column encryption key. + /// + public class SqlColumnEncryptionCspProvider : SqlColumnEncryptionKeyStoreProvider + { + /// + /// Name for the CSP key store provider. + /// + public const string ProviderName = @"MSSQL_CSP_PROVIDER"; + + /// + /// RSA_OAEP is the only algorithm supported for encrypting/decrypting column encryption keys using this provider. + /// For now, we are keeping all the providers in [....]. + /// + private const string RSAEncryptionAlgorithmWithOAEP = @"RSA_OAEP"; + + /// + /// Hashing algoirthm used for signing + /// + private const string HashingAlgorithm = @"SHA256"; + + /// + /// Algorithm version + /// + private readonly byte[] _version = new byte[] { 0x01 }; + + /// + /// This function uses the asymmetric key specified by the key path + /// and decrypts an encrypted CEK with RSA encryption algorithm. + /// + /// Complete path of an asymmetric key in CSP + /// Asymmetric Key Encryption Algorithm + /// Encrypted Column Encryption Key + /// Plain text column encryption key + public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) + { + // Validate the input parameters + ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: true); + + if (null == encryptedColumnEncryptionKey) + { + throw SQL.NullEncryptedColumnEncryptionKey(); + } + + if (0 == encryptedColumnEncryptionKey.Length) + { + throw SQL.EmptyEncryptedColumnEncryptionKey(); + } + + // Validate encryptionAlgorithm + ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: true); + + // Create RSA Provider with the given CSP name and key name + RSACryptoServiceProvider rsaProvider = CreateRSACryptoProvider(masterKeyPath, isSystemOp: true); + + // Validate whether the key is RSA one or not and then get the key size + int keySizeInBytes = GetKeySize(rsaProvider); + + // Validate and decrypt the EncryptedColumnEncryptionKey + // Format is + // version + keyPathLength + ciphertextLength + keyPath + ciphervtext + signature + // + // keyPath is present in the encrypted column encryption key for identifying the original source of the asymmetric key pair and + // we will not validate it against the data contained in the CMK metadata (masterKeyPath). + + // Validate the version byte + if (encryptedColumnEncryptionKey[0] != _version[0]) + { + throw SQL.InvalidAlgorithmVersionInEncryptedCEK(encryptedColumnEncryptionKey[0], _version[0]); + } + + // Get key path length + int currentIndex = _version.Length; + UInt16 keyPathLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex); + currentIndex += sizeof(UInt16); + + // Get ciphertext length + UInt16 cipherTextLength = BitConverter.ToUInt16(encryptedColumnEncryptionKey, currentIndex); + currentIndex += sizeof(UInt16); + + // Skip KeyPath + // KeyPath exists only for troubleshooting purposes and doesnt need validation. + currentIndex += keyPathLength; + + // validate the ciphertext length + if (cipherTextLength != keySizeInBytes) + { + throw SQL.InvalidCiphertextLengthInEncryptedCEKCsp(cipherTextLength, keySizeInBytes, masterKeyPath); + } + + // Validate the signature length + // Signature length should be same as the key side for RSA PKCSv1.5 + int signatureLength = encryptedColumnEncryptionKey.Length - currentIndex - cipherTextLength; + if (signatureLength != keySizeInBytes) + { + throw SQL.InvalidSignatureInEncryptedCEKCsp(signatureLength, keySizeInBytes, masterKeyPath); + } + + // Get ciphertext + byte[] cipherText = new byte[cipherTextLength]; + Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, cipherText, 0, cipherText.Length); + currentIndex += cipherTextLength; + + // Get signature + byte[] signature = new byte[signatureLength]; + Buffer.BlockCopy(encryptedColumnEncryptionKey, currentIndex, signature, 0, signature.Length); + + // Compute the hash to validate the signature + byte[] hash; + using (SHA256Cng sha256 = new SHA256Cng()) + { + sha256.TransformFinalBlock(encryptedColumnEncryptionKey, 0, encryptedColumnEncryptionKey.Length - signature.Length); + hash = sha256.Hash; + } + + Debug.Assert(hash != null, @"hash should not be null while decrypting encrypted column encryption key."); + + // Validate the signature + if (!RSAVerifySignature(hash, signature, rsaProvider)) + { + throw SQL.InvalidSignature(masterKeyPath); + } + + // Decrypt the CEK + return RSADecrypt(rsaProvider, cipherText); + } + + /// + /// This function uses the asymmetric key specified by the key path + /// and encrypts CEK with RSA encryption algorithm. + /// + /// Complete path of an asymmetric key in AKV + /// Asymmetric Key Encryption Algorithm + /// Plain text column encryption key + /// Encrypted column encryption key + public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) + { + // Validate the input parameters + ValidateNonEmptyCSPKeyPath(masterKeyPath, isSystemOp: false); + + if (null == columnEncryptionKey) + { + throw SQL.NullColumnEncryptionKey(); + } + else if (0 == columnEncryptionKey.Length) + { + throw SQL.EmptyColumnEncryptionKey(); + } + + // Validate encryptionAlgorithm + ValidateEncryptionAlgorithm(encryptionAlgorithm, isSystemOp: false); + + // Create RSA Provider with the given CSP name and key name + RSACryptoServiceProvider rsaProvider = CreateRSACryptoProvider(masterKeyPath, isSystemOp: false); + + // Validate whether the key is RSA one or not and then get the key size + int keySizeInBytes = GetKeySize(rsaProvider); + + // Construct the encryptedColumnEncryptionKey + // Format is + // version + keyPathLength + ciphertextLength + ciphertext + keyPath + signature + // + // We currently only support one version + byte[] version = new byte[] { _version[0] }; + + // Get the Unicode encoded bytes of cultureinvariant lower case masterKeyPath + byte[] masterKeyPathBytes = Encoding.Unicode.GetBytes(masterKeyPath.ToLowerInvariant()); + byte[] keyPathLength = BitConverter.GetBytes((Int16)masterKeyPathBytes.Length); + + // Encrypt the plain text + byte[] cipherText = RSAEncrypt(rsaProvider, columnEncryptionKey); + byte[] cipherTextLength = BitConverter.GetBytes((Int16)cipherText.Length); + Debug.Assert(cipherText.Length == keySizeInBytes, @"cipherText length does not match the RSA key size"); + + // Compute hash + // SHA-2-256(version + keyPathLength + ciphertextLength + keyPath + ciphertext) + byte[] hash; + using (SHA256Cng sha256 = new SHA256Cng()) + { + sha256.TransformBlock(version, 0, version.Length, version, 0); + sha256.TransformBlock(keyPathLength, 0, keyPathLength.Length, keyPathLength, 0); + sha256.TransformBlock(cipherTextLength, 0, cipherTextLength.Length, cipherTextLength, 0); + sha256.TransformBlock(masterKeyPathBytes, 0, masterKeyPathBytes.Length, masterKeyPathBytes, 0); + sha256.TransformFinalBlock(cipherText, 0, cipherText.Length); + hash = sha256.Hash; + } + + // Sign the hash + byte[] signedHash = RSASignHashedData(hash, rsaProvider); + Debug.Assert(signedHash.Length == keySizeInBytes, @"signed hash length does not match the RSA key size"); + Debug.Assert(RSAVerifySignature(hash, signedHash, rsaProvider), @"Invalid signature of the encrypted column encryption key computed."); + + // Construct the encrypted column encryption key + // EncryptedColumnEncryptionKey = version + keyPathLength + ciphertextLength + keyPath + ciphertext + signature + int encryptedColumnEncryptionKeyLength = version.Length + cipherTextLength.Length + keyPathLength.Length + cipherText.Length + masterKeyPathBytes.Length + signedHash.Length; + byte[] encryptedColumnEncryptionKey = new byte[encryptedColumnEncryptionKeyLength]; + + // Copy version byte + int currentIndex = 0; + Buffer.BlockCopy(version, 0, encryptedColumnEncryptionKey, currentIndex, version.Length); + currentIndex += version.Length; + + // Copy key path length + Buffer.BlockCopy(keyPathLength, 0, encryptedColumnEncryptionKey, currentIndex, keyPathLength.Length); + currentIndex += keyPathLength.Length; + + // Copy ciphertext length + Buffer.BlockCopy(cipherTextLength, 0, encryptedColumnEncryptionKey, currentIndex, cipherTextLength.Length); + currentIndex += cipherTextLength.Length; + + // Copy key path + Buffer.BlockCopy(masterKeyPathBytes, 0, encryptedColumnEncryptionKey, currentIndex, masterKeyPathBytes.Length); + currentIndex += masterKeyPathBytes.Length; + + // Copy ciphertext + Buffer.BlockCopy(cipherText, 0, encryptedColumnEncryptionKey, currentIndex, cipherText.Length); + currentIndex += cipherText.Length; + + // copy the signature + Buffer.BlockCopy(signedHash, 0, encryptedColumnEncryptionKey, currentIndex, signedHash.Length); + + return encryptedColumnEncryptionKey; + } + + /// + /// This function validates that the encryption algorithm is RSA_OAEP and if it is not, + /// then throws an exception + /// + /// Asymmetric key encryptio algorithm + /// Indicates if ADO.NET calls or the customer calls the API + private void ValidateEncryptionAlgorithm(string encryptionAlgorithm, bool isSystemOp) + { + // This validates that the encryption algorithm is RSA_OAEP + if (null == encryptionAlgorithm) + { + throw SQL.NullKeyEncryptionAlgorithm(isSystemOp); + } + + if (string.Equals(encryptionAlgorithm, RSAEncryptionAlgorithmWithOAEP, StringComparison.OrdinalIgnoreCase) != true) + { + throw SQL.InvalidKeyEncryptionAlgorithm(encryptionAlgorithm, RSAEncryptionAlgorithmWithOAEP, isSystemOp); + } + } + + + /// + /// Checks if the CSP key path is Empty or Null (and raises exception if they are). + /// + /// CSP key path. + /// Indicates if ADO.NET calls or the customer calls the API + private void ValidateNonEmptyCSPKeyPath(string masterKeyPath, bool isSystemOp) + { + if (string.IsNullOrWhiteSpace(masterKeyPath)) + { + if (null == masterKeyPath) + { + throw SQL.NullCspKeyPath(isSystemOp); + } + else + { + throw SQL.InvalidCspPath(masterKeyPath, isSystemOp); + } + } + } + + /// + /// Encrypt the text using specified CSP key. + /// + /// CSP key path. + /// Encryption Algorithm. + /// Plain text Column Encryption Key. + /// Returns an encrypted blob or throws an exception if there are any errors. + private byte[] RSAEncrypt(RSACryptoServiceProvider rscp, byte[] columnEncryptionKey) + { + Debug.Assert(columnEncryptionKey != null); + Debug.Assert(rscp != null); + + return rscp.Encrypt(columnEncryptionKey, fOAEP: true); + } + + /// + /// Decrypt the text using specified CSP key. + /// + /// CSP key url. + /// Encryption Algorithm. + /// Encrypted Column Encryption Key. + /// Returns the decrypted plaintext Column Encryption Key or throws an exception if there are any errors. + private byte[] RSADecrypt(RSACryptoServiceProvider rscp, byte[] encryptedColumnEncryptionKey) + { + Debug.Assert((encryptedColumnEncryptionKey != null) && (encryptedColumnEncryptionKey.Length != 0)); + Debug.Assert(rscp != null); + + return rscp.Decrypt(encryptedColumnEncryptionKey, fOAEP: true); + } + + /// + /// Generates signature based on RSA PKCS#v1.5 scheme using a specified CSP Key URL. + /// + /// Text to sign. + /// RSA Provider with a given key + /// Signature + private byte[] RSASignHashedData(byte[] dataToSign, RSACryptoServiceProvider rscp) + { + Debug.Assert((dataToSign != null) && (dataToSign.Length != 0)); + Debug.Assert(rscp != null); + + return rscp.SignData(dataToSign, HashingAlgorithm); + } + + /// + /// Verifies the given RSA PKCSv1.5 signature. + /// + /// + /// + /// RSA Provider with a given key + /// true if signature is valid, false if it is not valid + private bool RSAVerifySignature(byte[] dataToVerify, byte[] signature, RSACryptoServiceProvider rscp) + { + Debug.Assert((dataToVerify != null) && (dataToVerify.Length != 0)); + Debug.Assert((signature != null) && (signature.Length != 0)); + Debug.Assert(rscp != null); + + return rscp.VerifyData(dataToVerify, HashingAlgorithm, signature); + } + + /// + /// Gets the public Key size in bytes + /// + /// RSA Provider with a given key + /// Key size in bytes + private int GetKeySize(RSACryptoServiceProvider rscp) + { + Debug.Assert(rscp != null); + + return rscp.KeySize / 8; + } + + /// + /// Creates a RSACryptoServiceProvider from the given key path which contains both CSP name and key name + /// + /// key path in the format of [CAPI provider name]\[key name] + /// Indicates if ADO.NET calls or the customer calls the API + /// + private RSACryptoServiceProvider CreateRSACryptoProvider(string keyPath, bool isSystemOp) + { + // Get CNGProvider and the KeyID + string cspProviderName; + string keyName; + GetCspProviderAndKeyName(keyPath, isSystemOp, out cspProviderName, out keyName); + + // Verify the existence of CSP and then get the provider type + int providerType = GetProviderType(cspProviderName, keyPath, isSystemOp); + + // Create a new instance of CspParameters for an RSA container. + CspParameters cspParams = new CspParameters(providerType, cspProviderName, keyName); + cspParams.Flags = CspProviderFlags.UseExistingKey; + + RSACryptoServiceProvider rscp = null; + + try + { + //Create a new instance of RSACryptoServiceProvider + rscp = new RSACryptoServiceProvider(cspParams); + } + catch (CryptographicException e) + { + const int KEYSETDOESNOTEXIST = -2146893802; + if (e.HResult == KEYSETDOESNOTEXIST) + { + // Key does not exist + throw SQL.InvalidCspKeyIdentifier(keyName, keyPath, isSystemOp); + } + else + { + // bubble up the exception + throw; + } + } + + return rscp; + } + + /// + /// Extracts the CSP provider name and key name from the given key path + /// + /// key path in the format of [CSP provider name]\[key name] + /// Indicates if ADO.NET calls or the customer calls the API + /// output containing the CSP provider name + /// output containing the key name + private void GetCspProviderAndKeyName(string keyPath, bool isSystemOp, out string cspProviderName, out string keyIdentifier) + { + int indexOfSlash = keyPath.IndexOf(@"/"); + if (indexOfSlash == -1) + { + throw SQL.InvalidCspPath(keyPath, isSystemOp); + } + + cspProviderName = keyPath.Substring(0, indexOfSlash); + keyIdentifier = keyPath.Substring(indexOfSlash + 1, keyPath.Length - (indexOfSlash + 1)); + + if (cspProviderName.Length == 0) + { + throw SQL.EmptyCspName(keyPath, isSystemOp); + } + + if (keyIdentifier.Length == 0) + { + throw SQL.EmptyCspKeyId(keyPath, isSystemOp); + } + } + + /// + /// Gets the provider type from a given CAPI provider name + /// + /// CAPI provider name + /// key path in the format of [CSP provider name]\[key name] + /// Indicates if ADO.NET calls or the customer calls the API + /// + private int GetProviderType(string providerName, string keyPath, bool isSystemOp) + { + string keyName = String.Format(@"SOFTWARE\Microsoft\Cryptography\Defaults\Provider\{0}", providerName); + RegistryKey key = Registry.LocalMachine.OpenSubKey(keyName); + if (key == null) + { + throw SQL.InvalidCspName(providerName, keyPath, isSystemOp); + } + + int providerType = (int)key.GetValue(@"Type"); + key.Close(); + + return providerType; + } + } +} diff --git a/System.Data/System/Data/SqlClient/SqlCommand.cs b/System.Data/System/Data/SqlClient/SqlCommand.cs index 3e247da7d..2e560dbf3 100644 --- a/System.Data/System/Data/SqlClient/SqlCommand.cs +++ b/System.Data/System/Data/SqlClient/SqlCommand.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -485,7 +485,7 @@ private SqlCommand(SqlCommand from) : this() { // Clone } } - _activeConnection = value; // + _activeConnection = value; // UNDONE: Designers need this setter. Should we block other scenarios? Bid.Trace(" %d#, %d#\n", ObjectID, ((null != value) ? value.ObjectID : -1)); } @@ -1898,7 +1898,7 @@ public IAsyncResult BeginExecuteReader(AsyncCallback callback, object stateObjec } internal SqlDataReader ExecuteReader(CommandBehavior behavior, string method) { - SqlConnection.ExecutePermission.Demand(); // + SqlConnection.ExecutePermission.Demand(); // TODO: Need to move this to public methods... // Reset _pendingCancel upon entry into any Execute - used to synchronize state // between entry into Execute* API and the thread obtaining the stateObject. @@ -4163,7 +4163,7 @@ private SqlDataReader RunExecuteReaderSmi( CommandBehavior cmdBehavior, RunBehav } if (null != eventStream) { - eventStream.Close( EventSink ); // + eventStream.Close( EventSink ); // UNDONE: should cancel instead! } if (requestExecutor != null) { @@ -5339,8 +5339,8 @@ internal string BuildParamList(TdsParser parser, SqlParameterCollection paramete } } - // - + // bug 49497, if the user specifies a 0-sized parameter for a variable len field + // pass over max size (8000 bytes or 4000 characters for wide types) if (0 == size) size = mt.IsSizeInCharacters ? (TdsEnums.MAXSIZE >> 1) : TdsEnums.MAXSIZE; diff --git a/System.Data/System/Data/SqlClient/SqlCommandBuilder.cs b/System.Data/System/Data/SqlClient/SqlCommandBuilder.cs index 7563b0c08..476000e80 100644 --- a/System.Data/System/Data/SqlClient/SqlCommandBuilder.cs +++ b/System.Data/System/Data/SqlClient/SqlCommandBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlCommandSet.cs b/System.Data/System/Data/SqlClient/SqlCommandSet.cs index 913a30f1c..b15a5353b 100644 --- a/System.Data/System/Data/SqlClient/SqlCommandSet.cs +++ b/System.Data/System/Data/SqlClient/SqlCommandSet.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlConnection.cs b/System.Data/System/Data/SqlClient/SqlConnection.cs index 2f104c440..9e637751e 100644 --- a/System.Data/System/Data/SqlClient/SqlConnection.cs +++ b/System.Data/System/Data/SqlClient/SqlConnection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Data.DataSetExtensions, PublicKey="+AssemblyRef.EcmaPublicKeyFull)] // DevDiv Bugs 92166 @@ -52,7 +52,9 @@ public sealed partial class SqlConnection: DbConnection, ICloneable { static private readonly Dictionary _SystemColumnEncryptionKeyStoreProviders = new Dictionary(capacity: 1, comparer: StringComparer.OrdinalIgnoreCase) { - {SqlColumnEncryptionCertificateStoreProvider.ProviderName, new SqlColumnEncryptionCertificateStoreProvider()} + {SqlColumnEncryptionCertificateStoreProvider.ProviderName, new SqlColumnEncryptionCertificateStoreProvider()}, + {SqlColumnEncryptionCngProvider.ProviderName, new SqlColumnEncryptionCngProvider()}, + {SqlColumnEncryptionCspProvider.ProviderName, new SqlColumnEncryptionCspProvider()} }; /// @@ -234,6 +236,11 @@ static internal List GetColumnEncryptionCustomKeyStoreProviders() { internal WindowsIdentity _lastIdentity; internal WindowsIdentity _impersonateIdentity; private int _reconnectCount; + + // Transient Fault handling flag. This is needed to convey to the downstream mechanism of connection establishment, if Transient Fault handling should be used or not + // The downstream handling of Connection open is the same for idle connection resiliency. Currently we want to apply transient fault handling only to the connections opened + // using SqlConnection.Open() method. + internal bool _applyTransientFaultHandling = false; public SqlConnection(string connectionString) : this(connectionString, null) { } @@ -1061,10 +1068,10 @@ private void DisposeMe(bool disposing) { // MDAC 65459 _accessToken = null; if (!disposing) { - // DevDiv2 - - - + // DevDiv2 Bug 457934:SQLConnection leaks when not disposed + // http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/457934 + // For non-pooled connections we need to make sure that if the SqlConnection was not closed, then we release the GCHandle on the stateObject to allow it to be GCed + // For pooled connections, we will rely on the pool reclaiming the connection var innerConnection = (InnerConnection as SqlInternalConnectionTds); if ((innerConnection != null) && (!innerConnection.ConnectionOptions.Pooling)) { var parser = innerConnection.Parser; @@ -1423,6 +1430,8 @@ internal void Retry(Task retryTask) { private bool TryOpen(TaskCompletionSource retry) { SqlConnectionString connectionOptions = (SqlConnectionString)ConnectionOptions; + + _applyTransientFaultHandling = (retry == null && connectionOptions != null && connectionOptions.ConnectRetryCount > 0 ); if (connectionOptions != null && (connectionOptions.Authentication == SqlAuthenticationMethod.SqlPassword || connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryPassword) && @@ -1633,13 +1642,13 @@ static internal string FixupDatabaseTransactionName(string name) { internal void OnError(SqlException exception, bool breakConnection, Action wrapCloseInAction) { Debug.Assert(exception != null && exception.Errors.Count != 0, "SqlConnection: OnError called with null or empty exception!"); - // - - - - - - + // Bug fix - MDAC 49022 - connection open after failure... Problem was parser was passing + // Open as a state - because the parser's connection to the netlib was open. We would + // then set the connection state to the parser's state - which is not correct. The only + // time the connection state should change to what is passed in to this function is if + // the parser is broken, then we should be closed. Changed to passing in + // TdsParserState, not ConnectionState. + // fixed by [....] if (breakConnection && (ConnectionState.Open == State)) { @@ -1949,6 +1958,7 @@ public static void ChangePassword(string connectionString, string newPassword) { SqlConnectionString connectionOptions = SqlConnectionFactory.FindSqlConnectionOptions(key); if (connectionOptions.IntegratedSecurity || connectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated) { + throw SQL.ChangePasswordConflictsWithSSPI(); } if (! ADP.IsEmpty(connectionOptions.AttachDBFilename)) { diff --git a/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs b/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs index c475818f2..a1228d3fc 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionFactory.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient @@ -41,17 +41,19 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt SqlConnectionPoolKey key = (SqlConnectionPoolKey) poolKey; SqlInternalConnection result = null; SessionData recoverySessionData = null; + SqlConnection sqlOwningConnection = owningConnection as SqlConnection; + bool applyTransientFaultHandling = sqlOwningConnection != null ? sqlOwningConnection._applyTransientFaultHandling : false; SqlConnectionString userOpt = null; if (userOptions != null) { userOpt = (SqlConnectionString)userOptions; } - else if (owningConnection != null) { - userOpt = (SqlConnectionString)(((SqlConnection)owningConnection).UserConnectionOptions); + else if (sqlOwningConnection != null) { + userOpt = (SqlConnectionString)(sqlOwningConnection.UserConnectionOptions); } - if (owningConnection != null) { - recoverySessionData = ((SqlConnection)owningConnection)._recoverySessionData; + if (sqlOwningConnection != null) { + recoverySessionData = sqlOwningConnection._recoverySessionData; } if (opt.ContextConnection) { @@ -90,7 +92,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt SqlConnectionString sseopt = new SqlConnectionString(opt, opt.DataSource, true /* user instance=true */, false /* set Enlist = false */); - sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false); + sseConnection = new SqlInternalConnectionTds(identity, sseopt, key.Credential, null, "", null, false, applyTransientFaultHandling: applyTransientFaultHandling); // NOTE: Retrieve here. This user instance name will be used below to connect to the Sql Express User Instance. instanceName = sseConnection.InstanceName; @@ -122,7 +124,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt opt = new SqlConnectionString(opt, instanceName, false /* user instance=false */, null /* do not modify the Enlist value */); poolGroupProviderInfo = null; // null so we do not pass to constructor below... } - result = new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, pool, key.AccessToken); + result = new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, pool, key.AccessToken, applyTransientFaultHandling: applyTransientFaultHandling); } return result; } diff --git a/System.Data/System/Data/SqlClient/SqlConnectionPoolGroupProviderInfo.cs b/System.Data/System/Data/SqlClient/SqlConnectionPoolGroupProviderInfo.cs index 157865b45..044682c67 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionPoolGroupProviderInfo.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionPoolGroupProviderInfo.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient diff --git a/System.Data/System/Data/SqlClient/SqlConnectionPoolKey.cs b/System.Data/System/Data/SqlClient/SqlConnectionPoolKey.cs index ccb98a2b8..e3fb5a7dd 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionPoolKey.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionPoolKey.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient diff --git a/System.Data/System/Data/SqlClient/SqlConnectionPoolProviderInfo.cs b/System.Data/System/Data/SqlClient/SqlConnectionPoolProviderInfo.cs index 3f9e5ccee..d5ff005e6 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionPoolProviderInfo.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionPoolProviderInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlConnectionString.cs b/System.Data/System/Data/SqlClient/SqlConnectionString.cs index 794cc62ba..85ed1b7bb 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionString.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionString.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -27,36 +27,37 @@ internal sealed class SqlConnectionString : DbConnectionOptions { internal static class DEFAULT { internal const ApplicationIntent ApplicationIntent = DbConnectionStringDefaults.ApplicationIntent; - internal const string Application_Name = TdsEnums.SQL_PROVIDER_NAME; - internal const bool Asynchronous = false; - internal const string AttachDBFilename = ""; - internal const int Connect_Timeout = ADP.DefaultConnectionTimeout; - internal const bool Connection_Reset = true; - internal const bool Context_Connection = false; - internal const string Current_Language = ""; - internal const string Data_Source = ""; - internal const bool Encrypt = false; - internal const bool Enlist = true; - internal const string FailoverPartner = ""; - internal const string Initial_Catalog = ""; - internal const bool Integrated_Security = false; - internal const int Load_Balance_Timeout = 0; // default of 0 means don't use - internal const bool MARS = false; - internal const int Max_Pool_Size = 100; - internal const int Min_Pool_Size = 0; - internal const bool MultiSubnetFailover = DbConnectionStringDefaults.MultiSubnetFailover; - internal const string Network_Library = ""; - internal const int Packet_Size = 8000; - internal const string Password = ""; - internal const bool Persist_Security_Info = false; - internal const bool Pooling = true; - internal const bool TrustServerCertificate = false; - internal const string Type_System_Version = ""; - internal const string User_ID = ""; - internal const bool User_Instance = false; - internal const bool Replication = false; - internal const int Connect_Retry_Count = 1; - internal const int Connect_Retry_Interval = 10; + internal const string Application_Name = TdsEnums.SQL_PROVIDER_NAME; + internal const bool Asynchronous = false; + internal const string AttachDBFilename = ""; + internal const int Connect_Timeout = ADP.DefaultConnectionTimeout; + internal const bool Connection_Reset = true; + internal const bool Context_Connection = false; + internal const string Current_Language = ""; + internal const string Data_Source = ""; + internal const bool Encrypt = false; + internal const bool Enlist = true; + internal const string FailoverPartner = ""; + internal const string Initial_Catalog = ""; + internal const bool Integrated_Security = false; + internal const int Load_Balance_Timeout = 0; // default of 0 means don't use + internal const bool MARS = false; + internal const int Max_Pool_Size = 100; + internal const int Min_Pool_Size = 0; + internal const bool MultiSubnetFailover = DbConnectionStringDefaults.MultiSubnetFailover; + internal const bool TransparentNetworkIPResolution = DbConnectionStringDefaults.TransparentNetworkIPResolution; + internal const string Network_Library = ""; + internal const int Packet_Size = 8000; + internal const string Password = ""; + internal const bool Persist_Security_Info = false; + internal const bool Pooling = true; + internal const bool TrustServerCertificate = false; + internal const string Type_System_Version = ""; + internal const string User_ID = ""; + internal const bool User_Instance = false; + internal const bool Replication = false; + internal const int Connect_Retry_Count = 1; + internal const int Connect_Retry_Interval = 10; internal static readonly SqlAuthenticationMethod Authentication = SqlAuthenticationMethod.NotSpecified; internal static readonly SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Disabled; } @@ -64,41 +65,43 @@ internal static class DEFAULT { // SqlConnection ConnectionString Options // keys must be lowercase! internal static class KEY { - internal const string ApplicationIntent = "applicationintent"; - internal const string Application_Name = "application name"; - internal const string AsynchronousProcessing = "asynchronous processing"; - internal const string AttachDBFilename = "attachdbfilename"; - internal const string ColumnEncryptionSetting = "column encryption setting"; - internal const string Connect_Timeout = "connect timeout"; - internal const string Connection_Reset = "connection reset"; - internal const string Context_Connection = "context connection"; - internal const string Current_Language = "current language"; - internal const string Data_Source = "data source"; - internal const string Encrypt = "encrypt"; - internal const string Enlist = "enlist"; - internal const string FailoverPartner = "failover partner"; - internal const string Initial_Catalog = "initial catalog"; - internal const string Integrated_Security = "integrated security"; - internal const string Load_Balance_Timeout = "load balance timeout"; - internal const string MARS = "multipleactiveresultsets"; - internal const string Max_Pool_Size = "max pool size"; - internal const string Min_Pool_Size = "min pool size"; - internal const string MultiSubnetFailover = "multisubnetfailover"; - internal const string Network_Library = "network library"; - internal const string Packet_Size = "packet size"; - internal const string Password = "password"; - internal const string Persist_Security_Info = "persist security info"; - internal const string Pooling = "pooling"; - internal const string TransactionBinding = "transaction binding"; - internal const string TrustServerCertificate = "trustservercertificate"; - internal const string Type_System_Version = "type system version"; - internal const string User_ID = "user id"; - internal const string User_Instance = "user instance"; - internal const string Workstation_Id = "workstation id"; - internal const string Replication = "replication"; - internal const string Connect_Retry_Count = "connectretrycount"; - internal const string Connect_Retry_Interval = "connectretryinterval"; - internal const string Authentication = "authentication"; + internal const string ApplicationIntent = "applicationintent"; + internal const string Application_Name = "application name"; + internal const string AsynchronousProcessing = "asynchronous processing"; + internal const string AttachDBFilename = "attachdbfilename"; + internal const string ColumnEncryptionSetting = "column encryption setting"; + internal const string Connect_Timeout = "connect timeout"; + internal const string Connection_Reset = "connection reset"; + internal const string Context_Connection = "context connection"; + internal const string Current_Language = "current language"; + internal const string Data_Source = "data source"; + internal const string Encrypt = "encrypt"; + internal const string Enlist = "enlist"; + internal const string FailoverPartner = "failover partner"; + internal const string Initial_Catalog = "initial catalog"; + internal const string Integrated_Security = "integrated security"; + internal const string Load_Balance_Timeout = "load balance timeout"; + internal const string MARS = "multipleactiveresultsets"; + internal const string Max_Pool_Size = "max pool size"; + internal const string Min_Pool_Size = "min pool size"; + internal const string MultiSubnetFailover = "multisubnetfailover"; + internal const string TransparentNetworkIPResolution = "transparentnetworkipresolution"; + internal const string Network_Library = "network library"; + internal const string Packet_Size = "packet size"; + internal const string Password = "password"; + internal const string Persist_Security_Info = "persist security info"; + internal const string Pooling = "pooling"; + internal const string TransactionBinding = "transaction binding"; + internal const string TrustServerCertificate = "trustservercertificate"; + internal const string Type_System_Version = "type system version"; + internal const string User_ID = "user id"; + internal const string User_Instance = "user instance"; + internal const string Workstation_Id = "workstation id"; + internal const string Replication = "replication"; + internal const string Connect_Retry_Count = "connectretrycount"; + internal const string Connect_Retry_Interval = "connectretryinterval"; + internal const string Authentication = "authentication"; + } // Constant for the number of duplicate options in the connnection string @@ -198,6 +201,7 @@ internal static class TRANSACIONBINDING { private readonly bool _replication; private readonly bool _userInstance; private readonly bool _multiSubnetFailover; + private readonly bool _transparentNetworkIPResolution; private readonly SqlAuthenticationMethod _authType; private readonly SqlConnectionColumnEncryptionSetting _columnEncryptionSetting; @@ -253,6 +257,7 @@ internal SqlConnectionString(string connectionString) : base(connectionString, G _replication = ConvertValueToBoolean(KEY.Replication, DEFAULT.Replication); _userInstance = ConvertValueToBoolean(KEY.User_Instance, DEFAULT.User_Instance); _multiSubnetFailover = ConvertValueToBoolean(KEY.MultiSubnetFailover, DEFAULT.MultiSubnetFailover); + _transparentNetworkIPResolution = ConvertValueToBoolean(KEY.TransparentNetworkIPResolution, DEFAULT.TransparentNetworkIPResolution); _connectTimeout = ConvertValueToInt32(KEY.Connect_Timeout, DEFAULT.Connect_Timeout); _loadBalanceTimeout = ConvertValueToInt32(KEY.Load_Balance_Timeout, DEFAULT.Load_Balance_Timeout); @@ -478,37 +483,39 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS _enlist = connectionOptions._enlist; } - _mars = connectionOptions._mars; - _persistSecurityInfo = connectionOptions._persistSecurityInfo; - _pooling = connectionOptions._pooling; - _replication = connectionOptions._replication; - _userInstance = userInstance; - _connectTimeout = connectionOptions._connectTimeout; - _loadBalanceTimeout = connectionOptions._loadBalanceTimeout; - _maxPoolSize = connectionOptions._maxPoolSize; - _minPoolSize = connectionOptions._minPoolSize; - _multiSubnetFailover = connectionOptions._multiSubnetFailover; - _packetSize = connectionOptions._packetSize; - _applicationName = connectionOptions._applicationName; - _attachDBFileName = connectionOptions._attachDBFileName; - _currentLanguage = connectionOptions._currentLanguage; - _dataSource = dataSource; - _localDBInstance = LocalDBAPI.GetLocalDbInstanceNameFromServerName(_dataSource); - _failoverPartner = connectionOptions._failoverPartner; - _initialCatalog = connectionOptions._initialCatalog; - _password = connectionOptions._password; - _userID = connectionOptions._userID; - _networkLibrary = connectionOptions._networkLibrary; - _workstationId = connectionOptions._workstationId; - _expandedAttachDBFilename = connectionOptions._expandedAttachDBFilename; - _typeSystemVersion = connectionOptions._typeSystemVersion; - _typeSystemAssemblyVersion =connectionOptions._typeSystemAssemblyVersion; - _transactionBinding = connectionOptions._transactionBinding; - _applicationIntent = connectionOptions._applicationIntent; - _connectRetryCount = connectionOptions._connectRetryCount; - _connectRetryInterval = connectionOptions._connectRetryInterval; - _authType = connectionOptions._authType; - _columnEncryptionSetting = connectionOptions._columnEncryptionSetting; + _mars = connectionOptions._mars; + _persistSecurityInfo = connectionOptions._persistSecurityInfo; + _pooling = connectionOptions._pooling; + _replication = connectionOptions._replication; + _userInstance = userInstance; + _connectTimeout = connectionOptions._connectTimeout; + _loadBalanceTimeout = connectionOptions._loadBalanceTimeout; + _maxPoolSize = connectionOptions._maxPoolSize; + _minPoolSize = connectionOptions._minPoolSize; + _multiSubnetFailover = connectionOptions._multiSubnetFailover; + _transparentNetworkIPResolution = connectionOptions._transparentNetworkIPResolution; + _packetSize = connectionOptions._packetSize; + _applicationName = connectionOptions._applicationName; + _attachDBFileName = connectionOptions._attachDBFileName; + _currentLanguage = connectionOptions._currentLanguage; + _dataSource = dataSource; + _localDBInstance = LocalDBAPI.GetLocalDbInstanceNameFromServerName(_dataSource); + _failoverPartner = connectionOptions._failoverPartner; + _initialCatalog = connectionOptions._initialCatalog; + _password = connectionOptions._password; + _userID = connectionOptions._userID; + _networkLibrary = connectionOptions._networkLibrary; + _workstationId = connectionOptions._workstationId; + _expandedAttachDBFilename = connectionOptions._expandedAttachDBFilename; + _typeSystemVersion = connectionOptions._typeSystemVersion; + _typeSystemAssemblyVersion = connectionOptions._typeSystemAssemblyVersion; + _transactionBinding = connectionOptions._transactionBinding; + _applicationIntent = connectionOptions._applicationIntent; + _connectRetryCount = connectionOptions._connectRetryCount; + _connectRetryInterval = connectionOptions._connectRetryInterval; + _authType = connectionOptions._authType; + _columnEncryptionSetting = connectionOptions._columnEncryptionSetting; + ValidateValueLength(_dataSource, TdsEnums.MAXLEN_SERVERNAME, KEY.Data_Source); } @@ -527,6 +534,7 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS internal bool Enlist { get { return _enlist; } } internal bool MARS { get { return _mars; } } internal bool MultiSubnetFailover { get { return _multiSubnetFailover; } } + internal bool TransparentNetworkIPResolution { get { return _transparentNetworkIPResolution; } } internal SqlAuthenticationMethod Authentication { get { return _authType; } } internal SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting { get { return _columnEncryptionSetting; } } internal bool PersistSecurityInfo { get { return _persistSecurityInfo; } } @@ -608,63 +616,64 @@ internal static Hashtable GetParseSynonyms() { Hashtable hash = _sqlClientSynonyms; if (null == hash) { hash = new Hashtable(SqlConnectionStringBuilder.KeywordsCount + SynonymCount); - hash.Add(KEY.ApplicationIntent, KEY.ApplicationIntent); - hash.Add(KEY.Application_Name, KEY.Application_Name); - hash.Add(KEY.AsynchronousProcessing, KEY.AsynchronousProcessing); - hash.Add(KEY.AttachDBFilename, KEY.AttachDBFilename); - hash.Add(KEY.Connect_Timeout, KEY.Connect_Timeout); - hash.Add(KEY.Connection_Reset, KEY.Connection_Reset); - hash.Add(KEY.Context_Connection, KEY.Context_Connection); - hash.Add(KEY.Current_Language, KEY.Current_Language); - hash.Add(KEY.Data_Source, KEY.Data_Source); - hash.Add(KEY.Encrypt, KEY.Encrypt); - hash.Add(KEY.Enlist, KEY.Enlist); - hash.Add(KEY.FailoverPartner, KEY.FailoverPartner); - hash.Add(KEY.Initial_Catalog, KEY.Initial_Catalog); - hash.Add(KEY.Integrated_Security, KEY.Integrated_Security); - hash.Add(KEY.Load_Balance_Timeout, KEY.Load_Balance_Timeout); - hash.Add(KEY.MARS, KEY.MARS); - hash.Add(KEY.Max_Pool_Size, KEY.Max_Pool_Size); - hash.Add(KEY.Min_Pool_Size, KEY.Min_Pool_Size); - hash.Add(KEY.MultiSubnetFailover, KEY.MultiSubnetFailover); - hash.Add(KEY.Network_Library, KEY.Network_Library); - hash.Add(KEY.Packet_Size, KEY.Packet_Size); - hash.Add(KEY.Password, KEY.Password); - hash.Add(KEY.Persist_Security_Info, KEY.Persist_Security_Info); - hash.Add(KEY.Pooling, KEY.Pooling); - hash.Add(KEY.Replication, KEY.Replication); - hash.Add(KEY.TrustServerCertificate, KEY.TrustServerCertificate); - hash.Add(KEY.TransactionBinding, KEY.TransactionBinding); - hash.Add(KEY.Type_System_Version, KEY.Type_System_Version); - hash.Add(KEY.ColumnEncryptionSetting, KEY.ColumnEncryptionSetting); - hash.Add(KEY.User_ID, KEY.User_ID); - hash.Add(KEY.User_Instance, KEY.User_Instance); - hash.Add(KEY.Workstation_Id, KEY.Workstation_Id); - hash.Add(KEY.Connect_Retry_Count, KEY.Connect_Retry_Count); - hash.Add(KEY.Connect_Retry_Interval, KEY.Connect_Retry_Interval); - hash.Add(KEY.Authentication, KEY.Authentication); - - hash.Add(SYNONYM.APP, KEY.Application_Name); - hash.Add(SYNONYM.Async, KEY.AsynchronousProcessing); - hash.Add(SYNONYM.EXTENDED_PROPERTIES, KEY.AttachDBFilename); - hash.Add(SYNONYM.INITIAL_FILE_NAME, KEY.AttachDBFilename); - hash.Add(SYNONYM.CONNECTION_TIMEOUT, KEY.Connect_Timeout); - hash.Add(SYNONYM.TIMEOUT, KEY.Connect_Timeout); - hash.Add(SYNONYM.LANGUAGE, KEY.Current_Language); - hash.Add(SYNONYM.ADDR, KEY.Data_Source); - hash.Add(SYNONYM.ADDRESS, KEY.Data_Source); - hash.Add(SYNONYM.NETWORK_ADDRESS, KEY.Data_Source); - hash.Add(SYNONYM.SERVER, KEY.Data_Source); - hash.Add(SYNONYM.DATABASE, KEY.Initial_Catalog); - hash.Add(SYNONYM.TRUSTED_CONNECTION, KEY.Integrated_Security); - hash.Add(SYNONYM.Connection_Lifetime, KEY.Load_Balance_Timeout); - hash.Add(SYNONYM.NET, KEY.Network_Library); - hash.Add(SYNONYM.NETWORK, KEY.Network_Library); - hash.Add(SYNONYM.Pwd, KEY.Password); - hash.Add(SYNONYM.PERSISTSECURITYINFO, KEY.Persist_Security_Info); - hash.Add(SYNONYM.UID, KEY.User_ID); - hash.Add(SYNONYM.User, KEY.User_ID); - hash.Add(SYNONYM.WSID, KEY.Workstation_Id); + hash.Add(KEY.ApplicationIntent, KEY.ApplicationIntent); + hash.Add(KEY.Application_Name, KEY.Application_Name); + hash.Add(KEY.AsynchronousProcessing, KEY.AsynchronousProcessing); + hash.Add(KEY.AttachDBFilename, KEY.AttachDBFilename); + hash.Add(KEY.Connect_Timeout, KEY.Connect_Timeout); + hash.Add(KEY.Connection_Reset, KEY.Connection_Reset); + hash.Add(KEY.Context_Connection, KEY.Context_Connection); + hash.Add(KEY.Current_Language, KEY.Current_Language); + hash.Add(KEY.Data_Source, KEY.Data_Source); + hash.Add(KEY.Encrypt, KEY.Encrypt); + hash.Add(KEY.Enlist, KEY.Enlist); + hash.Add(KEY.FailoverPartner, KEY.FailoverPartner); + hash.Add(KEY.Initial_Catalog, KEY.Initial_Catalog); + hash.Add(KEY.Integrated_Security, KEY.Integrated_Security); + hash.Add(KEY.Load_Balance_Timeout, KEY.Load_Balance_Timeout); + hash.Add(KEY.MARS, KEY.MARS); + hash.Add(KEY.Max_Pool_Size, KEY.Max_Pool_Size); + hash.Add(KEY.Min_Pool_Size, KEY.Min_Pool_Size); + hash.Add(KEY.MultiSubnetFailover, KEY.MultiSubnetFailover); + hash.Add(KEY.TransparentNetworkIPResolution, KEY.TransparentNetworkIPResolution); + hash.Add(KEY.Network_Library, KEY.Network_Library); + hash.Add(KEY.Packet_Size, KEY.Packet_Size); + hash.Add(KEY.Password, KEY.Password); + hash.Add(KEY.Persist_Security_Info, KEY.Persist_Security_Info); + hash.Add(KEY.Pooling, KEY.Pooling); + hash.Add(KEY.Replication, KEY.Replication); + hash.Add(KEY.TrustServerCertificate, KEY.TrustServerCertificate); + hash.Add(KEY.TransactionBinding, KEY.TransactionBinding); + hash.Add(KEY.Type_System_Version, KEY.Type_System_Version); + hash.Add(KEY.ColumnEncryptionSetting, KEY.ColumnEncryptionSetting); + hash.Add(KEY.User_ID, KEY.User_ID); + hash.Add(KEY.User_Instance, KEY.User_Instance); + hash.Add(KEY.Workstation_Id, KEY.Workstation_Id); + hash.Add(KEY.Connect_Retry_Count, KEY.Connect_Retry_Count); + hash.Add(KEY.Connect_Retry_Interval, KEY.Connect_Retry_Interval); + hash.Add(KEY.Authentication, KEY.Authentication); + + hash.Add(SYNONYM.APP, KEY.Application_Name); + hash.Add(SYNONYM.Async, KEY.AsynchronousProcessing); + hash.Add(SYNONYM.EXTENDED_PROPERTIES, KEY.AttachDBFilename); + hash.Add(SYNONYM.INITIAL_FILE_NAME, KEY.AttachDBFilename); + hash.Add(SYNONYM.CONNECTION_TIMEOUT, KEY.Connect_Timeout); + hash.Add(SYNONYM.TIMEOUT, KEY.Connect_Timeout); + hash.Add(SYNONYM.LANGUAGE, KEY.Current_Language); + hash.Add(SYNONYM.ADDR, KEY.Data_Source); + hash.Add(SYNONYM.ADDRESS, KEY.Data_Source); + hash.Add(SYNONYM.NETWORK_ADDRESS, KEY.Data_Source); + hash.Add(SYNONYM.SERVER, KEY.Data_Source); + hash.Add(SYNONYM.DATABASE, KEY.Initial_Catalog); + hash.Add(SYNONYM.TRUSTED_CONNECTION, KEY.Integrated_Security); + hash.Add(SYNONYM.Connection_Lifetime, KEY.Load_Balance_Timeout); + hash.Add(SYNONYM.NET, KEY.Network_Library); + hash.Add(SYNONYM.NETWORK, KEY.Network_Library); + hash.Add(SYNONYM.Pwd, KEY.Password); + hash.Add(SYNONYM.PERSISTSECURITYINFO, KEY.Persist_Security_Info); + hash.Add(SYNONYM.UID, KEY.User_ID); + hash.Add(SYNONYM.User, KEY.User_ID); + hash.Add(SYNONYM.WSID, KEY.Workstation_Id); Debug.Assert(SqlConnectionStringBuilder.KeywordsCount + SynonymCount == hash.Count, "incorrect initial ParseSynonyms size"); _sqlClientSynonyms = hash; } diff --git a/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs b/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs index 9df61cecd..8e7714341 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionStringBuilder.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -71,6 +71,8 @@ public sealed class SqlConnectionStringBuilder : DbConnectionStringBuilder { MultiSubnetFailover, + TransparentNetworkIPResolution, + ConnectRetryCount, ConnectRetryInterval, @@ -109,120 +111,124 @@ public sealed class SqlConnectionStringBuilder : DbConnectionStringBuilder { private int _connectRetryCount = DbConnectionStringDefaults.ConnectRetryCount; private int _connectRetryInterval = DbConnectionStringDefaults.ConnectRetryInterval; - private bool _asynchronousProcessing = DbConnectionStringDefaults.AsynchronousProcessing; - private bool _connectionReset = DbConnectionStringDefaults.ConnectionReset; - private bool _contextConnection = DbConnectionStringDefaults.ContextConnection; - private bool _encrypt = DbConnectionStringDefaults.Encrypt; - private bool _trustServerCertificate = DbConnectionStringDefaults.TrustServerCertificate; - private bool _enlist = DbConnectionStringDefaults.Enlist; - private bool _integratedSecurity = DbConnectionStringDefaults.IntegratedSecurity; - private bool _multipleActiveResultSets = DbConnectionStringDefaults.MultipleActiveResultSets; - private bool _multiSubnetFailover = DbConnectionStringDefaults.MultiSubnetFailover; - private bool _persistSecurityInfo = DbConnectionStringDefaults.PersistSecurityInfo; - private bool _pooling = DbConnectionStringDefaults.Pooling; - private bool _replication = DbConnectionStringDefaults.Replication; - private bool _userInstance = DbConnectionStringDefaults.UserInstance; + private bool _asynchronousProcessing = DbConnectionStringDefaults.AsynchronousProcessing; + private bool _connectionReset = DbConnectionStringDefaults.ConnectionReset; + private bool _contextConnection = DbConnectionStringDefaults.ContextConnection; + private bool _encrypt = DbConnectionStringDefaults.Encrypt; + private bool _trustServerCertificate = DbConnectionStringDefaults.TrustServerCertificate; + private bool _enlist = DbConnectionStringDefaults.Enlist; + private bool _integratedSecurity = DbConnectionStringDefaults.IntegratedSecurity; + private bool _multipleActiveResultSets = DbConnectionStringDefaults.MultipleActiveResultSets; + private bool _multiSubnetFailover = DbConnectionStringDefaults.MultiSubnetFailover; + private bool _transparentNetworkIPResolution= DbConnectionStringDefaults.TransparentNetworkIPResolution; + private bool _persistSecurityInfo = DbConnectionStringDefaults.PersistSecurityInfo; + private bool _pooling = DbConnectionStringDefaults.Pooling; + private bool _replication = DbConnectionStringDefaults.Replication; + private bool _userInstance = DbConnectionStringDefaults.UserInstance; private SqlAuthenticationMethod _authentication = DbConnectionStringDefaults.Authentication; private SqlConnectionColumnEncryptionSetting _columnEncryptionSetting = DbConnectionStringDefaults.ColumnEncryptionSetting; static SqlConnectionStringBuilder() { string[] validKeywords = new string[KeywordsCount]; - validKeywords[(int)Keywords.ApplicationIntent] = DbConnectionStringKeywords.ApplicationIntent; - validKeywords[(int)Keywords.ApplicationName] = DbConnectionStringKeywords.ApplicationName; - validKeywords[(int)Keywords.AsynchronousProcessing] = DbConnectionStringKeywords.AsynchronousProcessing; - validKeywords[(int)Keywords.AttachDBFilename] = DbConnectionStringKeywords.AttachDBFilename; - validKeywords[(int)Keywords.ConnectionReset] = DbConnectionStringKeywords.ConnectionReset; - validKeywords[(int)Keywords.ContextConnection] = DbConnectionStringKeywords.ContextConnection; - validKeywords[(int)Keywords.ConnectTimeout] = DbConnectionStringKeywords.ConnectTimeout; - validKeywords[(int)Keywords.CurrentLanguage] = DbConnectionStringKeywords.CurrentLanguage; - validKeywords[(int)Keywords.DataSource] = DbConnectionStringKeywords.DataSource; - validKeywords[(int)Keywords.Encrypt] = DbConnectionStringKeywords.Encrypt; - validKeywords[(int)Keywords.Enlist] = DbConnectionStringKeywords.Enlist; - validKeywords[(int)Keywords.FailoverPartner] = DbConnectionStringKeywords.FailoverPartner; - validKeywords[(int)Keywords.InitialCatalog] = DbConnectionStringKeywords.InitialCatalog; - validKeywords[(int)Keywords.IntegratedSecurity] = DbConnectionStringKeywords.IntegratedSecurity; - validKeywords[(int)Keywords.LoadBalanceTimeout] = DbConnectionStringKeywords.LoadBalanceTimeout; - validKeywords[(int)Keywords.MaxPoolSize] = DbConnectionStringKeywords.MaxPoolSize; - validKeywords[(int)Keywords.MinPoolSize] = DbConnectionStringKeywords.MinPoolSize; - validKeywords[(int)Keywords.MultipleActiveResultSets] = DbConnectionStringKeywords.MultipleActiveResultSets; - validKeywords[(int)Keywords.MultiSubnetFailover] = DbConnectionStringKeywords.MultiSubnetFailover; -// validKeywords[(int)Keywords.NamedConnection] = DbConnectionStringKeywords.NamedConnection; - validKeywords[(int)Keywords.NetworkLibrary] = DbConnectionStringKeywords.NetworkLibrary; - validKeywords[(int)Keywords.PacketSize] = DbConnectionStringKeywords.PacketSize; - validKeywords[(int)Keywords.Password] = DbConnectionStringKeywords.Password; - validKeywords[(int)Keywords.PersistSecurityInfo] = DbConnectionStringKeywords.PersistSecurityInfo; - validKeywords[(int)Keywords.Pooling] = DbConnectionStringKeywords.Pooling; - validKeywords[(int)Keywords.Replication] = DbConnectionStringKeywords.Replication; - validKeywords[(int)Keywords.TransactionBinding] = DbConnectionStringKeywords.TransactionBinding; - validKeywords[(int)Keywords.TrustServerCertificate] = DbConnectionStringKeywords.TrustServerCertificate; - validKeywords[(int)Keywords.TypeSystemVersion] = DbConnectionStringKeywords.TypeSystemVersion; - validKeywords[(int)Keywords.UserID] = DbConnectionStringKeywords.UserID; - validKeywords[(int)Keywords.UserInstance] = DbConnectionStringKeywords.UserInstance; - validKeywords[(int)Keywords.WorkstationID] = DbConnectionStringKeywords.WorkstationID; - validKeywords[(int)Keywords.ConnectRetryCount] = DbConnectionStringKeywords.ConnectRetryCount; - validKeywords[(int)Keywords.ConnectRetryInterval] = DbConnectionStringKeywords.ConnectRetryInterval; - validKeywords[(int)Keywords.Authentication] = DbConnectionStringKeywords.Authentication; - validKeywords[(int)Keywords.ColumnEncryptionSetting] = DbConnectionStringKeywords.ColumnEncryptionSetting; - _validKeywords = validKeywords; + validKeywords[(int)Keywords.ApplicationIntent] = DbConnectionStringKeywords.ApplicationIntent; + validKeywords[(int)Keywords.ApplicationName] = DbConnectionStringKeywords.ApplicationName; + validKeywords[(int)Keywords.AsynchronousProcessing] = DbConnectionStringKeywords.AsynchronousProcessing; + validKeywords[(int)Keywords.AttachDBFilename] = DbConnectionStringKeywords.AttachDBFilename; + validKeywords[(int)Keywords.ConnectionReset] = DbConnectionStringKeywords.ConnectionReset; + validKeywords[(int)Keywords.ContextConnection] = DbConnectionStringKeywords.ContextConnection; + validKeywords[(int)Keywords.ConnectTimeout] = DbConnectionStringKeywords.ConnectTimeout; + validKeywords[(int)Keywords.CurrentLanguage] = DbConnectionStringKeywords.CurrentLanguage; + validKeywords[(int)Keywords.DataSource] = DbConnectionStringKeywords.DataSource; + validKeywords[(int)Keywords.Encrypt] = DbConnectionStringKeywords.Encrypt; + validKeywords[(int)Keywords.Enlist] = DbConnectionStringKeywords.Enlist; + validKeywords[(int)Keywords.FailoverPartner] = DbConnectionStringKeywords.FailoverPartner; + validKeywords[(int)Keywords.InitialCatalog] = DbConnectionStringKeywords.InitialCatalog; + validKeywords[(int)Keywords.IntegratedSecurity] = DbConnectionStringKeywords.IntegratedSecurity; + validKeywords[(int)Keywords.LoadBalanceTimeout] = DbConnectionStringKeywords.LoadBalanceTimeout; + validKeywords[(int)Keywords.MaxPoolSize] = DbConnectionStringKeywords.MaxPoolSize; + validKeywords[(int)Keywords.MinPoolSize] = DbConnectionStringKeywords.MinPoolSize; + validKeywords[(int)Keywords.MultipleActiveResultSets] = DbConnectionStringKeywords.MultipleActiveResultSets; + validKeywords[(int)Keywords.MultiSubnetFailover] = DbConnectionStringKeywords.MultiSubnetFailover; + validKeywords[(int)Keywords.TransparentNetworkIPResolution] = DbConnectionStringKeywords.TransparentNetworkIPResolution; +// validKeywords[(int)Keywords.NamedConnection] = DbConnectionStringKeywords.NamedConnection; + validKeywords[(int)Keywords.NetworkLibrary] = DbConnectionStringKeywords.NetworkLibrary; + validKeywords[(int)Keywords.PacketSize] = DbConnectionStringKeywords.PacketSize; + validKeywords[(int)Keywords.Password] = DbConnectionStringKeywords.Password; + validKeywords[(int)Keywords.PersistSecurityInfo] = DbConnectionStringKeywords.PersistSecurityInfo; + validKeywords[(int)Keywords.Pooling] = DbConnectionStringKeywords.Pooling; + validKeywords[(int)Keywords.Replication] = DbConnectionStringKeywords.Replication; + validKeywords[(int)Keywords.TransactionBinding] = DbConnectionStringKeywords.TransactionBinding; + validKeywords[(int)Keywords.TrustServerCertificate] = DbConnectionStringKeywords.TrustServerCertificate; + validKeywords[(int)Keywords.TypeSystemVersion] = DbConnectionStringKeywords.TypeSystemVersion; + validKeywords[(int)Keywords.UserID] = DbConnectionStringKeywords.UserID; + validKeywords[(int)Keywords.UserInstance] = DbConnectionStringKeywords.UserInstance; + validKeywords[(int)Keywords.WorkstationID] = DbConnectionStringKeywords.WorkstationID; + validKeywords[(int)Keywords.ConnectRetryCount] = DbConnectionStringKeywords.ConnectRetryCount; + validKeywords[(int)Keywords.ConnectRetryInterval] = DbConnectionStringKeywords.ConnectRetryInterval; + validKeywords[(int)Keywords.Authentication] = DbConnectionStringKeywords.Authentication; + validKeywords[(int)Keywords.ColumnEncryptionSetting] = DbConnectionStringKeywords.ColumnEncryptionSetting; + _validKeywords = validKeywords; Dictionary hash = new Dictionary(KeywordsCount + SqlConnectionString.SynonymCount, StringComparer.OrdinalIgnoreCase); - hash.Add(DbConnectionStringKeywords.ApplicationIntent, Keywords.ApplicationIntent); - hash.Add(DbConnectionStringKeywords.ApplicationName, Keywords.ApplicationName); - hash.Add(DbConnectionStringKeywords.AsynchronousProcessing, Keywords.AsynchronousProcessing); - hash.Add(DbConnectionStringKeywords.AttachDBFilename, Keywords.AttachDBFilename); - hash.Add(DbConnectionStringKeywords.ConnectTimeout, Keywords.ConnectTimeout); - hash.Add(DbConnectionStringKeywords.ConnectionReset, Keywords.ConnectionReset); - hash.Add(DbConnectionStringKeywords.ContextConnection, Keywords.ContextConnection); - hash.Add(DbConnectionStringKeywords.CurrentLanguage, Keywords.CurrentLanguage); - hash.Add(DbConnectionStringKeywords.DataSource, Keywords.DataSource); - hash.Add(DbConnectionStringKeywords.Encrypt, Keywords.Encrypt); - hash.Add(DbConnectionStringKeywords.Enlist, Keywords.Enlist); - hash.Add(DbConnectionStringKeywords.FailoverPartner, Keywords.FailoverPartner); - hash.Add(DbConnectionStringKeywords.InitialCatalog, Keywords.InitialCatalog); - hash.Add(DbConnectionStringKeywords.IntegratedSecurity, Keywords.IntegratedSecurity); - hash.Add(DbConnectionStringKeywords.LoadBalanceTimeout, Keywords.LoadBalanceTimeout); - hash.Add(DbConnectionStringKeywords.MultipleActiveResultSets, Keywords.MultipleActiveResultSets); - hash.Add(DbConnectionStringKeywords.MaxPoolSize, Keywords.MaxPoolSize); - hash.Add(DbConnectionStringKeywords.MinPoolSize, Keywords.MinPoolSize); - hash.Add(DbConnectionStringKeywords.MultiSubnetFailover, Keywords.MultiSubnetFailover); -// hash.Add(DbConnectionStringKeywords.NamedConnection, Keywords.NamedConnection); - hash.Add(DbConnectionStringKeywords.NetworkLibrary, Keywords.NetworkLibrary); - hash.Add(DbConnectionStringKeywords.PacketSize, Keywords.PacketSize); - hash.Add(DbConnectionStringKeywords.Password, Keywords.Password); - hash.Add(DbConnectionStringKeywords.PersistSecurityInfo, Keywords.PersistSecurityInfo); - hash.Add(DbConnectionStringKeywords.Pooling, Keywords.Pooling); - hash.Add(DbConnectionStringKeywords.Replication, Keywords.Replication); - hash.Add(DbConnectionStringKeywords.TransactionBinding, Keywords.TransactionBinding); - hash.Add(DbConnectionStringKeywords.TrustServerCertificate, Keywords.TrustServerCertificate); - hash.Add(DbConnectionStringKeywords.TypeSystemVersion, Keywords.TypeSystemVersion); - hash.Add(DbConnectionStringKeywords.UserID, Keywords.UserID); - hash.Add(DbConnectionStringKeywords.UserInstance, Keywords.UserInstance); - hash.Add(DbConnectionStringKeywords.WorkstationID, Keywords.WorkstationID); - hash.Add(DbConnectionStringKeywords.ConnectRetryCount, Keywords.ConnectRetryCount); - hash.Add(DbConnectionStringKeywords.ConnectRetryInterval, Keywords.ConnectRetryInterval); - hash.Add(DbConnectionStringKeywords.Authentication, Keywords.Authentication); - hash.Add(DbConnectionStringKeywords.ColumnEncryptionSetting, Keywords.ColumnEncryptionSetting); - hash.Add(DbConnectionStringSynonyms.APP, Keywords.ApplicationName); - hash.Add(DbConnectionStringSynonyms.Async, Keywords.AsynchronousProcessing); - hash.Add(DbConnectionStringSynonyms.EXTENDEDPROPERTIES, Keywords.AttachDBFilename); - hash.Add(DbConnectionStringSynonyms.INITIALFILENAME, Keywords.AttachDBFilename); - hash.Add(DbConnectionStringSynonyms.CONNECTIONTIMEOUT, Keywords.ConnectTimeout); - hash.Add(DbConnectionStringSynonyms.TIMEOUT, Keywords.ConnectTimeout); - hash.Add(DbConnectionStringSynonyms.LANGUAGE, Keywords.CurrentLanguage); - hash.Add(DbConnectionStringSynonyms.ADDR, Keywords.DataSource); - hash.Add(DbConnectionStringSynonyms.ADDRESS, Keywords.DataSource); - hash.Add(DbConnectionStringSynonyms.NETWORKADDRESS, Keywords.DataSource); - hash.Add(DbConnectionStringSynonyms.SERVER, Keywords.DataSource); - hash.Add(DbConnectionStringSynonyms.DATABASE, Keywords.InitialCatalog); - hash.Add(DbConnectionStringSynonyms.TRUSTEDCONNECTION, Keywords.IntegratedSecurity); - hash.Add(DbConnectionStringSynonyms.ConnectionLifetime, Keywords.LoadBalanceTimeout); - hash.Add(DbConnectionStringSynonyms.NET, Keywords.NetworkLibrary); - hash.Add(DbConnectionStringSynonyms.NETWORK, Keywords.NetworkLibrary); - hash.Add(DbConnectionStringSynonyms.Pwd, Keywords.Password); - hash.Add(DbConnectionStringSynonyms.PERSISTSECURITYINFO, Keywords.PersistSecurityInfo); - hash.Add(DbConnectionStringSynonyms.UID, Keywords.UserID); - hash.Add(DbConnectionStringSynonyms.User, Keywords.UserID); - hash.Add(DbConnectionStringSynonyms.WSID, Keywords.WorkstationID); + hash.Add(DbConnectionStringKeywords.ApplicationIntent, Keywords.ApplicationIntent); + hash.Add(DbConnectionStringKeywords.ApplicationName, Keywords.ApplicationName); + hash.Add(DbConnectionStringKeywords.AsynchronousProcessing, Keywords.AsynchronousProcessing); + hash.Add(DbConnectionStringKeywords.AttachDBFilename, Keywords.AttachDBFilename); + hash.Add(DbConnectionStringKeywords.ConnectTimeout, Keywords.ConnectTimeout); + hash.Add(DbConnectionStringKeywords.ConnectionReset, Keywords.ConnectionReset); + hash.Add(DbConnectionStringKeywords.ContextConnection, Keywords.ContextConnection); + hash.Add(DbConnectionStringKeywords.CurrentLanguage, Keywords.CurrentLanguage); + hash.Add(DbConnectionStringKeywords.DataSource, Keywords.DataSource); + hash.Add(DbConnectionStringKeywords.Encrypt, Keywords.Encrypt); + hash.Add(DbConnectionStringKeywords.Enlist, Keywords.Enlist); + hash.Add(DbConnectionStringKeywords.FailoverPartner, Keywords.FailoverPartner); + hash.Add(DbConnectionStringKeywords.InitialCatalog, Keywords.InitialCatalog); + hash.Add(DbConnectionStringKeywords.IntegratedSecurity, Keywords.IntegratedSecurity); + hash.Add(DbConnectionStringKeywords.LoadBalanceTimeout, Keywords.LoadBalanceTimeout); + hash.Add(DbConnectionStringKeywords.MultipleActiveResultSets, Keywords.MultipleActiveResultSets); + hash.Add(DbConnectionStringKeywords.MaxPoolSize, Keywords.MaxPoolSize); + hash.Add(DbConnectionStringKeywords.MinPoolSize, Keywords.MinPoolSize); + hash.Add(DbConnectionStringKeywords.MultiSubnetFailover, Keywords.MultiSubnetFailover); + hash.Add(DbConnectionStringKeywords.TransparentNetworkIPResolution, Keywords.TransparentNetworkIPResolution); +// hash.Add(DbConnectionStringKeywords.NamedConnection, Keywords.NamedConnection); + hash.Add(DbConnectionStringKeywords.NetworkLibrary, Keywords.NetworkLibrary); + hash.Add(DbConnectionStringKeywords.PacketSize, Keywords.PacketSize); + hash.Add(DbConnectionStringKeywords.Password, Keywords.Password); + hash.Add(DbConnectionStringKeywords.PersistSecurityInfo, Keywords.PersistSecurityInfo); + hash.Add(DbConnectionStringKeywords.Pooling, Keywords.Pooling); + hash.Add(DbConnectionStringKeywords.Replication, Keywords.Replication); + hash.Add(DbConnectionStringKeywords.TransactionBinding, Keywords.TransactionBinding); + hash.Add(DbConnectionStringKeywords.TrustServerCertificate, Keywords.TrustServerCertificate); + hash.Add(DbConnectionStringKeywords.TypeSystemVersion, Keywords.TypeSystemVersion); + hash.Add(DbConnectionStringKeywords.UserID, Keywords.UserID); + hash.Add(DbConnectionStringKeywords.UserInstance, Keywords.UserInstance); + hash.Add(DbConnectionStringKeywords.WorkstationID, Keywords.WorkstationID); + hash.Add(DbConnectionStringKeywords.ConnectRetryCount, Keywords.ConnectRetryCount); + hash.Add(DbConnectionStringKeywords.ConnectRetryInterval, Keywords.ConnectRetryInterval); + hash.Add(DbConnectionStringKeywords.Authentication, Keywords.Authentication); + hash.Add(DbConnectionStringKeywords.ColumnEncryptionSetting, Keywords.ColumnEncryptionSetting); + + hash.Add(DbConnectionStringSynonyms.APP, Keywords.ApplicationName); + hash.Add(DbConnectionStringSynonyms.Async, Keywords.AsynchronousProcessing); + hash.Add(DbConnectionStringSynonyms.EXTENDEDPROPERTIES, Keywords.AttachDBFilename); + hash.Add(DbConnectionStringSynonyms.INITIALFILENAME, Keywords.AttachDBFilename); + hash.Add(DbConnectionStringSynonyms.CONNECTIONTIMEOUT, Keywords.ConnectTimeout); + hash.Add(DbConnectionStringSynonyms.TIMEOUT, Keywords.ConnectTimeout); + hash.Add(DbConnectionStringSynonyms.LANGUAGE, Keywords.CurrentLanguage); + hash.Add(DbConnectionStringSynonyms.ADDR, Keywords.DataSource); + hash.Add(DbConnectionStringSynonyms.ADDRESS, Keywords.DataSource); + hash.Add(DbConnectionStringSynonyms.NETWORKADDRESS, Keywords.DataSource); + hash.Add(DbConnectionStringSynonyms.SERVER, Keywords.DataSource); + hash.Add(DbConnectionStringSynonyms.DATABASE, Keywords.InitialCatalog); + hash.Add(DbConnectionStringSynonyms.TRUSTEDCONNECTION, Keywords.IntegratedSecurity); + hash.Add(DbConnectionStringSynonyms.ConnectionLifetime, Keywords.LoadBalanceTimeout); + hash.Add(DbConnectionStringSynonyms.NET, Keywords.NetworkLibrary); + hash.Add(DbConnectionStringSynonyms.NETWORK, Keywords.NetworkLibrary); + hash.Add(DbConnectionStringSynonyms.Pwd, Keywords.Password); + hash.Add(DbConnectionStringSynonyms.PERSISTSECURITYINFO, Keywords.PersistSecurityInfo); + hash.Add(DbConnectionStringSynonyms.UID, Keywords.UserID); + hash.Add(DbConnectionStringSynonyms.User, Keywords.UserID); + hash.Add(DbConnectionStringSynonyms.WSID, Keywords.WorkstationID); Debug.Assert((KeywordsCount + SqlConnectionString.SynonymCount) == hash.Count, "initial expected size is incorrect"); _keywords = hash; @@ -246,47 +252,48 @@ public override object this[string keyword] { if (null != value) { Keywords index = GetIndex(keyword); switch(index) { - case Keywords.ApplicationIntent: this.ApplicationIntent = ConvertToApplicationIntent(keyword, value); break; - case Keywords.ApplicationName: ApplicationName = ConvertToString(value); break; - case Keywords.AttachDBFilename: AttachDBFilename = ConvertToString(value); break; - case Keywords.CurrentLanguage: CurrentLanguage = ConvertToString(value); break; - case Keywords.DataSource: DataSource = ConvertToString(value); break; - case Keywords.FailoverPartner: FailoverPartner = ConvertToString(value); break; - case Keywords.InitialCatalog: InitialCatalog = ConvertToString(value); break; -// case Keywords.NamedConnection: NamedConnection = ConvertToString(value); break; - case Keywords.NetworkLibrary: NetworkLibrary = ConvertToString(value); break; - case Keywords.Password: Password = ConvertToString(value); break; - case Keywords.UserID: UserID = ConvertToString(value); break; - case Keywords.TransactionBinding: TransactionBinding = ConvertToString(value); break; - case Keywords.TypeSystemVersion: TypeSystemVersion = ConvertToString(value); break; - case Keywords.WorkstationID: WorkstationID = ConvertToString(value); break; - - case Keywords.ConnectTimeout: ConnectTimeout = ConvertToInt32(value); break; - case Keywords.LoadBalanceTimeout: LoadBalanceTimeout = ConvertToInt32(value); break; - case Keywords.MaxPoolSize: MaxPoolSize = ConvertToInt32(value); break; - case Keywords.MinPoolSize: MinPoolSize = ConvertToInt32(value); break; - case Keywords.PacketSize: PacketSize = ConvertToInt32(value); break; - - case Keywords.IntegratedSecurity: IntegratedSecurity = ConvertToIntegratedSecurity(value); break; - - case Keywords.Authentication: Authentication = ConvertToAuthenticationType(keyword, value); break; - case Keywords.ColumnEncryptionSetting: ColumnEncryptionSetting = ConvertToColumnEncryptionSetting(keyword, value); break; - case Keywords.AsynchronousProcessing: AsynchronousProcessing = ConvertToBoolean(value); break; + case Keywords.ApplicationIntent: this.ApplicationIntent = ConvertToApplicationIntent(keyword, value); break; + case Keywords.ApplicationName: ApplicationName = ConvertToString(value); break; + case Keywords.AttachDBFilename: AttachDBFilename = ConvertToString(value); break; + case Keywords.CurrentLanguage: CurrentLanguage = ConvertToString(value); break; + case Keywords.DataSource: DataSource = ConvertToString(value); break; + case Keywords.FailoverPartner: FailoverPartner = ConvertToString(value); break; + case Keywords.InitialCatalog: InitialCatalog = ConvertToString(value); break; +// case Keywords.NamedConnection: NamedConnection = ConvertToString(value); break; + case Keywords.NetworkLibrary: NetworkLibrary = ConvertToString(value); break; + case Keywords.Password: Password = ConvertToString(value); break; + case Keywords.UserID: UserID = ConvertToString(value); break; + case Keywords.TransactionBinding: TransactionBinding = ConvertToString(value); break; + case Keywords.TypeSystemVersion: TypeSystemVersion = ConvertToString(value); break; + case Keywords.WorkstationID: WorkstationID = ConvertToString(value); break; + + case Keywords.ConnectTimeout: ConnectTimeout = ConvertToInt32(value); break; + case Keywords.LoadBalanceTimeout: LoadBalanceTimeout = ConvertToInt32(value); break; + case Keywords.MaxPoolSize: MaxPoolSize = ConvertToInt32(value); break; + case Keywords.MinPoolSize: MinPoolSize = ConvertToInt32(value); break; + case Keywords.PacketSize: PacketSize = ConvertToInt32(value); break; + + case Keywords.IntegratedSecurity: IntegratedSecurity = ConvertToIntegratedSecurity(value); break; + + case Keywords.Authentication: Authentication = ConvertToAuthenticationType(keyword, value); break; + case Keywords.ColumnEncryptionSetting: ColumnEncryptionSetting = ConvertToColumnEncryptionSetting(keyword, value); break; + case Keywords.AsynchronousProcessing: AsynchronousProcessing = ConvertToBoolean(value); break; #pragma warning disable 618 // Obsolete ConnectionReset - case Keywords.ConnectionReset: ConnectionReset = ConvertToBoolean(value); break; + case Keywords.ConnectionReset: ConnectionReset = ConvertToBoolean(value); break; #pragma warning restore 618 - case Keywords.ContextConnection: ContextConnection = ConvertToBoolean(value); break; - case Keywords.Encrypt: Encrypt = ConvertToBoolean(value); break; - case Keywords.TrustServerCertificate: TrustServerCertificate = ConvertToBoolean(value); break; - case Keywords.Enlist: Enlist = ConvertToBoolean(value); break; - case Keywords.MultipleActiveResultSets: MultipleActiveResultSets = ConvertToBoolean(value); break; - case Keywords.MultiSubnetFailover: MultiSubnetFailover = ConvertToBoolean(value); break; - case Keywords.PersistSecurityInfo: PersistSecurityInfo = ConvertToBoolean(value); break; - case Keywords.Pooling: Pooling = ConvertToBoolean(value); break; - case Keywords.Replication: Replication = ConvertToBoolean(value); break; - case Keywords.UserInstance: UserInstance = ConvertToBoolean(value); break; - case Keywords.ConnectRetryCount: ConnectRetryCount = ConvertToInt32(value); break; - case Keywords.ConnectRetryInterval: ConnectRetryInterval = ConvertToInt32(value); break; + case Keywords.ContextConnection: ContextConnection = ConvertToBoolean(value); break; + case Keywords.Encrypt: Encrypt = ConvertToBoolean(value); break; + case Keywords.TrustServerCertificate: TrustServerCertificate = ConvertToBoolean(value); break; + case Keywords.Enlist: Enlist = ConvertToBoolean(value); break; + case Keywords.MultipleActiveResultSets: MultipleActiveResultSets = ConvertToBoolean(value); break; + case Keywords.MultiSubnetFailover: MultiSubnetFailover = ConvertToBoolean(value); break; + case Keywords.TransparentNetworkIPResolution: TransparentNetworkIPResolution = ConvertToBoolean(value); break; + case Keywords.PersistSecurityInfo: PersistSecurityInfo = ConvertToBoolean(value); break; + case Keywords.Pooling: Pooling = ConvertToBoolean(value); break; + case Keywords.Replication: Replication = ConvertToBoolean(value); break; + case Keywords.UserInstance: UserInstance = ConvertToBoolean(value); break; + case Keywords.ConnectRetryCount: ConnectRetryCount = ConvertToInt32(value); break; + case Keywords.ConnectRetryInterval: ConnectRetryInterval = ConvertToInt32(value); break; default: Debug.Assert(false, "unexpected keyword"); @@ -626,6 +633,19 @@ public bool MultiSubnetFailover { _multiSubnetFailover = value; } } + + [DisplayName(DbConnectionStringKeywords.TransparentNetworkIPResolution)] + [ResCategoryAttribute(Res.DataCategory_Source)] + [ResDescriptionAttribute(Res.DbConnectionString_TransparentNetworkIPResolution)] + [RefreshPropertiesAttribute(RefreshProperties.All)] + public bool TransparentNetworkIPResolution + { + get { return _transparentNetworkIPResolution; } + set { + SetValue(DbConnectionStringKeywords.TransparentNetworkIPResolution, value); + _transparentNetworkIPResolution = value; + } + } /* [DisplayName(DbConnectionStringKeywords.NamedConnection)] [ResCategoryAttribute(Res.DataCategory_NamedConnectionString)] @@ -882,44 +902,45 @@ internal override string ConvertValueToString(object value) { private object GetAt(Keywords index) { switch(index) { - case Keywords.ApplicationIntent: return this.ApplicationIntent; - case Keywords.ApplicationName: return ApplicationName; - case Keywords.AsynchronousProcessing: return AsynchronousProcessing; - case Keywords.AttachDBFilename: return AttachDBFilename; - case Keywords.ConnectTimeout: return ConnectTimeout; + case Keywords.ApplicationIntent: return this.ApplicationIntent; + case Keywords.ApplicationName: return ApplicationName; + case Keywords.AsynchronousProcessing: return AsynchronousProcessing; + case Keywords.AttachDBFilename: return AttachDBFilename; + case Keywords.ConnectTimeout: return ConnectTimeout; #pragma warning disable 618 // Obsolete ConnectionReset - case Keywords.ConnectionReset: return ConnectionReset; + case Keywords.ConnectionReset: return ConnectionReset; #pragma warning restore 618 - case Keywords.ContextConnection: return ContextConnection; - case Keywords.CurrentLanguage: return CurrentLanguage; - case Keywords.DataSource: return DataSource; - case Keywords.Encrypt: return Encrypt; - case Keywords.Enlist: return Enlist; - case Keywords.FailoverPartner: return FailoverPartner; - case Keywords.InitialCatalog: return InitialCatalog; - case Keywords.IntegratedSecurity: return IntegratedSecurity; - case Keywords.LoadBalanceTimeout: return LoadBalanceTimeout; - case Keywords.MultipleActiveResultSets: return MultipleActiveResultSets; - case Keywords.MaxPoolSize: return MaxPoolSize; - case Keywords.MinPoolSize: return MinPoolSize; - case Keywords.MultiSubnetFailover: return MultiSubnetFailover; -// case Keywords.NamedConnection: return NamedConnection; - case Keywords.NetworkLibrary: return NetworkLibrary; - case Keywords.PacketSize: return PacketSize; - case Keywords.Password: return Password; - case Keywords.PersistSecurityInfo: return PersistSecurityInfo; - case Keywords.Pooling: return Pooling; - case Keywords.Replication: return Replication; - case Keywords.TransactionBinding: return TransactionBinding; - case Keywords.TrustServerCertificate: return TrustServerCertificate; - case Keywords.TypeSystemVersion: return TypeSystemVersion; - case Keywords.UserID: return UserID; - case Keywords.UserInstance: return UserInstance; - case Keywords.WorkstationID: return WorkstationID; - case Keywords.ConnectRetryCount: return ConnectRetryCount; - case Keywords.ConnectRetryInterval: return ConnectRetryInterval; - case Keywords.Authentication: return Authentication; - case Keywords.ColumnEncryptionSetting: return ColumnEncryptionSetting; + case Keywords.ContextConnection: return ContextConnection; + case Keywords.CurrentLanguage: return CurrentLanguage; + case Keywords.DataSource: return DataSource; + case Keywords.Encrypt: return Encrypt; + case Keywords.Enlist: return Enlist; + case Keywords.FailoverPartner: return FailoverPartner; + case Keywords.InitialCatalog: return InitialCatalog; + case Keywords.IntegratedSecurity: return IntegratedSecurity; + case Keywords.LoadBalanceTimeout: return LoadBalanceTimeout; + case Keywords.MultipleActiveResultSets: return MultipleActiveResultSets; + case Keywords.MaxPoolSize: return MaxPoolSize; + case Keywords.MinPoolSize: return MinPoolSize; + case Keywords.MultiSubnetFailover: return MultiSubnetFailover; + case Keywords.TransparentNetworkIPResolution: return TransparentNetworkIPResolution; +// case Keywords.NamedConnection: return NamedConnection; + case Keywords.NetworkLibrary: return NetworkLibrary; + case Keywords.PacketSize: return PacketSize; + case Keywords.Password: return Password; + case Keywords.PersistSecurityInfo: return PersistSecurityInfo; + case Keywords.Pooling: return Pooling; + case Keywords.Replication: return Replication; + case Keywords.TransactionBinding: return TransactionBinding; + case Keywords.TrustServerCertificate: return TrustServerCertificate; + case Keywords.TypeSystemVersion: return TypeSystemVersion; + case Keywords.UserID: return UserID; + case Keywords.UserInstance: return UserInstance; + case Keywords.WorkstationID: return WorkstationID; + case Keywords.ConnectRetryCount: return ConnectRetryCount; + case Keywords.ConnectRetryInterval: return ConnectRetryInterval; + case Keywords.Authentication: return Authentication; + case Keywords.ColumnEncryptionSetting: return ColumnEncryptionSetting; default: Debug.Assert(false, "unexpected keyword"); throw ADP.KeywordNotSupported(_validKeywords[(int)index]); @@ -1036,6 +1057,9 @@ private void Reset(Keywords index) { case Keywords.MultiSubnetFailover: _multiSubnetFailover = DbConnectionStringDefaults.MultiSubnetFailover; break; + case Keywords.TransparentNetworkIPResolution: + _transparentNetworkIPResolution = DbConnectionStringDefaults.TransparentNetworkIPResolution; + break; // case Keywords.NamedConnection: // _namedConnection = DbConnectionStringDefaults.NamedConnection; // break; diff --git a/System.Data/System/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs b/System.Data/System/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs index c702b82b3..879a86d61 100644 --- a/System.Data/System/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs +++ b/System.Data/System/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient diff --git a/System.Data/System/Data/SqlClient/SqlCredential.cs b/System.Data/System/Data/SqlClient/SqlCredential.cs index 091753c6f..874ac5cc3 100644 --- a/System.Data/System/Data/SqlClient/SqlCredential.cs +++ b/System.Data/System/Data/SqlClient/SqlCredential.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient diff --git a/System.Data/System/Data/SqlClient/SqlDataAdapter.cs b/System.Data/System/Data/SqlClient/SqlDataAdapter.cs index b1f304cd7..11be2219a 100644 --- a/System.Data/System/Data/SqlClient/SqlDataAdapter.cs +++ b/System.Data/System/Data/SqlClient/SqlDataAdapter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlDataReader.cs b/System.Data/System/Data/SqlClient/SqlDataReader.cs index ed353411d..8e04c4225 100644 --- a/System.Data/System/Data/SqlClient/SqlDataReader.cs +++ b/System.Data/System/Data/SqlClient/SqlDataReader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -44,7 +44,7 @@ internal class SharedState { // parameters needed to execute cleanup from parser internal SharedState _sharedState = new SharedState(); - private TdsParser _parser; // + private TdsParser _parser; // TODO: Probably don't need this, since it's on the stateObj private TdsParserStateObject _stateObj; private SqlCommand _command; private SqlConnection _connection; @@ -1105,7 +1105,7 @@ virtual internal void CloseReaderFromConnection() { // CleanWire will do cleanup - so we don't really care about the snapshot CleanupAfterAsyncInvocationInternal(stateObj, resetNetworkPacketTaskSource: false); } - // Switch to sync to prepare for cleanwire + // Switch to [....] to prepare for cleanwire stateObj._syncOverAsync = true; // Remove owner (this will allow the stateObj to be disposed after the connection is closed) stateObj.RemoveOwner(); @@ -1282,13 +1282,26 @@ private Type GetFieldTypeInternal(_SqlMetaData metaData) { virtual internal int GetLocaleId(int i) { _SqlMetaData sqlMetaData = MetaData[i]; int lcid; - - if (sqlMetaData.collation != null) { - lcid = sqlMetaData.collation.LCID; + + if (sqlMetaData.cipherMD != null) { + // If this column is encrypted, get the collation from baseTI + // + if (sqlMetaData.baseTI.collation != null) { + lcid = sqlMetaData.baseTI.collation.LCID; + } + else { + lcid = 0; + } } else { - lcid = 0; + if (sqlMetaData.collation != null) { + lcid = sqlMetaData.collation.LCID; + } + else { + lcid = 0; + } } + return lcid; } @@ -1976,8 +1989,8 @@ override public long GetChars(int i, long dataIndex, char[] buffer, int bufferIn CheckDataIsReady(columnIndex: i, allowPartiallyReadColumn: true, methodName: "GetChars"); } catch (Exception ex) { - // Dev11 - + // Dev11 Bug #315513: Exception type breaking change from 4.0 RTM when calling GetChars on null xml + // We need to wrap all exceptions inside a TargetInvocationException to simulate calling CreateSqlReader via MethodInfo.Invoke if (ADP.IsCatchableExceptionType(ex)) { throw new TargetInvocationException(ex); } @@ -2413,8 +2426,8 @@ private object GetSqlValueInternal(int i) { // NOTE: This method is called by the fast-paths in Async methods and, therefore, should be resilient to the DataReader being closed // Always make sure to take reference copies of anything set to null in TryCloseInternal() private object GetSqlValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData metaData) { - // Dev11 - + // Dev11 Bug #336820, Dev10 Bug #479607 (SqlClient: IsDBNull always returns false for timestamp datatype) + // Due to a bug in TdsParser.GetNullSqlValue, Timestamps' IsNull is not correctly set - so we need to bypass the following check Debug.Assert(!data.IsEmpty || data.IsNull || metaData.type == SqlDbType.Timestamp, "Data has been read, but the buffer is empty"); // Convert Katmai types to string @@ -2566,8 +2579,8 @@ private object GetValueInternal(int i) { // NOTE: This method is called by the fast-paths in Async methods and, therefore, should be resilient to the DataReader being closed // Always make sure to take reference copies of anything set to null in TryCloseInternal() private object GetValueFromSqlBufferInternal(SqlBuffer data, _SqlMetaData metaData) { - // Dev11 - + // Dev11 Bug #336820, Dev10 Bug #479607 (SqlClient: IsDBNull always returns false for timestamp datatype) + // Due to a bug in TdsParser.GetNullSqlValue, Timestamps' IsNull is not correctly set - so we need to bypass the following check Debug.Assert(!data.IsEmpty || data.IsNull || metaData.type == SqlDbType.Timestamp, "Data has been read, but the buffer is empty"); if (_typeSystem <= SqlConnectionString.TypeSystem.SQLServer2005 && metaData.IsNewKatmaiDateTimeType) { @@ -2772,9 +2785,9 @@ private bool TryHasMoreResults(out bool moreResults) { moreResults = true; return true; - // VSTFDEVDIV 926281: DONEINPROC case is missing here; we have decided to reject this - - + // VSTFDEVDIV 926281: DONEINPROC case is missing here; we have decided to reject this bug as it would result in breaking change + // from Orcas RTM/SP1 and Dev10 RTM. See the bug for more details. + // case TdsEnums.DONEINPROC: case TdsEnums.SQLDONE: Debug.Assert(_altRowStatus == ALTROWSTATUS.Done || _altRowStatus == ALTROWSTATUS.Null, "invalid AltRowStatus"); _altRowStatus = ALTROWSTATUS.Null; @@ -2787,10 +2800,10 @@ private bool TryHasMoreResults(out bool moreResults) { return true; } - // Dev11 - - - + // Dev11 Bug 316483:Hang on SqlDataReader::TryHasMoreResults using MARS + // http://vstfdevdiv:8080/web/wi.aspx?pcguid=22f9acc9-569a-41ff-b6ac-fac1b6370209&id=316483 + // TryRun() will immediately return if the TdsParser is closed\broken, causing us to enter an infinite loop + // Instead, we will throw a closed connection exception if (_parser.State == TdsParserState.Broken || _parser.State == TdsParserState.Closed) { throw ADP.ClosedConnectionError(); } @@ -2826,8 +2839,8 @@ private bool TryHasMoreRows(out bool moreRows) { } if (_stateObj._pendingData) { // Consume error's, info's, done's on HasMoreRows, so user obtains error on Read. - // Previous - + // Previous bug where Read() would return false with error on the wire in the case + // of metadata and error immediately following. See MDAC 78285 and 75225. // @@ -2862,10 +2875,10 @@ private bool TryHasMoreRows(out bool moreRows) { ParsedDoneToken = true; } - // Dev11 - - - + // Dev11 Bug 316483:Hang on SqlDataReader::TryHasMoreResults using MARS + // http://vstfdevdiv:8080/web/wi.aspx?pcguid=22f9acc9-569a-41ff-b6ac-fac1b6370209&id=316483 + // TryRun() will immediately return if the TdsParser is closed\broken, causing us to enter an infinite loop + // Instead, we will throw a closed connection exception if (_parser.State == TdsParserState.Broken || _parser.State == TdsParserState.Closed) { throw ADP.ClosedConnectionError(); } @@ -2903,10 +2916,10 @@ private bool IsRowToken(byte token) { override public bool IsDBNull(int i) { if ((IsCommandBehavior(CommandBehavior.SequentialAccess)) && ((_sharedState._nextColumnHeaderToRead > i + 1) || (_lastColumnWithDataChunkRead > i))) { - // - - - + // Bug 447026 : A breaking change in System.Data .NET 4.5 for calling IsDBNull on commands in SequentialAccess mode + // http://vstfdevdiv:8080/web/wi.aspx?pcguid=22f9acc9-569a-41ff-b6ac-fac1b6370209&id=447026 + // In .Net 4.0 and previous, it was possible to read a previous column using IsDBNull when in sequential mode + // However, since it had already gone past the column, the current IsNull value is simply returned // To replicate this behavior we will skip CheckHeaderIsReady\ReadColumnHeader and instead just check that the reader is ready and the column is valid CheckMetaDataIsReady(columnIndex: i); @@ -3439,8 +3452,8 @@ private bool TryReadColumnInternal(int i, bool readHeaderOnly = false) { Debug.Assert(i == _sharedState._nextColumnDataToRead || // Either we haven't read the column yet ((i + 1 < _sharedState._nextColumnDataToRead) && (IsCommandBehavior(CommandBehavior.SequentialAccess))) || // Or we're in sequential mode and we've read way past the column (i.e. it was not the last column we read) (!_data[i].IsEmpty || _data[i].IsNull) || // Or we should have data stored for the column (unless the column was null) - (_metaData[i].type == SqlDbType.Timestamp), // Or Dev11 - // Due to a + (_metaData[i].type == SqlDbType.Timestamp), // Or Dev11 Bug #336820, Dev10 Bug #479607 (SqlClient: IsDBNull always returns false for timestamp datatype) + // Due to a bug in TdsParser.GetNullSqlValue, Timestamps' IsNull is not correctly set - so we need to bypass the check "Gone past column, be we have no data stored for it"); return true; } @@ -3497,7 +3510,7 @@ private bool TryReadColumnInternal(int i, bool readHeaderOnly = false) { _sharedState._nextColumnDataToRead = _sharedState._nextColumnHeaderToRead; _sharedState._nextColumnHeaderToRead++; // We read this one - if (isNull && columnMetaData.type != SqlDbType.Timestamp /* Maintain behavior for known */) + if (isNull && columnMetaData.type != SqlDbType.Timestamp /* Maintain behavior for known bug (Dev10 479607) rejected as breaking change - See comments in GetNullSqlValue for timestamp */) { TdsParser.GetNullSqlValue(_data[_sharedState._nextColumnDataToRead], columnMetaData, @@ -4342,7 +4355,7 @@ override public Task IsDBNullAsync(int i, CancellationToken cancellationTo return ADP.CreatedTaskWithCancellation(); } - // Shortcut - if we have enough data, then run sync + // Shortcut - if we have enough data, then run [....] try { if (WillHaveEnoughData(i, headerOnly: true)) { #if DEBUG @@ -4444,7 +4457,7 @@ override public Task GetFieldValueAsync(int i, CancellationToken cancellat return ADP.CreatedTaskWithCancellation(); } - // Shortcut - if we have enough data, then run sync + // Shortcut - if we have enough data, then run [....] try { if (WillHaveEnoughData(i)) { #if DEBUG @@ -4615,7 +4628,7 @@ private Task InvokeRetryable(Func> moreFunc, TaskCompletionS } if (task.IsCompleted) { - // If we've completed sync, then don't bother handling the TaskCompletionSource - we'll just return the completed task + // If we've completed [....], then don't bother handling the TaskCompletionSource - we'll just return the completed task CompleteRetryable(task, source, objectToDispose); return task; } diff --git a/System.Data/System/Data/SqlClient/SqlDataReaderSmi.cs b/System.Data/System/Data/SqlClient/SqlDataReaderSmi.cs index ded4479ff..4a46f64b6 100644 --- a/System.Data/System/Data/SqlClient/SqlDataReaderSmi.cs +++ b/System.Data/System/Data/SqlClient/SqlDataReaderSmi.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlDelegatedTransaction.cs b/System.Data/System/Data/SqlClient/SqlDelegatedTransaction.cs index dece80121..60edc0e40 100644 --- a/System.Data/System/Data/SqlClient/SqlDelegatedTransaction.cs +++ b/System.Data/System/Data/SqlClient/SqlDelegatedTransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -11,6 +11,7 @@ namespace System.Data.SqlClient { using System.Data.Common; using System.Data.SqlClient; using System.Diagnostics; + using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.ConstrainedExecution; using System.Threading; @@ -19,6 +20,7 @@ namespace System.Data.SqlClient { sealed internal class SqlDelegatedTransaction : SysTx.IPromotableSinglePhaseNotification { private static int _objectTypeCount; private readonly int _objectID = Interlocked.Increment(ref _objectTypeCount); + private const int _globalTransactionsTokenVersionSizeInBytes = 4; // the size of the version in the PromotedDTCToken for Global Transactions internal int ObjectID { get { return _objectID; @@ -163,6 +165,20 @@ public Byte [] Promote() { connection.ExecuteTransaction(SqlInternalConnection.TransactionRequest.Promote, null, IsolationLevel.Unspecified, _internalTransaction, true); returnValue = _connection.PromotedDTCToken; + + // For Global Transactions, we need to set the Transaction Id since we use a Non-MSDTC Promoter type. + if(_connection.IsGlobalTransaction) { + if (SysTxForGlobalTransactions.SetDistributedTransactionIdentifier == null) { + throw SQL.UnsupportedSysTxForGlobalTransactions(); + } + + if(!_connection.IsGlobalTransactionsEnabledForServer) { + throw SQL.GlobalTransactionsNotEnabled(); + } + + SysTxForGlobalTransactions.SetDistributedTransactionIdentifier.Invoke(_atomicTransaction, new object[] { this, GetGlobalTxnIdentifierFromToken() }); + } + promoteException = null; } catch (SqlException e) { @@ -453,5 +469,12 @@ private void ValidateActiveOnConnection(SqlInternalConnection connection) { } } + // Get the server-side Global Transaction Id from the PromotedDTCToken + // Skip first 4 bytes since they contain the version + private Guid GetGlobalTxnIdentifierFromToken() { + byte[] txnGuid = new byte[16]; + Array.Copy(_connection.PromotedDTCToken, _globalTransactionsTokenVersionSizeInBytes /* Skip the version */, txnGuid, 0, txnGuid.Length); + return new Guid(txnGuid); + } } } diff --git a/System.Data/System/Data/SqlClient/SqlDependency.cs b/System.Data/System/Data/SqlClient/SqlDependency.cs index c27b94cd0..fe13f0878 100644 --- a/System.Data/System/Data/SqlClient/SqlDependency.cs +++ b/System.Data/System/Data/SqlClient/SqlDependency.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlDependencyListener.cs b/System.Data/System/Data/SqlClient/SqlDependencyListener.cs index 656d0dd6d..9a11b63cb 100644 --- a/System.Data/System/Data/SqlClient/SqlDependencyListener.cs +++ b/System.Data/System/Data/SqlClient/SqlDependencyListener.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ using System; @@ -151,7 +151,7 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str _conversationGuidParam = new SqlParameter("@p1", SqlDbType.UniqueIdentifier); _timeoutParam = new SqlParameter("@p2", SqlDbType.Int); - _timeoutParam.Value = 0; // Timeout set to 0 for initial sync query. + _timeoutParam.Value = 0; // Timeout set to 0 for initial [....] query. _com.Parameters.Add(_timeoutParam); setupCompleted = true; @@ -160,7 +160,7 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str // Create standard query. _receiveQuery = "WAITFOR(RECEIVE TOP (1) message_type_name, conversation_handle, cast(message_body AS XML) as message_body from " + _escapedQueueName + "), TIMEOUT @p2;"; - // Create queue, service, sync query, and async query on user thread to ensure proper + // Create queue, service, [....] query, and async query on user thread to ensure proper // init prior to return. if (useDefaults) { // Only create if user did not specify service & database. @@ -179,7 +179,7 @@ internal SqlConnectionContainer(SqlConnectionContainerHashHelper hashHelper, str // Query synchronously once to ensure everything is working correctly. // We want the exception to occur on start to immediately inform caller. SynchronouslyQueryServiceBrokerQueue(); - _timeoutParam.Value = _defaultWaitforTimeout; // Sync successful, extend timeout to 60 seconds. + _timeoutParam.Value = _defaultWaitforTimeout; // [....] successful, extend timeout to 60 seconds. AsynchronouslyQueryServiceBrokerQueue(); } catch (Exception e) { diff --git a/System.Data/System/Data/SqlClient/SqlDependencyUtils.cs b/System.Data/System/Data/SqlClient/SqlDependencyUtils.cs index ccd6d84f7..ae91e9644 100644 --- a/System.Data/System/Data/SqlClient/SqlDependencyUtils.cs +++ b/System.Data/System/Data/SqlClient/SqlDependencyUtils.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -179,7 +179,7 @@ internal string AddCommandEntry(string commandHash, SqlDependency dep) { { // this should not happen since _commandHashToNotificationId and _notificationIdToDependenciesHash are always // updated together - Debug.Assert(false, "_commandHashToNotificationId has entries that were removed from _notificationIdToDependenciesHash. Remember to keep them in sync"); + Debug.Assert(false, "_commandHashToNotificationId has entries that were removed from _notificationIdToDependenciesHash. Remember to keep them in [....]"); throw ADP.InternalError(ADP.InternalErrorCode.SqlDependencyCommandHashIsNotAssociatedWithNotification); } @@ -217,7 +217,7 @@ internal string AddCommandEntry(string commandHash, SqlDependency dep) { } - Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in sync!"); + Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in [....]!"); } } } @@ -402,7 +402,7 @@ private List LookupCommandEntryWithRemove(string notificationId) Bid.NotificationsTrace(" Entries NOT found in hashtable.\n"); } - Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in sync!"); + Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in [....]!"); } return entry; // DependencyList inherits from List @@ -436,7 +436,7 @@ private void RemoveDependencyFromCommandToDependenciesHash(SqlDependency depende // same SqlDependency can be associated with more than one command, so we have to continue till the end... } - Debug.Assert(commandHashesToRemove.Count == notificationIdsToRemove.Count, "maps should be kept in sync"); + Debug.Assert(commandHashesToRemove.Count == notificationIdsToRemove.Count, "maps should be kept in [....]"); for (int i = 0; i < notificationIdsToRemove.Count; i++ ) { // cleanup the entry outside of foreach // do it inside finally block to avoid ThreadAbort exception interrupt this operation @@ -448,7 +448,7 @@ private void RemoveDependencyFromCommandToDependenciesHash(SqlDependency depende } } - Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in sync!"); + Debug.Assert(_notificationIdToDependenciesHash.Count == _commandHashToNotificationId.Count, "always keep these maps in [....]!"); } } finally { diff --git a/System.Data/System/Data/SqlClient/SqlEnums.cs b/System.Data/System/Data/SqlClient/SqlEnums.cs index ea4a9a88b..da0013b80 100644 --- a/System.Data/System/Data/SqlClient/SqlEnums.cs +++ b/System.Data/System/Data/SqlClient/SqlEnums.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlError.cs b/System.Data/System/Data/SqlClient/SqlError.cs index 4e65e159d..9b4d5ee36 100644 --- a/System.Data/System/Data/SqlClient/SqlError.cs +++ b/System.Data/System/Data/SqlClient/SqlError.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -15,8 +15,8 @@ namespace System.Data.SqlClient { [Serializable] public sealed class SqlError { - // - + // bug fix - MDAC 48965 - missing source of exception + // fixed by [....] private string source = TdsEnums.SQL_PROVIDER_NAME; private int number; private byte state; @@ -51,17 +51,17 @@ internal SqlError(int infoNumber, byte errorState, byte errorClass, string serve this.win32ErrorCode = 0; } - // - - - + // bug fix - MDAC #49280 - SqlError does not implement ToString(); + // I did not include an exception stack because the correct exception stack is only available + // on SqlException, and to obtain that the SqlError would have to have backpointers all the + // way back to SqlException. If the user needs a call stack, they can obtain it on SqlException. public override string ToString() { //return this.GetType().ToString() + ": " + this.message; return typeof(SqlError).ToString() + ": " + this.message; // since this is sealed so we can change GetType to typeof } - // - + // bug fix - MDAC #48965 - missing source of exception + // fixed by [....] public string Source { get { return this.source;} } diff --git a/System.Data/System/Data/SqlClient/SqlErrorCollection.cs b/System.Data/System/Data/SqlClient/SqlErrorCollection.cs index 18ea5d808..143be5fa3 100644 --- a/System.Data/System/Data/SqlClient/SqlErrorCollection.cs +++ b/System.Data/System/Data/SqlClient/SqlErrorCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlException.cs b/System.Data/System/Data/SqlClient/SqlException.cs index 72dab1c0a..2da09347a 100644 --- a/System.Data/System/Data/SqlClient/SqlException.cs +++ b/System.Data/System/Data/SqlClient/SqlException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs b/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs index 1e3eadb40..51e69e9dd 100644 --- a/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs +++ b/System.Data/System/Data/SqlClient/SqlInfoMessageEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlInternalConnection.cs b/System.Data/System/Data/SqlClient/SqlInternalConnection.cs index 386a6cea5..6221416a1 100644 --- a/System.Data/System/Data/SqlClient/SqlInternalConnection.cs +++ b/System.Data/System/Data/SqlClient/SqlInternalConnection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient @@ -30,7 +30,11 @@ abstract internal class SqlInternalConnection : DbConnectionInternal { private bool _isEnlistedInTransaction; // is the server-side connection enlisted? true while we're enlisted, reset only after we send a null... private byte[] _promotedDTCToken; // token returned by the server when we promote transaction private byte[] _whereAbouts; // cache the whereabouts (DTC Address) for exporting - + + private bool _isGlobalTransaction = false; // Whether this is a Global Transaction (Non-MSDTC, Azure SQL DB Transaction) + private bool _isGlobalTransactionEnabledForServer = false; // Whether Global Transactions are enabled for this Azure SQL DB Server + private static readonly Guid _globalTransactionTMID = new Guid("1c742caf-6680-40ea-9c26-6b6846079764"); // ID of the Non-MSDTC, Azure SQL DB Transaction Manager + // if connection is not open: null // if connection is open: currently active database internal string CurrentDatabase { get; set; } @@ -147,7 +151,25 @@ internal byte[] PromotedDTCToken { _promotedDTCToken = value; } } - + + internal bool IsGlobalTransaction { + get { + return _isGlobalTransaction; + } + set { + _isGlobalTransaction = value; + } + } + + internal bool IsGlobalTransactionsEnabledForServer { + get { + return _isGlobalTransactionEnabledForServer; + } + set { + _isGlobalTransactionEnabledForServer = value; + } + } + override public DbTransaction BeginTransaction(IsolationLevel iso) { return BeginSqlTransaction(iso, null, false); } @@ -389,8 +411,35 @@ private void EnlistNonNull(SysTx.Transaction tx) { // our delegated transaction, and proceed to enlist // in the promoted one. - if (tx.EnlistPromotableSinglePhase(delegatedTransaction)) { - hasDelegatedTransaction = true; + // NOTE: Global Transactions is an Azure SQL DB only + // feature where the Transaction Manager (TM) is not + // MS-DTC. Sys.Tx added APIs to support Non MS-DTC + // promoter types/TM in .NET 4.6.1. Following directions + // from .NETFX shiproom, to avoid a "hard-dependency" + // (compile time) on Sys.Tx, we use reflection to invoke + // the new APIs. Further, the _isGlobalTransaction flag + // indicates that this is an Azure SQL DB Transaction + // that could be promoted to a Global Transaction (it's + // always false for on-prem Sql Server). The Promote() + // call in SqlDelegatedTransaction makes sure that the + // right Sys.Tx.dll is loaded and that Global Transactions + // are actually allowed for this Azure SQL DB. + + if (_isGlobalTransaction) { + if (SysTxForGlobalTransactions.EnlistPromotableSinglePhase == null) { + // This could be a local Azure SQL DB transaction. + hasDelegatedTransaction = tx.EnlistPromotableSinglePhase(delegatedTransaction); + } + else { + hasDelegatedTransaction = (bool)SysTxForGlobalTransactions.EnlistPromotableSinglePhase.Invoke(tx, new object[] { delegatedTransaction, _globalTransactionTMID }); + } + } + else { + // This is an MS-DTC distributed transaction + hasDelegatedTransaction = tx.EnlistPromotableSinglePhase(delegatedTransaction); + } + + if (hasDelegatedTransaction) { this.DelegatedTransaction = delegatedTransaction; @@ -438,16 +487,25 @@ private void EnlistNonNull(SysTx.Transaction tx) { byte[] cookie = null; - if (null == _whereAbouts) { - byte[] dtcAddress = GetDTCAddress(); + if (_isGlobalTransaction) { + if (SysTxForGlobalTransactions.GetPromotedToken == null) { + throw SQL.UnsupportedSysTxForGlobalTransactions(); + } + + cookie = (byte[])SysTxForGlobalTransactions.GetPromotedToken.Invoke(tx, null); + } + else { + if (null == _whereAbouts) { + byte[] dtcAddress = GetDTCAddress(); + + if (null == dtcAddress) { + throw SQL.CannotGetDTCAddress(); + } + _whereAbouts = dtcAddress; + } - if (null == dtcAddress) { - throw SQL.CannotGetDTCAddress(); - } - _whereAbouts = dtcAddress; + cookie = GetTransactionCookie(tx, _whereAbouts); } - - cookie = GetTransactionCookie(tx, _whereAbouts); // send cookie to server to finish enlistment PropagateTransactionCookie(cookie); diff --git a/System.Data/System/Data/SqlClient/SqlInternalConnectionSmi.cs b/System.Data/System/Data/SqlClient/SqlInternalConnectionSmi.cs index becb5962e..167727734 100644 --- a/System.Data/System/Data/SqlClient/SqlInternalConnectionSmi.cs +++ b/System.Data/System/Data/SqlClient/SqlInternalConnectionSmi.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlInternalConnectionTds.cs b/System.Data/System/Data/SqlClient/SqlInternalConnectionTds.cs index d8c893d6c..c07b195ac 100644 --- a/System.Data/System/Data/SqlClient/SqlInternalConnectionTds.cs +++ b/System.Data/System/Data/SqlClient/SqlInternalConnectionTds.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient @@ -168,6 +168,8 @@ sealed internal class SqlInternalConnectionTds : SqlInternalConnection, IDisposa private readonly TimeoutTimer _timeout; + private static HashSet transientErrors = new HashSet(); + internal SessionData CurrentSessionData { get { if (_currentSessionData != null) { @@ -299,6 +301,11 @@ internal SqlConnectionTimeoutErrorInternal TimeoutErrorInternal private Guid _originalClientConnectionId = Guid.Empty; private string _routingDestination = null; + static SqlInternalConnectionTds() + { + populateTransientErrors(); + } + // although the new password is generally not used it must be passed to the c'tor // the new Login7 packet will always write out the new password (or a length of zero and no bytes if not present) // @@ -313,7 +320,9 @@ internal SqlInternalConnectionTds( SqlConnectionString userConnectionOptions = null, // NOTE: userConnectionOptions may be different to connectionOptions if the connection string has been expanded (see SqlConnectionString.Expand) SessionData reconnectSessionData = null, DbConnectionPool pool = null, - string accessToken = null) : base(connectionOptions) { + string accessToken = null, + bool applyTransientFaultHandling = false + ) : base(connectionOptions) { #if DEBUG if (reconnectSessionData != null) { @@ -388,7 +397,33 @@ internal SqlInternalConnectionTds( { #endif //DEBUG _timeout = TimeoutTimer.StartSecondsTimeout(connectionOptions.ConnectTimeout); - OpenLoginEnlist(_timeout, connectionOptions, credential, newPassword, newSecurePassword, redirectedUserInstance); + + // If transient fault handling is enabled then we can retry the login upto the ConnectRetryCount. + int connectionEstablishCount = applyTransientFaultHandling ? connectionOptions.ConnectRetryCount + 1 : 1; + int transientRetryIntervalInMilliSeconds = connectionOptions.ConnectRetryInterval * 1000; // Max value of transientRetryInterval is 60*1000 ms. The max value allowed for ConnectRetryInterval is 60 + for (int i = 0; i < connectionEstablishCount; i++) + { + try + { + OpenLoginEnlist(_timeout, connectionOptions, credential, newPassword, newSecurePassword, redirectedUserInstance); + break; + } + catch (SqlException sqlex) + { + if (i + 1 == connectionEstablishCount + || !applyTransientFaultHandling + || _timeout.IsExpired + || _timeout.MillisecondsRemaining < transientRetryIntervalInMilliSeconds + || !IsTransientError(sqlex)) + { + throw sqlex; + } + else + { + Thread.Sleep(transientRetryIntervalInMilliSeconds); + } + } + } } #if DEBUG finally { @@ -416,7 +451,61 @@ internal SqlInternalConnectionTds( Bid.Trace(" %d#, constructed new TDS internal connection\n", ObjectID); } } - + + // The erros in the transient error set are contained in + // https://azure.microsoft.com/en-us/documentation/articles/sql-database-develop-error-messages/#transient-faults-connection-loss-and-other-temporary-errors + private static void populateTransientErrors() + { + // SQL Error Code: 4060 + // Cannot open database "%.*ls" requested by the login. The login failed. + transientErrors.Add(4060); + // SQL Error Code: 10928 + // Resource ID: %d. The %s limit for the database is %d and has been reached. + transientErrors.Add(10928); + // SQL Error Code: 10929 + // Resource ID: %d. The %s minimum guarantee is %d, maximum limit is %d and the current usage for the database is %d. + // However, the server is currently too busy to support requests greater than %d for this database. + transientErrors.Add(10929); + // SQL Error Code: 40197 + // You will receive this error, when the service is down due to software or hardware upgrades, hardware failures, + // or any other failover problems. The error code (%d) embedded within the message of error 40197 provides + // additional information about the kind of failure or failover that occurred. Some examples of the error codes are + // embedded within the message of error 40197 are 40020, 40143, 40166, and 40540. + transientErrors.Add(40197); + transientErrors.Add(40020); + transientErrors.Add(40143); + transientErrors.Add(40166); + // The service has encountered an error processing your request. Please try again. + transientErrors.Add(40540); + // The service is currently busy. Retry the request after 10 seconds. Incident ID: %ls. Code: %d. + transientErrors.Add(40501); + // Database '%.*ls' on server '%.*ls' is not currently available. Please retry the connection later. + // If the problem persists, contact customer support, and provide them the session tracing ID of '%.*ls'. + transientErrors.Add(40613); + // Do federation errors deserve to be here ? + // Note: Federation errors 10053 and 10054 might also deserve inclusion in your retry logic. + //transientErrors.Add(10053); + //transientErrors.Add(10054); + } + + + // Returns true if the Sql error is a transient. + private bool IsTransientError(SqlException exc) + { + if (exc == null) + { + return false; + } + foreach (SqlError error in exc.Errors) + { + if (transientErrors.Contains(error.Number)) + { + return true; + } + } + return false; + } + internal Guid ClientConnectionId { get { return _clientConnectionId; @@ -1229,8 +1318,8 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword, _federatedAuthenticationRequested = true; } - // The TCE feature is implicitly requested - requestedFeatures |= TdsEnums.FeatureExtension.Tce; + // The TCE and GLOBALTRANSACTIONS feature are implicitly requested + requestedFeatures |= TdsEnums.FeatureExtension.Tce | TdsEnums.FeatureExtension.GlobalTransactions; _parser.TdsLogin(login, requestedFeatures, _recoverySessionData, _fedAuthFeatureExtensionData); } @@ -1339,8 +1428,9 @@ private void LoginNoFailover(ServerInfo serverInfo, string newPassword, SecureSt ResolveExtendedServerName(serverInfo, !redirectedUserInstance, connectionOptions); long timeoutUnitInterval = 0; + Boolean isParallel = connectionOptions.MultiSubnetFailover || connectionOptions.TransparentNetworkIPResolution; - if (connectionOptions.MultiSubnetFailover) { + if(isParallel) { // Determine unit interval if (timeout.IsInfinite) { timeoutUnitInterval = checked((long)(ADP.FailoverTimeoutStep * (1000L * ADP.DefaultConnectionTimeout))); @@ -1360,9 +1450,11 @@ private void LoginNoFailover(ServerInfo serverInfo, string newPassword, SecureSt // back into the parser for the error cases. int attemptNumber = 0; TimeoutTimer intervalTimer = null; + TimeoutTimer firstTransparentAttemptTimeout = TimeoutTimer.StartMillisecondsTimeout(ADP.FirstTransparentAttemptTimeout); + TimeoutTimer attemptOneLoginTimeout = timeout; while(true) { - if (connectionOptions.MultiSubnetFailover) { + if(isParallel) { attemptNumber++; // Set timeout for this attempt, but don't exceed original timer long nextTimeoutInterval = checked(timeoutUnitInterval * attemptNumber); @@ -1385,14 +1477,26 @@ private void LoginNoFailover(ServerInfo serverInfo, string newPassword, SecureSt // + Boolean isFirstTransparentAttempt = connectionOptions.TransparentNetworkIPResolution && attemptNumber == 1; + + if(isFirstTransparentAttempt) { + attemptOneLoginTimeout = firstTransparentAttemptTimeout; + } + else { + if(isParallel) { + attemptOneLoginTimeout = intervalTimer; + } + } + AttemptOneLogin( serverInfo, newPassword, newSecurePassword, - !connectionOptions.MultiSubnetFailover, // ignore timeout for SniOpen call unless MSF - connectionOptions.MultiSubnetFailover ? intervalTimer : timeout); + !isParallel, // ignore timeout for SniOpen call unless MSF , and TNIR + attemptOneLoginTimeout, + isFirstTransparentAttempt:isFirstTransparentAttempt); if (connectionOptions.MultiSubnetFailover && null != ServerProvidedFailOverPartner) { - // connection succeeded: trigger exception if server sends failover partner and MultiSubnetFailover is used + // connection succeeded: trigger exception if server sends failover partner and MultiSubnetFailover is used. throw SQL.MultiSubnetFailoverWithFailoverPartner(serverProvidedFailoverPartner: true, internalConnection: this); } @@ -1710,7 +1814,7 @@ private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup, } // Common code path for making one attempt to establish a connection and log in to server. - private void AttemptOneLogin(ServerInfo serverInfo, string newPassword, SecureString newSecurePassword, bool ignoreSniOpenTimeout, TimeoutTimer timeout, bool withFailover = false) { + private void AttemptOneLogin(ServerInfo serverInfo, string newPassword, SecureString newSecurePassword, bool ignoreSniOpenTimeout, TimeoutTimer timeout, bool withFailover = false, bool isFirstTransparentAttempt = true) { if (Bid.AdvancedOn) { Bid.Trace(" %d#, timout=%I64d{msec}, server=", ObjectID, timeout.MillisecondsRemaining); Bid.PutStr(serverInfo.ExtendedServerName); @@ -1729,6 +1833,7 @@ private void AttemptOneLogin(ServerInfo serverInfo, string newPassword, SecureSt ConnectionOptions.TrustServerCertificate, ConnectionOptions.IntegratedSecurity, withFailover, + isFirstTransparentAttempt, ConnectionOptions.Authentication); timeoutErrorInternal.EndPhase(SqlConnectionTimeoutErrorPhase.ConsumePreLoginHandshake); @@ -2338,6 +2443,23 @@ internal void OnFeatureExtAck(int featureId, byte[] data) { break; } + case TdsEnums.FEATUREEXT_GLOBALTRANSACTIONS: { + if (Bid.AdvancedOn) { + Bid.Trace(" %d#, Received feature extension acknowledgement for GlobalTransactions\n", ObjectID); + } + + if (data.Length < 1) { + Bid.Trace(" %d#, Unknown version number for GlobalTransactions\n", ObjectID); + throw SQL.ParsingError(ParsingErrorState.CorruptedTdsStream); + } + + IsGlobalTransaction = true; + if (1 == data[0]) { + IsGlobalTransactionsEnabledForServer = true; + } + break; + } + default: { // Unknown feature ack throw SQL.ParsingErrorFeatureId(ParsingErrorState.UnknownFeatureAck, featureId); diff --git a/System.Data/System/Data/SqlClient/SqlNotificationEventArgs.cs b/System.Data/System/Data/SqlClient/SqlNotificationEventArgs.cs index 590e7bfe3..89498fc18 100644 --- a/System.Data/System/Data/SqlClient/SqlNotificationEventArgs.cs +++ b/System.Data/System/Data/SqlClient/SqlNotificationEventArgs.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlParameter.cs b/System.Data/System/Data/SqlClient/SqlParameter.cs index 155094a3f..9b238a470 100644 --- a/System.Data/System/Data/SqlClient/SqlParameter.cs +++ b/System.Data/System/Data/SqlClient/SqlParameter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -345,7 +345,7 @@ private SqlMetaData MetaData { maxlen = (long)mt.FixedLength; } else if (Size > 0 || Size < 0) { - maxlen = Size; // + maxlen = Size; // Bug Fix: 302768, 302695, 302694, 302693 } else { maxlen = MSS.SmiMetaData.GetDefaultForType( mt.SqlDbType ).MaxLength; @@ -1532,32 +1532,32 @@ internal void Validate(int index, bool isCommandProc) { // byte length and a parameter length > than that expressable in 2 bytes internal MetaType ValidateTypeLengths(bool yukonOrNewer) { MetaType mt = InternalMetaType; - // MDAC - - - - + // MDAC bug #50839 + #52829 : Since the server will automatically reject any + // char, varchar, binary, varbinary, nchar, or nvarchar parameter that has a + // byte sizeInCharacters > 8000 bytes, we promote the parameter to image, text, or ntext. This + // allows the user to specify a parameter type using a COM+ datatype and be able to + // use that parameter against a BLOB column. if ((SqlDbType.Udt != mt.SqlDbType) && (false == mt.IsFixed) && (false == mt.IsLong)) { // if type has 2 byte length long actualSizeInBytes = this.GetActualSize(); long sizeInCharacters = this.Size; - // - - - - - - - - - - - - - - - - + // Bug: VSTFDevDiv #636867 + // Notes: + // 'actualSizeInBytes' is the size of value passed; + // 'sizeInCharacters' is the parameter size; + // 'actualSizeInBytes' is in bytes; + // 'this.Size' is in charaters; + // 'sizeInCharacters' is in characters; + // 'TdsEnums.TYPE_SIZE_LIMIT' is in bytes; + // For Non-NCharType and for non-Yukon or greater variables, size should be maintained; + // Reverting changes from bug VSTFDevDiv # 479739 as it caused an regression; + // Modifed variable names from 'size' to 'sizeInCharacters', 'actualSize' to 'actualSizeInBytes', and + // 'maxSize' to 'maxSizeInBytes' + // The idea is to + // 1) revert the regression from bug 479739 + // 2) fix as many scenarios as possible including bug 636867 + // 3) cause no additional regression from 3.5 sp1 + // Keeping these goals in mind - the following are the changes we are making long maxSizeInBytes = 0; if ((mt.IsNCharType) && (yukonOrNewer)) diff --git a/System.Data/System/Data/SqlClient/SqlParameterCollection.cs b/System.Data/System/Data/SqlClient/SqlParameterCollection.cs index a89514591..4367bc7a6 100644 --- a/System.Data/System/Data/SqlClient/SqlParameterCollection.cs +++ b/System.Data/System/Data/SqlClient/SqlParameterCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlReferenceCollection.cs b/System.Data/System/Data/SqlClient/SqlReferenceCollection.cs index c50e7ea4f..e26069f2d 100644 --- a/System.Data/System/Data/SqlClient/SqlReferenceCollection.cs +++ b/System.Data/System/Data/SqlClient/SqlReferenceCollection.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Data/System/Data/SqlClient/SqlRowUpdatedEvent.cs b/System.Data/System/Data/SqlClient/SqlRowUpdatedEvent.cs index a0ff53b1f..75d370323 100644 --- a/System.Data/System/Data/SqlClient/SqlRowUpdatedEvent.cs +++ b/System.Data/System/Data/SqlClient/SqlRowUpdatedEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlRowUpdatingEvent.cs b/System.Data/System/Data/SqlClient/SqlRowUpdatingEvent.cs index 2233e9dff..6d3bcd921 100644 --- a/System.Data/System/Data/SqlClient/SqlRowUpdatingEvent.cs +++ b/System.Data/System/Data/SqlClient/SqlRowUpdatingEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlSequentialTextReader.cs b/System.Data/System/Data/SqlClient/SqlSequentialTextReader.cs index 8236a519b..d5e60712a 100644 --- a/System.Data/System/Data/SqlClient/SqlSequentialTextReader.cs +++ b/System.Data/System/Data/SqlClient/SqlSequentialTextReader.cs @@ -180,7 +180,7 @@ public override Task ReadAsync(char[] buffer, int index, int count) byteBufferUsed += bytesRead; } else { - // We need more data - setup the callback, and mark this as not completed sync + // We need more data - setup the callback, and mark this as not completed [....] completedSynchronously = false; getBytesTask.ContinueWith((t) => { diff --git a/System.Data/System/Data/SqlClient/SqlStatistics.cs b/System.Data/System/Data/SqlClient/SqlStatistics.cs index 688fe4f3d..be518346a 100644 --- a/System.Data/System/Data/SqlClient/SqlStatistics.cs +++ b/System.Data/System/Data/SqlClient/SqlStatistics.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/SqlClient/SqlStream.cs b/System.Data/System/Data/SqlClient/SqlStream.cs index e80bd516e..6fa190091 100644 --- a/System.Data/System/Data/SqlClient/SqlStream.cs +++ b/System.Data/System/Data/SqlClient/SqlStream.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -244,8 +244,8 @@ private int ReadBytes(byte[] buffer, int offset, int count) { } internal XmlReader ToXmlReader() { - // Dev11 - + // Dev11 Bug #315513: Exception type breaking change from 4.0 RTM when calling GetChars on null xml + // We need to wrap all exceptions inside a TargetInvocationException to simulate calling CreateSqlReader via MethodInfo.Invoke return SqlTypes.SqlXml.CreateSqlXmlReader(this, closeInput: true, throwTargetInvocationExceptions: true); } diff --git a/System.Data/System/Data/SqlClient/SqlTransaction.cs b/System.Data/System/Data/SqlClient/SqlTransaction.cs index e7927edf1..ff02ce923 100644 --- a/System.Data/System/Data/SqlClient/SqlTransaction.cs +++ b/System.Data/System/Data/SqlClient/SqlTransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlUdtInfo.cs b/System.Data/System/Data/SqlClient/SqlUdtInfo.cs index a97f766bf..cfde73a6f 100644 --- a/System.Data/System/Data/SqlClient/SqlUdtInfo.cs +++ b/System.Data/System/Data/SqlClient/SqlUdtInfo.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All Rights Reserved. // Information Contained Herein is Proprietary and Confidential. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/SqlUtil.cs b/System.Data/System/Data/SqlClient/SqlUtil.cs index cd3e0b91b..d12fb655c 100644 --- a/System.Data/System/Data/SqlClient/SqlUtil.cs +++ b/System.Data/System/Data/SqlClient/SqlUtil.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -835,16 +835,115 @@ static internal Exception NullCertificatePath(string[] validLocations, bool isSy } } + static internal Exception NullCspKeyPath(bool isSystemOp) { + if (isSystemOp) { + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, Res.GetString(Res.TCE_NullCspPathSysErr, @"/")); + } + else { + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, Res.GetString(Res.TCE_NullCspPath, @"/")); + } + } + + static internal Exception NullCngKeyPath(bool isSystemOp) { + if (isSystemOp) { + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, Res.GetString(Res.TCE_NullCngPathSysErr, @"/")); + } + else { + return ADP.ArgumentNull(TdsEnums.TCE_PARAM_MASTERKEY_PATH, Res.GetString(Res.TCE_NullCngPath, @"/")); + } + } + static internal Exception InvalidCertificatePath(string actualCertificatePath, string[] validLocations, bool isSystemOp) { Debug.Assert(2 == validLocations.Length); if (isSystemOp) { return ADP.Argument(Res.GetString(Res.TCE_InvalidCertificatePathSysErr, actualCertificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); - } + } else { return ADP.Argument(Res.GetString(Res.TCE_InvalidCertificatePath, actualCertificatePath, validLocations[0], validLocations[1], @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); } } + static internal Exception InvalidCspPath(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspPathSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspPath, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception InvalidCngPath(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCngPathSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCngPath, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception EmptyCspName(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCspNameSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCspName, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception EmptyCngName(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCngNameSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCngName, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception EmptyCspKeyId(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCspKeyIdSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCspKeyId, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception EmptyCngKeyId(string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCngKeyIdSysErr, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_EmptyCngKeyId, masterKeyPath, @"/"), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception InvalidCspName(string cspName, string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspNameSysErr, cspName, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspName, cspName, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception InvalidCspKeyIdentifier(string keyIdentifier, string masterKeyPath, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspKeyIdSysErr, keyIdentifier, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCspKeyId, keyIdentifier, masterKeyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + + static internal Exception InvalidCngKey(string masterKeyPath, string cngProviderName, string keyIdentifier, bool isSystemOp) { + if (isSystemOp) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCngKeySysErr, masterKeyPath, cngProviderName, keyIdentifier), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + else { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCngKey, masterKeyPath, cngProviderName, keyIdentifier), TdsEnums.TCE_PARAM_MASTERKEY_PATH); + } + } + static internal Exception InvalidCertificateLocation(string certificateLocation, string certificatePath, string[] validLocations, bool isSystemOp) { Debug.Assert(2 == validLocations.Length); if (isSystemOp) { @@ -890,14 +989,34 @@ static internal Exception InvalidCiphertextLengthInEncryptedCEK(int actual, int return ADP.Argument(Res.GetString(Res.TCE_InvalidCiphertextLengthInEncryptedCEK, actual, expected, certificateName), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } + static internal Exception InvalidCiphertextLengthInEncryptedCEKCsp(int actual, int expected, string masterKeyPath) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCiphertextLengthInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + } + + static internal Exception InvalidCiphertextLengthInEncryptedCEKCng(int actual, int expected, string masterKeyPath) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidCiphertextLengthInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + } + static internal Exception InvalidSignatureInEncryptedCEK(int actual, int expected, string masterKeyPath) { return ADP.Argument(Res.GetString(Res.TCE_InvalidSignatureInEncryptedCEK, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } + static internal Exception InvalidSignatureInEncryptedCEKCsp(int actual, int expected, string masterKeyPath) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidSignatureInEncryptedCEKCsp, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + } + + static internal Exception InvalidSignatureInEncryptedCEKCng(int actual, int expected, string masterKeyPath) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidSignatureInEncryptedCEKCng, actual, expected, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + } + static internal Exception InvalidCertificateSignature(string certificatePath) { return ADP.Argument(Res.GetString(Res.TCE_InvalidCertificateSignature, certificatePath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); } + static internal Exception InvalidSignature(string masterKeyPath) { + return ADP.Argument(Res.GetString(Res.TCE_InvalidSignature, masterKeyPath), TdsEnums.TCE_PARAM_ENCRYPTED_CEK); + } + static internal Exception CertificateWithNoPrivateKey(string keyPath, bool isSystemOp) { if (isSystemOp) { return ADP.Argument(Res.GetString(Res.TCE_CertificateWithNoPrivateKeySysErr, keyPath), TdsEnums.TCE_PARAM_MASTERKEY_PATH); @@ -1109,6 +1228,17 @@ static internal Exception OpenResultCountExceeded() { return ADP.InvalidOperation(Res.GetString(Res.SQL_OpenResultCountExceeded)); } + // + // Global Transactions. + // + static internal Exception GlobalTransactionsNotEnabled() { + return ADP.InvalidOperation(Res.GetString(Res.GT_Disabled)); + } + + static internal Exception UnsupportedSysTxForGlobalTransactions() { + return ADP.InvalidOperation(Res.GetString(Res.GT_UnsupportedSysTxVersion)); + } + static internal readonly byte[] AttentionHeader = new byte[] { TdsEnums.MT_ATTN, // Message Type TdsEnums.ST_EOM, // Status @@ -1521,4 +1651,50 @@ static internal string MakeStringLiteral(string input) { } } } + + /// + /// This class holds methods invoked on System.Transactions through reflection for Global Transactions + /// + static internal class SysTxForGlobalTransactions { + + private static readonly Lazy _enlistPromotableSinglePhase = new Lazy(() => + typeof(SysTx.Transaction).GetMethod("EnlistPromotableSinglePhase", new Type[] {typeof(SysTx.IPromotableSinglePhaseNotification), typeof(Guid)})); + + private static readonly Lazy _setDistributedTransactionIdentifier = new Lazy(() => + typeof(SysTx.Transaction).GetMethod("SetDistributedTransactionIdentifier", new Type[] { typeof(SysTx.IPromotableSinglePhaseNotification), typeof(Guid) })); + + private static readonly Lazy _getPromotedToken = new Lazy(() => + typeof(SysTx.Transaction).GetMethod("GetPromotedToken")); + + /// + /// Enlists the given IPromotableSinglePhaseNotification and Non-MSDTC Promoter type into a transaction + /// + /// The MethodInfo instance to be invoked. Null if the method doesn't exist + public static MethodInfo EnlistPromotableSinglePhase { + get { + return _enlistPromotableSinglePhase.Value; + } + } + + /// + /// Sets the given DistributedTransactionIdentifier for a Transaction instance. + /// Needs to be invoked when using a Non-MSDTC Promoter type + /// + /// The MethodInfo instance to be invoked. Null if the method doesn't exist + public static MethodInfo SetDistributedTransactionIdentifier { + get { + return _setDistributedTransactionIdentifier.Value; + } + } + + /// + /// Gets the Promoted Token for a Transaction + /// + /// The MethodInfo instance to be invoked. Null if the method doesn't exist + public static MethodInfo GetPromotedToken { + get { + return _getPromotedToken.Value; + } + } + } }//namespace diff --git a/System.Data/System/Data/SqlClient/TdsEnums.cs b/System.Data/System/Data/SqlClient/TdsEnums.cs index 7f9efe37d..319e252b2 100644 --- a/System.Data/System/Data/SqlClient/TdsEnums.cs +++ b/System.Data/System/Data/SqlClient/TdsEnums.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -200,6 +200,7 @@ internal static class TdsEnums { public const byte FEATUREEXT_SRECOVERY = 0x01; public const byte FEATUREEXT_FEDAUTH = 0x02; public const byte FEATUREEXT_TCE = 0x04; + public const byte FEATUREEXT_GLOBALTRANSACTIONS = 0x05; [Flags] public enum FeatureExtension:uint { @@ -207,6 +208,7 @@ public enum FeatureExtension:uint { SessionRecovery=1, FedAuth=2, Tce=4, + GlobalTransactions = 8, } public const byte FEDAUTHLIB_LIVEID = 0X00; @@ -1017,6 +1019,13 @@ public enum SqlAuthenticationMethod { ActiveDirectoryPassword, ActiveDirectoryIntegrated, } + // This enum indicates the state of TransparentNetworkIPResolution + // The first attempt when TNIR is on should be sequential. If the first attempt failes next attempts should be parallel. + internal enum TransparentNetworkResolutionState { + DisabledMode = 0, + SequentialMode, + ParallelMode + }; internal class ActiveDirectoryAuthentication { diff --git a/System.Data/System/Data/SqlClient/TdsParameterSetter.cs b/System.Data/System/Data/SqlClient/TdsParameterSetter.cs index 18da7f153..56a661fe1 100644 --- a/System.Data/System/Data/SqlClient/TdsParameterSetter.cs +++ b/System.Data/System/Data/SqlClient/TdsParameterSetter.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/TdsParser.cs b/System.Data/System/Data/SqlClient/TdsParser.cs index 74ddcf726..8c2c8cc5d 100644 --- a/System.Data/System/Data/SqlClient/TdsParser.cs +++ b/System.Data/System/Data/SqlClient/TdsParser.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -385,6 +385,7 @@ internal void Connect(ServerInfo serverInfo, bool trustServerCert, bool integratedSecurity, bool withFailover, + bool isFirstTransparentAttempt, SqlAuthenticationMethod authType) { if (_state != TdsParserState.Closed) { Debug.Assert(false, "TdsParser.Connect called on non-closed connection!"); @@ -433,8 +434,21 @@ internal void Connect(ServerInfo serverInfo, bool fParallel = _connHandler.ConnectionOptions.MultiSubnetFailover; - _physicalStateObj.CreatePhysicalSNIHandle(serverInfo.ExtendedServerName, ignoreSniOpenTimeout, timerExpire, - out instanceName, _sniSpnBuffer, false, true, fParallel); + TransparentNetworkResolutionState transparentNetworkResolutionState; + if(_connHandler.ConnectionOptions.TransparentNetworkIPResolution) + { + if(isFirstTransparentAttempt) + transparentNetworkResolutionState = TransparentNetworkResolutionState.SequentialMode; + else + transparentNetworkResolutionState = TransparentNetworkResolutionState.ParallelMode; + } + else + transparentNetworkResolutionState = TransparentNetworkResolutionState.DisabledMode; + + int totalTimeout = _connHandler.ConnectionOptions.ConnectTimeout; + + _physicalStateObj.CreatePhysicalSNIHandle(serverInfo.ExtendedServerName, ignoreSniOpenTimeout, timerExpire, + out instanceName, _sniSpnBuffer, false, true, fParallel, transparentNetworkResolutionState, totalTimeout); if (TdsEnums.SNI_SUCCESS != _physicalStateObj.Status) { _physicalStateObj.AddError(ProcessSNIError(_physicalStateObj)); @@ -491,7 +505,7 @@ internal void Connect(ServerInfo serverInfo, // On Instance failure re-connect and flush SNI named instance cache. _physicalStateObj.SniContext=SniContext.Snix_Connect; - _physicalStateObj.CreatePhysicalSNIHandle(serverInfo.ExtendedServerName, ignoreSniOpenTimeout, timerExpire, out instanceName, _sniSpnBuffer, true, true, fParallel); + _physicalStateObj.CreatePhysicalSNIHandle(serverInfo.ExtendedServerName, ignoreSniOpenTimeout, timerExpire, out instanceName, _sniSpnBuffer, true, true, fParallel, transparentNetworkResolutionState, totalTimeout); if (TdsEnums.SNI_SUCCESS != _physicalStateObj.Status) { _physicalStateObj.AddError(ProcessSNIError(_physicalStateObj)); @@ -547,7 +561,7 @@ internal void RemoveEncryption() { _physicalStateObj.AddError(ProcessSNIError(_physicalStateObj)); ThrowExceptionAndWarning(_physicalStateObj); } - // create a new packet encryption changes the internal packet size + // create a new packet encryption changes the internal packet size Bug# 228403 try {} // EmptyTry/Finally to avoid FXCop violation finally { _physicalStateObj.ClearAllWritePackets(); @@ -977,7 +991,7 @@ private PreLoginHandshakeStatus ConsumePreLoginHandshake(SqlAuthenticationMethod ThrowExceptionAndWarning(_physicalStateObj); } - // create a new packet encryption changes the internal packet size + // create a new packet encryption changes the internal packet size Bug# 228403 try {} // EmptyTry/Finally to avoid FXCop violation finally { _physicalStateObj.ClearAllWritePackets(); @@ -1213,11 +1227,11 @@ internal void ThrowExceptionAndWarning(TdsParserStateObject stateObj, bool calle // Don't break the connection if it is already closed breakConnection &= (TdsParserState.Closed != _state); if (breakConnection) { - if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT))) { - // DevDiv2 - - - + if ((_state == TdsParserState.OpenNotLoggedIn) && (_connHandler.ConnectionOptions.TransparentNetworkIPResolution || _connHandler.ConnectionOptions.MultiSubnetFailover || _loginWithFailover) && (temp.Count == 1) && ((temp[0].Number == TdsEnums.TIMEOUT_EXPIRED) || (temp[0].Number == TdsEnums.SNI_WAIT_TIMEOUT))) { + // DevDiv2 Bug 459546: With "MultiSubnetFailover=yes" in the Connection String, SQLClient incorrectly throws a Timeout using shorter time slice (3-4 seconds), not honoring the actual 'Connect Timeout' + // http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/459546 + // For Multisubnet Failover we slice the timeout to make reconnecting faster (with the assumption that the server will not failover instantaneously) + // However, when timeout occurs we need to not doom the internal connection and also to mark the TdsParser as closed such that the login will be will retried breakConnection = false; Disconnect(); } @@ -1364,10 +1378,10 @@ internal SqlError ProcessSNIError(TdsParserStateObject stateObj) { len-=iColon; /* The error message should come back in the following format: "TCP Provider: MESSAGE TEXT" - Fix - - -*/ + Fix Bug 370686, if the message is recieved on a Win9x OS, the error message will not contain MESSAGE TEXT + per Bug: 269574. If we get a errormessage with no message text, just return the entire message otherwise + return just the message text. + */ if (len > 0) { errorMessage = errorMessage.Substring(iColon, len); } @@ -1894,8 +1908,8 @@ internal bool TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataRead // anyways so we need to consume all errors. This is not the case // if we have already given out a reader. If we have already given out // a reader we need to throw the error but not halt further processing. We used to - // halt processing and that was a - + // halt processing and that was a bug preventing the user from + // processing subsequent results. if (null != dataStream) { // Webdata 104560 if (!dataStream.IsInitialized) { @@ -3230,8 +3244,8 @@ internal bool TryProcessError(byte token, TdsParserStateObject stateObj, out Sql string server; - // MDAC - + // MDAC bug #49307 - server sometimes does not send over server field! In those cases + // we will use our locally cached value. if (byteLen == 0) { server = _server; } @@ -4820,8 +4834,8 @@ internal static object GetNullSqlValue( break; case SqlDbType.Timestamp: - // Dev10 - + // Dev10 Bug #479607 - this should have been the same as SqlDbType.Binary, but it's a rejected breaking change + // Dev10 Bug #752790 - don't assert when it does happen break; default: @@ -7011,6 +7025,18 @@ internal int WriteFedAuthFeatureRequest(FederatedAuthenticationFeatureExtensionD return len; // size of data written } + internal int WriteGlobalTransactionsFeatureRequest(bool write /* if false just calculates the length */) { + int len = 5; // 1byte = featureID, 4bytes = featureData length + + if (write) { + // Write Feature ID + _physicalStateObj.WriteByte(TdsEnums.FEATUREEXT_GLOBALTRANSACTIONS); + WriteInt(0, _physicalStateObj); // we don't send any data + } + + return len; + } + internal void TdsLogin(SqlLogin rec, TdsEnums.FeatureExtension requestedFeatures, SessionData recoverySessionData, @@ -7140,6 +7166,9 @@ internal void TdsLogin(SqlLogin rec, if ((requestedFeatures & TdsEnums.FeatureExtension.Tce) != 0) { length += WriteTceFeatureRequest (false); } + if ((requestedFeatures & TdsEnums.FeatureExtension.GlobalTransactions) != 0) { + length += WriteGlobalTransactionsFeatureRequest(false); + } length++; // for terminator } } @@ -7371,6 +7400,9 @@ internal void TdsLogin(SqlLogin rec, if ((requestedFeatures & TdsEnums.FeatureExtension.Tce) != 0) { WriteTceFeatureRequest (true); }; + if ((requestedFeatures & TdsEnums.FeatureExtension.GlobalTransactions) != 0) { + WriteGlobalTransactionsFeatureRequest(true); + }; _physicalStateObj.WriteByte(0xFF); // terminator } } // try @@ -7809,8 +7841,8 @@ internal void FailureCleanup(TdsParserStateObject stateObj, Exception e) { bool originalThreadHasParserLock = _connHandler.ThreadHasParserLockForClose; try { - // Dev11 - + // Dev11 Bug 385286 : ExecuteNonQueryAsync hangs when trying to write a parameter which generates ArgumentException and while handling that exception the server disconnects the connection + // Need to set this to true such that if we have an error sending\processing the attention, we won't deadlock ourselves _connHandler.ThreadHasParserLockForClose = true; // If _outputPacketNumber prior to ResetBuffer was not equal to 1, a packet was already @@ -7916,7 +7948,7 @@ internal Task TdsExecuteSQLBatch(string text, int timeout, SqlNotificationReques }, TaskScheduler.Default); } - // Finished sync + // Finished [....] return null; } catch (Exception e) { @@ -8105,7 +8137,7 @@ internal Task TdsExecuteRPC(SqlCommand cmd, _SqlRPC[] rpcArray, int timeout, boo throw SQL.PrecisionValueOutOfRange(precision); } - // + // bug 49512, make sure the value matches the scale the user enters if (!isNull) { if (isSqlVal) { value = AdjustSqlDecimalScale((SqlDecimal)value, scale); @@ -8741,7 +8773,7 @@ private void WriteSmiTypeInfo(MSS.SmiExtendedMetaData metaData, TdsParserStateOb case SqlDbType.Char: stateObj.WriteByte(TdsEnums.SQLBIGCHAR); WriteUnsignedShort(checked((ushort)(metaData.MaxLength)), stateObj); - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.DateTime: @@ -8773,13 +8805,13 @@ private void WriteSmiTypeInfo(MSS.SmiExtendedMetaData metaData, TdsParserStateOb case SqlDbType.NChar: stateObj.WriteByte(TdsEnums.SQLNCHAR); WriteUnsignedShort(checked((ushort)(metaData.MaxLength*2)), stateObj); - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.NText: stateObj.WriteByte(TdsEnums.SQLNVARCHAR); WriteUnsignedShort(unchecked((ushort)MSS.SmiMetaData.UnlimitedMaxLengthIndicator), stateObj); - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.NVarChar: @@ -8790,7 +8822,7 @@ private void WriteSmiTypeInfo(MSS.SmiExtendedMetaData metaData, TdsParserStateOb else { WriteUnsignedShort(checked((ushort)(metaData.MaxLength*2)), stateObj); } - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.Real: @@ -8816,7 +8848,7 @@ private void WriteSmiTypeInfo(MSS.SmiExtendedMetaData metaData, TdsParserStateOb case SqlDbType.Text: stateObj.WriteByte(TdsEnums.SQLBIGVARCHAR); WriteUnsignedShort(unchecked((ushort)MSS.SmiMetaData.UnlimitedMaxLengthIndicator), stateObj); - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.Timestamp: @@ -8834,7 +8866,7 @@ private void WriteSmiTypeInfo(MSS.SmiExtendedMetaData metaData, TdsParserStateOb case SqlDbType.VarChar: stateObj.WriteByte(TdsEnums.SQLBIGVARCHAR); WriteUnsignedShort(unchecked((ushort)metaData.MaxLength), stateObj); - WriteUnsignedInt(_defaultCollation.info, stateObj); // + WriteUnsignedInt(_defaultCollation.info, stateObj); // TODO: Use metadata's collation?? stateObj.WriteByte(_defaultCollation.sortId); break; case SqlDbType.Variant: @@ -9095,7 +9127,7 @@ internal void WriteCekTable (_SqlMetaDataSet metadataCollection, TdsParserStateO /// internal void WriteTceUserTypeAndTypeInfo(SqlMetaDataPriv mdPriv, TdsParserStateObject stateObj) { // Write the UserType (4 byte value) - WriteInt(0x0, stateObj); // + WriteInt(0x0, stateObj); // TODO: fix this- timestamp columns have 0x50 value here Debug.Assert(SqlDbType.Xml != mdPriv.type); Debug.Assert(SqlDbType.Udt != mdPriv.type); @@ -9201,7 +9233,7 @@ internal void WriteBulkCopyMetaData(_SqlMetaDataSet metadataCollection, int coun // todo: // for xml WriteTokenLength results in a no-op // discuss this with blaine ... - // (Microsoft) xml datatype does not have token length in its metadata. So it should be a noop. + // ([....]) xml datatype does not have token length in its metadata. So it should be a noop. switch (md.type) { case SqlDbType.Decimal: @@ -11325,7 +11357,8 @@ internal string TraceString() { null == _statistics, _statisticsIsInTransaction, _fPreserveTransaction, - null == _connHandler ? "(null)" : _connHandler.ConnectionOptions.MultiSubnetFailover.ToString((IFormatProvider)null)); + null == _connHandler ? "(null)" : _connHandler.ConnectionOptions.MultiSubnetFailover.ToString((IFormatProvider)null), + null == _connHandler ? "(null)" : _connHandler.ConnectionOptions.TransparentNetworkIPResolution.ToString((IFormatProvider)null)); } private string TraceObjectClass(object instance) { diff --git a/System.Data/System/Data/SqlClient/TdsParserHelperClasses.cs b/System.Data/System/Data/SqlClient/TdsParserHelperClasses.cs index 7d2408a90..01322f319 100644 --- a/System.Data/System/Data/SqlClient/TdsParserHelperClasses.cs +++ b/System.Data/System/Data/SqlClient/TdsParserHelperClasses.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/TdsParserSafeHandles.cs b/System.Data/System/Data/SqlClient/TdsParserSafeHandles.cs index 6ec933e05..73286f199 100644 --- a/System.Data/System/Data/SqlClient/TdsParserSafeHandles.cs +++ b/System.Data/System/Data/SqlClient/TdsParserSafeHandles.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -132,7 +132,9 @@ internal SNIHandle( out byte[] instanceName, bool flushCache, bool fSync, - bool fParallel) + bool fParallel, + TransparentNetworkResolutionState transparentNetworkResolutionState, + int totalTimeout) : base(IntPtr.Zero, true) { RuntimeHelpers.PrepareConstrainedRegions(); @@ -146,8 +148,9 @@ internal SNIHandle( timeout = Timeout.Infinite; // -1 == native SNIOPEN_TIMEOUT_VALUE / INFINITE } + int transparentNetworkResolutionStateNo = (int)transparentNetworkResolutionState; _status = SNINativeMethodWrapper.SNIOpenSyncEx(myInfo, serverName, ref base.handle, - spnBuffer, instanceName, flushCache, fSync, timeout, fParallel); + spnBuffer, instanceName, flushCache, fSync, timeout, fParallel, transparentNetworkResolutionStateNo, totalTimeout); } } diff --git a/System.Data/System/Data/SqlClient/TdsParserSessionPool.cs b/System.Data/System/Data/SqlClient/TdsParserSessionPool.cs index cb4d9b10d..d60e9ecdc 100644 --- a/System.Data/System/Data/SqlClient/TdsParserSessionPool.cs +++ b/System.Data/System/Data/SqlClient/TdsParserSessionPool.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/TdsParserStateObject.cs b/System.Data/System/Data/SqlClient/TdsParserStateObject.cs index ed189942b..75e2a4b30 100644 --- a/System.Data/System/Data/SqlClient/TdsParserStateObject.cs +++ b/System.Data/System/Data/SqlClient/TdsParserStateObject.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -646,7 +646,7 @@ public void CheckSetResetConnectionState(UInt32 error, CallbackType callbackType // Should only be called for MARS - that is the only time we need to take // the ResetConnection lock! - // SQL BU DT 333026 - it was raised in a security review by Microsoft questioning whether + // SQL BU DT 333026 - it was raised in a security review by [....] questioning whether // we need to actually process the resulting packet (sp_reset ack or error) to know if the // reset actually succeeded. There was a concern that if the reset failed and we proceeded // there might be a security issue present. We have been assured by the server that if @@ -744,7 +744,8 @@ private SNINativeMethodWrapper.ConsumerInfo CreateConsumerInfo(bool async) { return myInfo; } - internal void CreatePhysicalSNIHandle(string serverName, bool ignoreSniOpenTimeout, long timerExpire, out byte[] instanceName, byte[] spnBuffer, bool flushCache, bool async, bool fParallel) { + internal void CreatePhysicalSNIHandle(string serverName, bool ignoreSniOpenTimeout, long timerExpire, out byte[] instanceName, byte[] spnBuffer, bool flushCache, bool async, bool fParallel, TransparentNetworkResolutionState transparentNetworkResolutionState, int totalTimeout) + { SNINativeMethodWrapper.ConsumerInfo myInfo = CreateConsumerInfo(async); // Translate to SNI timeout values (Int32 milliseconds) @@ -761,8 +762,7 @@ internal void CreatePhysicalSNIHandle(string serverName, bool ignoreSniOpenTimeo timeout = 0; } } - - _sessionHandle = new SNIHandle(myInfo, serverName, spnBuffer, ignoreSniOpenTimeout, checked((int)timeout), out instanceName, flushCache, !async, fParallel); + _sessionHandle = new SNIHandle(myInfo, serverName, spnBuffer, ignoreSniOpenTimeout, checked((int)timeout), out instanceName, flushCache, !async, fParallel, transparentNetworkResolutionState, totalTimeout); } internal bool Deactivate() { @@ -1611,9 +1611,9 @@ internal bool TryReadStringWithEncoding(int length, System.Text.Encoding encodin Debug.Assert(_syncOverAsync || !_asyncReadWithoutSnapshot, "This method is not safe to call when doing sync over async"); if (null == encoding) { - // - - + // Bug 462435:CR: TdsParser.DrainData(stateObj) hitting timeout exception after Connection Resiliency change + // http://vstfdevdiv:8080/web/wi.aspx?pcguid=22f9acc9-569a-41ff-b6ac-fac1b6370209&id=462435 + // Need to skip the current column before throwing the error - this ensures that the state shared between this and the data reader is consistent when calling DrainData if (isPlp) { ulong ignored; if (!_parser.TrySkipPlpValue((ulong)length, this, out ignored)) { @@ -2046,8 +2046,8 @@ private void OnTimeout(object state) { TaskCompletionSource source = _networkPacketTaskSource; if (_parser.Connection.IsInPool) { - // Dev11 - + // Dev11 Bug 390048 : Timing issue between OnTimeout and ReadAsyncCallback results in SqlClient's packet parsing going out of [....] + // We should never timeout if the connection is currently in the pool: the safest thing to do here is to doom the connection to avoid corruption Debug.Assert(_parser.Connection.IsConnectionDoomed, "Timeout occurred while the connection is in the pool"); _parser.State = TdsParserState.Broken; _parser.Connection.BreakConnection(); @@ -2150,7 +2150,7 @@ internal void ReadSni(TaskCompletionSource completion) { } // -1 == Infinite - // 0 == Already timed out (NOTE: To simulate the same behavior as sync we will only timeout on 0 if we receive an IO Pending from SNI) + // 0 == Already timed out (NOTE: To simulate the same behavior as [....] we will only timeout on 0 if we receive an IO Pending from SNI) // >0 == Actual timeout remaining int msecsRemaining = GetTimeoutRemaining(); if (msecsRemaining > 0) { @@ -2206,7 +2206,7 @@ internal void ReadSni(TaskCompletionSource completion) { ChangeNetworkPacketTimeout(0, Timeout.Infinite); } // DO NOT HANDLE PENDING READ HERE - which is TdsEnums.SNI_SUCCESS_IO_PENDING state. - // That is handled by user who initiated async read, or by ReadNetworkPacket which is sync over async. + // That is handled by user who initiated async read, or by ReadNetworkPacket which is [....] over async. } finally { if (readPacket != IntPtr.Zero) { @@ -2375,7 +2375,7 @@ private void ReadSniError(TdsParserStateObject stateObj, UInt32 error) { // For DB Mirroring Failover during login, never break the connection, just close the TdsParser (Devdiv 846298) _parser.Disconnect(); } - else if ((_parser.State == TdsParserState.OpenNotLoggedIn) && (_parser.Connection.ConnectionOptions.MultiSubnetFailover)) + else if ((_parser.State == TdsParserState.OpenNotLoggedIn) && (_parser.Connection.ConnectionOptions.MultiSubnetFailover || _parser.Connection.ConnectionOptions.TransparentNetworkIPResolution)) { // For MultiSubnet Failover during login, never break the connection, just close the TdsParser _parser.Disconnect(); @@ -3084,7 +3084,7 @@ private Task WriteSni(bool canAccumulate) { Debug.Assert(Parser.Connection._parserLock.ThreadMayHaveLock(), "Thread is writing without taking the connection lock"); Task task = SNIWritePacket(Handle, packet, out sniError, canAccumulate, callerHasConnectionLock: true); - // Check to see if the timeout has occured. This time out code is special case code to allow BCP writes to timeout to fix + // Check to see if the timeout has occured. This time out code is special case code to allow BCP writes to timeout to fix bug 350558, eventually we should make all writes timeout. if (_bulkCopyOpperationInProgress && 0 == GetTimeoutRemaining()) { _parser.Connection.ThreadHasParserLockForClose = true; try { @@ -3278,7 +3278,7 @@ internal bool HasErrorOrWarning { internal void AddError(SqlError error) { Debug.Assert(error != null, "Trying to add a null error"); - // Switch to sync once we see an error + // Switch to [....] once we see an error _syncOverAsync = true; lock (_errorAndWarningsLock) { @@ -3312,7 +3312,7 @@ internal int ErrorCount { internal void AddWarning(SqlError error) { Debug.Assert(error != null, "Trying to add a null error"); - // Switch to sync once we see a warning + // Switch to [....] once we see a warning _syncOverAsync = true; lock (_errorAndWarningsLock){ diff --git a/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs b/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs index a402dd040..2f58d45a8 100644 --- a/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs +++ b/System.Data/System/Data/SqlClient/TdsParserStaticMethods.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { @@ -66,7 +66,7 @@ static internal void AliasRegistryLookup(ref string host, ref string protocol) { if (index+1 < aliasLookup.Length) { string parsedAliasName = aliasLookup.Substring(index+1); - // Fix + // Fix bug 298286 if ("dbnetlib" == parsedProtocol) { index = parsedAliasName.IndexOf(':'); if (-1 != index && index + 1 < parsedAliasName.Length) { diff --git a/System.Data/System/Data/SqlClient/TdsRecordBufferSetter.cs b/System.Data/System/Data/SqlClient/TdsRecordBufferSetter.cs index 7b856bb85..406e2b7b6 100644 --- a/System.Data/System/Data/SqlClient/TdsRecordBufferSetter.cs +++ b/System.Data/System/Data/SqlClient/TdsRecordBufferSetter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/SqlClient/TdsValueSetter.cs b/System.Data/System/Data/SqlClient/TdsValueSetter.cs index 63e1dd4ed..aef315de5 100644 --- a/System.Data/System/Data/SqlClient/TdsValueSetter.cs +++ b/System.Data/System/Data/SqlClient/TdsValueSetter.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/SqlClient/assemblycache.cs b/System.Data/System/Data/SqlClient/assemblycache.cs index 5fd69f054..b843d5529 100644 --- a/System.Data/System/Data/SqlClient/assemblycache.cs +++ b/System.Data/System/Data/SqlClient/assemblycache.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/SqlClient/sqlinternaltransaction.cs b/System.Data/System/Data/SqlClient/sqlinternaltransaction.cs index e09e10f5a..c717a8efc 100644 --- a/System.Data/System/Data/SqlClient/sqlinternaltransaction.cs +++ b/System.Data/System/Data/SqlClient/sqlinternaltransaction.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data.SqlClient { diff --git a/System.Data/System/Data/SqlClient/sqlmetadatafactory.cs b/System.Data/System/Data/SqlClient/sqlmetadatafactory.cs index f17f069a0..24cfe1c3e 100644 --- a/System.Data/System/Data/SqlClient/sqlmetadatafactory.cs +++ b/System.Data/System/Data/SqlClient/sqlmetadatafactory.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] // Mugunm // //------------------------------------------------------------------------------ diff --git a/System.Data/System/Data/StateChangeEvent.cs b/System.Data/System/Data/StateChangeEvent.cs index 8bc08c548..54d94f051 100644 --- a/System.Data/System/Data/StateChangeEvent.cs +++ b/System.Data/System/Data/StateChangeEvent.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/UniqueConstraint.cs b/System.Data/System/Data/UniqueConstraint.cs index 29c3d5a24..c097f9319 100644 --- a/System.Data/System/Data/UniqueConstraint.cs +++ b/System.Data/System/Data/UniqueConstraint.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/XDRSchema.cs b/System.Data/System/Data/XDRSchema.cs index fee6ab5be..4c8a96208 100644 --- a/System.Data/System/Data/XDRSchema.cs +++ b/System.Data/System/Data/XDRSchema.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/XMLDiffLoader.cs b/System.Data/System/Data/XMLDiffLoader.cs index c240bd1ed..fc3ecb9f9 100644 --- a/System.Data/System/Data/XMLDiffLoader.cs +++ b/System.Data/System/Data/XMLDiffLoader.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/XMLSchema.cs b/System.Data/System/Data/XMLSchema.cs index 97fba2b9a..476e3b77c 100644 --- a/System.Data/System/Data/XMLSchema.cs +++ b/System.Data/System/Data/XMLSchema.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -1343,7 +1343,7 @@ internal DataTable InstantiateTable(XmlSchemaElement node, XmlSchemaComplexType table = _ds.Tables.GetTable(XmlConvert.DecodeName(typeName), _TableUri); // TOD: Do not do this fix // if (table == null && node.RefName.IsEmpty && !IsTopLevelElement(node) && _TableUri != null && _TableUri.Length > 0) { -// _TableUri = null; // it means form="qualified", so child element inherits namespace. Microsoft +// _TableUri = null; // it means form="qualified", so child element inherits namespace. [....] // } if (!FromInference || (FromInference && table == null)) @@ -1385,7 +1385,7 @@ internal DataTable InstantiateTable(XmlSchemaElement node, XmlSchemaComplexType table.Locale = new CultureInfo(value); } else { - // everett + // everett bug behavior before <... msdata:Locale=""/> inherit from DataSet table.Locale = CultureInfo.InvariantCulture; } } @@ -1571,7 +1571,7 @@ public static Type XsdtoClr(string xsdTypeName) { new NameType("byte" , typeof(SByte) ), /* XSD Apr */ new NameType("date" , typeof(DateTime)), /* XSD Apr */ new NameType("dateTime" , typeof(DateTime)), /* XSD Apr */ - new NameType("decimal" , typeof(decimal) ), /* XSD 2001 Microsoft */ + new NameType("decimal" , typeof(decimal) ), /* XSD 2001 [....] */ new NameType("double" , typeof(double) ), /* XSD Apr */ new NameType("duration" , typeof(TimeSpan)), /* XSD Apr */ new NameType("float" , typeof(Single) ), /* XSD Apr */ @@ -2023,7 +2023,7 @@ internal void HandleAttributeColumn(XmlSchemaAttribute attrib, DataTable table, } - // XDR Microsoft change + // XDR [....] change string strDefault = (attrib.Use == XmlSchemaUse.Required) ? GetMsdataAttribute(attr, Keywords.MSD_DEFAULTVALUE) : attr.DefaultValue; if ((attr.Use == XmlSchemaUse.Optional) && (strDefault == null )) strDefault = attr.FixedValue; @@ -2224,7 +2224,7 @@ internal void HandleDataSet(XmlSchemaElement node, bool isNewDataSet) { _ds.Locale = new CultureInfo(value); } else { - // everett + // everett bug behavior before <... msdata:Locale=""/> becoming CultureInfo(0x409) _ds.Locale = CultureInfo.InvariantCulture; } } diff --git a/System.Data/System/Data/XmlDataLoader.cs b/System.Data/System/Data/XmlDataLoader.cs index 24733de45..566e2581f 100644 --- a/System.Data/System/Data/XmlDataLoader.cs +++ b/System.Data/System/Data/XmlDataLoader.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -313,7 +313,7 @@ internal void LoadData( XmlDocument xdoc ) { XmlElement e = xdoc.DocumentElement; DataTable topTable = (DataTable) nodeToSchemaMap.GetSchemaForNode(e, FIgnoreNamespace(e)); if (topTable != null) { - topRow = topTable.CreateEmptyRow(); //Microsoft perf + topRow = topTable.CreateEmptyRow(); //enzol perf nodeToRowMap[ e ] = topRow; // get all field values. diff --git a/System.Data/System/Data/XmlKeywords.cs b/System.Data/System/Data/XmlKeywords.cs index 4b288fb5f..674f812d5 100644 --- a/System.Data/System/Data/XmlKeywords.cs +++ b/System.Data/System/Data/XmlKeywords.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { diff --git a/System.Data/System/Data/XmlToDatasetMap.cs b/System.Data/System/Data/XmlToDatasetMap.cs index 7f46e7e6d..a1aab9cd5 100644 --- a/System.Data/System/Data/XmlToDatasetMap.cs +++ b/System.Data/System/Data/XmlToDatasetMap.cs @@ -2,9 +2,9 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -128,10 +128,10 @@ static internal bool IsMappedColumn(DataColumn c) { // Used to infere schema private TableSchemaInfo AddTableSchema(DataTable table, XmlNameTable nameTable) { - // Microsoft: Because in our case reader already read the document all names that we can meet in the + // [....]: Because in our case reader already read the document all names that we can meet in the // document already has an entry in NameTable. // If in future we will build identity map before reading XML we can replace Get() to Add() - // Microsoft: GetIdentity is called from two places: BuildIdentityMap() and LoadRows() + // [....]: GetIdentity is called from two places: BuildIdentityMap() and LoadRows() // First case deals with decoded names; Second one with encoded names. // We decided encoded names in first case (instead of decoding them in second) // because it save us time in LoadRows(). We have, as usual, more data them schemas @@ -148,10 +148,10 @@ private TableSchemaInfo AddTableSchema(DataTable table, XmlNameTable nameTable) } private TableSchemaInfo AddTableSchema(XmlNameTable nameTable, DataTable table) { - // Microsoft:This is the opposite of the previous function: + // [....]:This is the opposite of the previous function: // we populate the nametable so that the hash comparison can happen as // object comparison instead of strings. - // Microsoft: GetIdentity is called from two places: BuildIdentityMap() and LoadRows() + // [....]: GetIdentity is called from two places: BuildIdentityMap() and LoadRows() // First case deals with decoded names; Second one with encoded names. // We decided encoded names in first case (instead of decoding them in second) // because it save us time in LoadRows(). We have, as usual, more data them schemas diff --git a/System.Data/System/Data/xmlsaver.cs b/System.Data/System/Data/xmlsaver.cs index 55e888fd4..2129d4762 100644 --- a/System.Data/System/Data/xmlsaver.cs +++ b/System.Data/System/Data/xmlsaver.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Data { @@ -153,7 +153,7 @@ internal void AddXdoProperty(PropertyDescriptor pd, Object instance, XmlElement if (propInst is PropertyCollection) { return; } - // Microsoft: perf: Why not have this as a table? + // [....]: perf: Why not have this as a table? // there are several xdo properties that equal to some xml attributes, we should not explicitly ouput them. if ( 0 == String.Compare(pd.Name, "Namespace" , StringComparison.Ordinal) || @@ -887,7 +887,7 @@ internal XmlElement FillDataSetElement(XmlDocument xd, DataSet ds, DataTable dt) dsElement.SetAttribute(Keywords.MSD_ISDATASET, Keywords.MSDNS, Keywords.TRUE); dsElement.SetAttribute(Keywords.MSD_MAINDATATABLE, Keywords.MSDNS, XmlConvert.EncodeLocalName(((dt.Namespace.Length == 0)?dt.TableName : (dt.Namespace + ":" + dt.TableName)))); - if (dt.CaseSensitive) { // WebData 111631 :it is a + if (dt.CaseSensitive) { // WebData 111631 :it is a bug to go and write casesensitive attrib as 'true', by default dsElement.SetAttribute(Keywords.MSD_CASESENSITIVE, Keywords.MSDNS, Keywords.TRUE); } if (dt.ShouldSerializeLocale() || !dt.Locale.Equals(CultureInfo.CurrentCulture)) { @@ -1093,7 +1093,7 @@ internal void HandleColumnType(DataColumn col, XmlDocument dc, XmlElement root, schNode.AppendChild(type); }else { #if DEBUG - // Microsoft: TO DO: replace the constructor with IsEqual(XmlElement) + // [....]: TO DO: replace the constructor with IsEqual(XmlElement) // Debug.Assert(col.SimpleType.IsEqual(new SimpleType(elmSimpeType)), "simpleTypes with the same name have to be the same: "+name); #endif } @@ -1288,7 +1288,7 @@ internal XmlElement HandleColumn(DataColumn col, XmlDocument dc, XmlElement sche minOccurs = (col.AllowDBNull) ? 0 : 1; - // Microsoft 2001 change + // [....] 2001 change if (col.ColumnMapping == MappingType.Attribute && minOccurs != 0) root.SetAttribute(Keywords.USE, Keywords.REQUIRED); @@ -1582,8 +1582,8 @@ internal XmlElement HandleTable(DataTable table, XmlDocument dc, XmlElement sche if (!table.TypeName.IsEmpty) { if (schFormat != SchemaFormat.Remoting) root.SetAttribute( Keywords.TYPE, NewDiffgramGen.QualifiedName((string)prefixes[table.TypeName.Namespace], table.TypeName.Name) ); -// - +// Bug 108292: Since we always write complex type as annonymous type, DO NOT WRITE ITS NAME +// DO NOT REVERT THIS CHANGE } XmlElement compositor = null; diff --git a/System.Data/System/NewXml/BaseTreeIterator.cs b/System.Data/System/NewXml/BaseTreeIterator.cs index fa67c094a..c06feef60 100644 --- a/System.Data/System/NewXml/BaseTreeIterator.cs +++ b/System.Data/System/NewXml/BaseTreeIterator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Data/System/NewXml/DataDocumentXPathNavigator.cs b/System.Data/System/NewXml/DataDocumentXPathNavigator.cs index d2e5280a5..45420d2d2 100644 --- a/System.Data/System/NewXml/DataDocumentXPathNavigator.cs +++ b/System.Data/System/NewXml/DataDocumentXPathNavigator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/DataPointer.cs b/System.Data/System/NewXml/DataPointer.cs index 2b85cf142..e8f4f51e6 100644 --- a/System.Data/System/NewXml/DataPointer.cs +++ b/System.Data/System/NewXml/DataPointer.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/DataSetMappper.cs b/System.Data/System/NewXml/DataSetMappper.cs index de28bbd11..390bf5780 100644 --- a/System.Data/System/NewXml/DataSetMappper.cs +++ b/System.Data/System/NewXml/DataSetMappper.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/RegionIterator.cs b/System.Data/System/NewXml/RegionIterator.cs index 8e4b622ac..de0c6882c 100644 --- a/System.Data/System/NewXml/RegionIterator.cs +++ b/System.Data/System/NewXml/RegionIterator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/TreeIterator.cs b/System.Data/System/NewXml/TreeIterator.cs index 34099a111..5e90984a7 100644 --- a/System.Data/System/NewXml/TreeIterator.cs +++ b/System.Data/System/NewXml/TreeIterator.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/XPathNodePointer.cs b/System.Data/System/NewXml/XPathNodePointer.cs index b905328c3..f8f3d1d95 100644 --- a/System.Data/System/NewXml/XPathNodePointer.cs +++ b/System.Data/System/NewXml/XPathNodePointer.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { @@ -169,7 +169,7 @@ internal XPathNodeType NodeType { } } - //Microsoft: From CodeReview: Perf: We should have another array similar w/ + //[....]: From CodeReview: Perf: We should have another array similar w/ // xmlNodeType_To_XpathNodeType_Map that will return String.Empty for everything but the element and // attribute case. internal string LocalName { diff --git a/System.Data/System/NewXml/XmlBoundElement.cs b/System.Data/System/NewXml/XmlBoundElement.cs index 33f8307d3..476facfa9 100644 --- a/System.Data/System/NewXml/XmlBoundElement.cs +++ b/System.Data/System/NewXml/XmlBoundElement.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/System/NewXml/XmlDataDocument.cs b/System.Data/System/NewXml/XmlDataDocument.cs index b2dc5d618..c2b65001e 100644 --- a/System.Data/System/NewXml/XmlDataDocument.cs +++ b/System.Data/System/NewXml/XmlDataDocument.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Xml { using System; @@ -606,9 +606,9 @@ private void ForceFoliation( XmlBoundElement node, ElementState newState ) { DataRow row = node.Row; // create new attrs & elements for row - // For detached rows: we are in sync w/ temp values - // For non-detached rows: we are in sync w/ the current values - // For deleted rows: we never sync + // For detached rows: we are in [....] w/ temp values + // For non-detached rows: we are in [....] w/ the current values + // For deleted rows: we never [....] DataRowVersion rowVersion = ( row.RowState == DataRowState.Detached ) ? DataRowVersion.Proposed : DataRowVersion.Current; foreach( DataColumn col in row.Table.Columns ) { if ( !IsNotMapped(col) ) { @@ -1273,7 +1273,7 @@ private void OnColumnValueChanged( DataRow row, DataColumn col, XmlBoundElement if ( col.ColumnMapping == MappingType.SimpleContent && Convert.IsDBNull( value ) && !rowElement.IsFoliated ) ForceFoliation( rowElement, ElementState.WeakFoliation); else { - // no need to sync if not foliated + // no need to [....] if not foliated if ( !IsFoliated( rowElement ) ) { #if DEBUG // If the new value is null, we should be already foliated if there is a DataPointer that points to the column @@ -1433,7 +1433,7 @@ private void OnColumnChanged( object sender, DataColumnChangeEventArgs args ) { XmlBoundElement be = row.Element; Debug.Assert( be != null ); if ( be.IsFoliated ) { - // Need to sync changes from ROM to DOM + // Need to [....] changes from ROM to DOM OnColumnValueChanged( row, col, be ); } } @@ -1535,7 +1535,7 @@ DataColumn FindAssociatedParentColumn( DataRelation relation, DataColumn childCo // Change the childElement position in the tree to conform to the parent nested relationship in ROM private void OnNestedParentChange(DataRow child, XmlBoundElement childElement, DataColumn childCol) { Debug.Assert( child.Element == childElement && childElement.Row == child ); - // This function is (and s/b) called as a result of ROM changes, therefore XML changes done here should not be sync-ed to ROM + // This function is (and s/b) called as a result of ROM changes, therefore XML changes done here should not be [....]-ed to ROM Debug.Assert( ignoreXmlEvents == true ); #if DEBUG // In order to check that this move does not change the connected/disconnected state of the node @@ -1697,7 +1697,7 @@ private void OnNodeRemoved( object sender, XmlNodeChangedEventArgs args ) { OnNodeRemovedFromTree( node, oldParent ); } else { - // Removing from disconnected tree to disconnected tree: just sync the old region + // Removing from disconnected tree to disconnected tree: just [....] the old region OnNodeRemovedFromFragment( node, oldParent ); } } @@ -1742,7 +1742,7 @@ private void OnNodeRemovedFromFragment( XmlNode node, XmlNode oldParent ) { XmlBoundElement oldRowElem; if ( mapper.GetRegion( oldParent, out oldRowElem ) ) { - // Sync the old region if it is not deleted + // [....] the old region if it is not deleted DataRow row = oldRowElem.Row; // Since the old old region was disconnected, then the row can be only Deleted or Detached Debug.Assert( ! IsRowLive( row ) ); @@ -2171,7 +2171,7 @@ internal static void SetRowValueFromXmlText( DataRow row, DataColumn col, string private void SynchronizeRowFromRowElement( XmlBoundElement rowElement ) { SynchronizeRowFromRowElement( rowElement, null ); } - // Sync row fields w/ values from rowElem region. + // [....] row fields w/ values from rowElem region. // If rowElemList is != null, all subregions of rowElem are appended to it. private void SynchronizeRowFromRowElement( XmlBoundElement rowElement, ArrayList rowElemList ) { DataRow row = rowElement.Row; @@ -2402,7 +2402,7 @@ private void OnNodeInsertedInTree( XmlNode node ) { } } else { - // We only need to sync the embedded sub-regions + // We only need to [....] the embedded sub-regions TreeIterator iter = new TreeIterator( node ); for (bool fMore = iter.NextRowElement(); fMore; fMore = iter.NextRightRowElement() ) rowElemList.Add( iter.CurrentNode ); @@ -2588,7 +2588,7 @@ private void OnNonRowElementInsertedInFragment( XmlNode node, XmlBoundElement ro if ( row.RowState == DataRowState.Detached ) SynchronizeRowFromRowElementEx( rowElement, rowElemList ); - // Nothing to do if the row is deleted (there is no sync-ing from XML to ROM for deleted rows) + // Nothing to do if the row is deleted (there is no [....]-ing from XML to ROM for deleted rows) } private void SetNestedParentRegion( XmlBoundElement childRowElem ) { diff --git a/System.Data/System/NewXml/XmlDataImplementation.cs b/System.Data/System/NewXml/XmlDataImplementation.cs index c3e983958..ed253a35a 100644 --- a/System.Data/System/NewXml/XmlDataImplementation.cs +++ b/System.Data/System/NewXml/XmlDataImplementation.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ #pragma warning disable 618 // ignore obsolete warning about XmlDataDocument namespace System.Xml { diff --git a/System.Data/bid/inc/cs/bidPrivateBase.cs b/System.Data/bid/inc/cs/bidPrivateBase.cs index 95629d427..7687bafb6 100644 --- a/System.Data/bid/inc/cs/bidPrivateBase.cs +++ b/System.Data/bid/inc/cs/bidPrivateBase.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] // Last Modified: 6-November-2008 //----------------------------------------------------------------------------------------------- diff --git a/System.IdentityModel.Selectors/infocard/common/managed/InfoCardCryptoHelper.cs b/System.IdentityModel.Selectors/infocard/common/managed/InfoCardCryptoHelper.cs index 1a53c754f..1e7281d0c 100644 --- a/System.IdentityModel.Selectors/infocard/common/managed/InfoCardCryptoHelper.cs +++ b/System.IdentityModel.Selectors/infocard/common/managed/InfoCardCryptoHelper.cs @@ -8,7 +8,7 @@ namespace Microsoft.InfoCards using System.Security.Cryptography; using System.Security.Cryptography.Xml; - // copied from IdentityModel\CryptoHelper.cs and they need to be kept in sync. After V1, we need to rethink how we can have + // copied from IdentityModel\CryptoHelper.cs and they need to be kept in [....]. After V1, we need to rethink how we can have // a single place to ask this question. Perhaps even add it as an extensibility internal static class InfoCardCryptoHelper diff --git a/System.IdentityModel/InternalApis/Clr/inc/AppContextDefaultValues.cs b/System.IdentityModel/InternalApis/Clr/inc/AppContextDefaultValues.cs index 124f9f45a..8a130a0f3 100644 --- a/System.IdentityModel/InternalApis/Clr/inc/AppContextDefaultValues.cs +++ b/System.IdentityModel/InternalApis/Clr/inc/AppContextDefaultValues.cs @@ -25,7 +25,6 @@ public static void PopulateDefaultValues() /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can /// more easily support this on other platforms. /// - [System.Security.SecuritySafeCritical] private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) { string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; diff --git a/System.IdentityModel/System/AppContextDefaultValues.cs b/System.IdentityModel/System/AppContextDefaultValues.cs index 3513ced8a..e879cb1e2 100644 --- a/System.IdentityModel/System/AppContextDefaultValues.cs +++ b/System.IdentityModel/System/AppContextDefaultValues.cs @@ -26,6 +26,11 @@ static partial void PopulateDefaultValuesPartial(string platformIdentifier, stri LocalAppContextSwitches.SetDefaultsLessOrEqual_452(); } + if (version <= 40600) + { + LocalAppContextSwitches.SetDefaultsLessOrEqual_46(); + } + break; } } diff --git a/System.IdentityModel/System/IdentityModel/AsyncResult.cs b/System.IdentityModel/System/IdentityModel/AsyncResult.cs index f958bc970..d423183a0 100644 --- a/System.IdentityModel/System/IdentityModel/AsyncResult.cs +++ b/System.IdentityModel/System/IdentityModel/AsyncResult.cs @@ -112,7 +112,7 @@ protected void Complete(bool completedSynchronously, Exception exception) { if (completed == true) { - // it is a + // it is a bug to call complete twice throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new AsynchronousOperationException(SR.GetString(SR.ID4005))); } diff --git a/System.IdentityModel/System/IdentityModel/Claims/Claim.cs b/System.IdentityModel/System/IdentityModel/Claims/Claim.cs index f8a2a4bdf..bc90eb0f2 100644 --- a/System.IdentityModel/System/IdentityModel/Claims/Claim.cs +++ b/System.IdentityModel/System/IdentityModel/Claims/Claim.cs @@ -17,7 +17,7 @@ namespace System.IdentityModel.Claims // --------------- ---------------- ------------------ // "File" "boot.ini" "Read" // "HairColor" "Brown" "PossessProperty" - // "UserName" "Microsoft" "PossessProperty" + // "UserName" "[....]" "PossessProperty" // "Service" "MailService" "Access" // "Operation" "ReadMail" "Invoke" // ClaimType: diff --git a/System.IdentityModel/System/IdentityModel/Claims/X509CertificateClaimSet.cs b/System.IdentityModel/System/IdentityModel/Claims/X509CertificateClaimSet.cs index 69d2304a9..4113bd328 100644 --- a/System.IdentityModel/System/IdentityModel/Claims/X509CertificateClaimSet.cs +++ b/System.IdentityModel/System/IdentityModel/Claims/X509CertificateClaimSet.cs @@ -172,9 +172,24 @@ IList InitializeClaimsCore() if (!string.IsNullOrEmpty(value)) claims.Add(Claim.CreateX500DistinguishedNameClaim(this.certificate.SubjectName)); - value = this.certificate.GetNameInfo(X509NameType.DnsName, false); - if (!string.IsNullOrEmpty(value)) - claims.Add(Claim.CreateDnsClaim(value)); + // App context switch for disabling support for multiple dns entries in a SAN certificate + if (LocalAppContextSwitches.DisableMultipleDNSEntriesInSANCertificate) + { + // old behavior, default for <= 4.6 + value = this.certificate.GetNameInfo(X509NameType.DnsName, false); + if (!string.IsNullOrEmpty(value)) + claims.Add(Claim.CreateDnsClaim(value)); + } + else + { + // new behavior as this is the default long term behavior + // Since a SAN can have multiple DNS entries + string[] entries = GetDnsFromExtensions(this.certificate); + for (int i = 0; i < entries.Length; ++i) + { + claims.Add(Claim.CreateDnsClaim(entries[i])); + } + } value = this.certificate.GetNameInfo(X509NameType.SimpleName, false); if (!string.IsNullOrEmpty(value)) @@ -243,10 +258,24 @@ public override IEnumerable FindClaims(string claimType, string right) { if (right == null || Rights.PossessProperty.Equals(right)) { - string value = this.certificate.GetNameInfo(X509NameType.DnsName, false); - if (!string.IsNullOrEmpty(value)) + // App context switch for disabling support for multiple dns entries in a SAN certificate + if (LocalAppContextSwitches.DisableMultipleDNSEntriesInSANCertificate) + { + // old behavior, default for <= 4.6 + string value = this.certificate.GetNameInfo(X509NameType.DnsName, false); + if (!string.IsNullOrEmpty(value)) + { + yield return Claim.CreateDnsClaim(value); + } + } + else { - yield return Claim.CreateDnsClaim(value); + // new behavior since this is the default long term behavior + string[] entries = GetDnsFromExtensions(certificate); + for (int i = 0; i < entries.Length; ++i) + { + yield return Claim.CreateDnsClaim(entries[i]); + } } } } @@ -270,6 +299,33 @@ public override IEnumerable FindClaims(string claimType, string right) } } + // Fixing Bug 795660: SAN having multiple DNS entries + private static string[] GetDnsFromExtensions(X509Certificate2 cert) + { + foreach (X509Extension ext in cert.Extensions) + { + // Extension is SAN or SAN2 + if (ext.Oid.Value == "2.5.29.7" || ext.Oid.Value == "2.5.29.17") + { + string asnString = ext.Format(true); + if (string.IsNullOrEmpty(asnString)) + { + return new string[0]; + } + + string[] rawDnsEntries = asnString.Split(new string[1] { "\n" }, StringSplitOptions.RemoveEmptyEntries); + string[] dnsEntries = new string[rawDnsEntries.Length]; + for (int i = 0; i < rawDnsEntries.Length; ++i) + { + int equalSignIndex = rawDnsEntries[i].IndexOf('='); + dnsEntries[i] = rawDnsEntries[i].Substring(equalSignIndex + 1).Trim(); + } + return dnsEntries; + } + } + return new string[0]; + } + public override IEnumerator GetEnumerator() { ThrowIfDisposed(); @@ -347,7 +403,7 @@ public override string Name { ThrowIfDisposed(); if (this.name == null) - { + { // // DCR 48092: PrincipalPermission authorization using certificates could cause Elevation of Privilege. // because there could be duplicate subject name. In order to be more unique, we use SubjectName + Thumbprint diff --git a/System.IdentityModel/System/IdentityModel/CryptoApi.cs b/System.IdentityModel/System/IdentityModel/CryptoApi.cs index 076e4f390..bd3cd0284 100644 --- a/System.IdentityModel/System/IdentityModel/CryptoApi.cs +++ b/System.IdentityModel/System/IdentityModel/CryptoApi.cs @@ -363,7 +363,7 @@ public static SafeCertStoreHandle InvalidHandle protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested in throwing an exception here if CloseHandle fails. return CAPI.CertCloseStore(handle, 0); } @@ -390,7 +390,7 @@ internal static SafeCertContextHandle InvalidHandle protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested in throwing an exception here if CloseHandle fails. return CAPI.CertFreeCertificateContext(handle); } @@ -416,7 +416,7 @@ internal static SafeCertChainHandle InvalidHandle protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested in throwing an exception here if CloseHandle fails. CAPI.CertFreeCertificateChain(handle); return true; diff --git a/System.IdentityModel/System/IdentityModel/CryptoHelper.cs b/System.IdentityModel/System/IdentityModel/CryptoHelper.cs index bfe9e6266..bfcc748bf 100644 --- a/System.IdentityModel/System/IdentityModel/CryptoHelper.cs +++ b/System.IdentityModel/System/IdentityModel/CryptoHelper.cs @@ -865,7 +865,7 @@ internal static bool IsAsymmetricAlgorithm(string algorithm) catch (InvalidOperationException) { algorithmObject = null; - // We swallow the exception and continue. + // We ---- the exception and continue. } if (algorithmObject != null) @@ -901,7 +901,7 @@ internal static bool IsSymmetricAlgorithm(string algorithm) catch (InvalidOperationException) { algorithmObject = null; - // We swallow the exception and continue. + // We ---- the exception and continue. } if (algorithmObject != null) { @@ -952,7 +952,7 @@ internal static bool IsSymmetricSupportedAlgorithm(string algorithm, int keySize } catch (InvalidOperationException) { - // We swallow the exception and continue. + // We ---- the exception and continue. } if (algorithmObject != null) { diff --git a/System.IdentityModel/System/IdentityModel/HashStream.cs b/System.IdentityModel/System/IdentityModel/HashStream.cs index fe8fee081..94b7abc72 100644 --- a/System.IdentityModel/System/IdentityModel/HashStream.cs +++ b/System.IdentityModel/System/IdentityModel/HashStream.cs @@ -57,7 +57,7 @@ public override long Position get { return this.length; } set { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException()); } diff --git a/System.IdentityModel/System/IdentityModel/LocalAppContextSwitches.cs b/System.IdentityModel/System/IdentityModel/LocalAppContextSwitches.cs index 8705ddf14..f18ab5dd5 100644 --- a/System.IdentityModel/System/IdentityModel/LocalAppContextSwitches.cs +++ b/System.IdentityModel/System/IdentityModel/LocalAppContextSwitches.cs @@ -1,6 +1,7 @@ //------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. //------------------------------------------------------------ + namespace System.IdentityModel { using System; @@ -13,7 +14,10 @@ namespace System.IdentityModel internal static class LocalAppContextSwitches { private const string EnableCachedEmptyDefaultAuthorizationContextString = "Switch.System.IdentityModel.EnableCachedEmptyDefaultAuthorizationContext"; + private const string DisableMultipleDNSEntriesInSANCertificateString = "Switch.System.IdentityModel.DisableMultipleDNSEntriesInSANCertificate"; + private static int enableCachedEmptyDefaultAuthorizationContext; + private static int disableMultipleDNSEntriesInSANCertificate; public static bool EnableCachedEmptyDefaultAuthorizationContext { @@ -24,10 +28,25 @@ public static bool EnableCachedEmptyDefaultAuthorizationContext } } + public static bool DisableMultipleDNSEntriesInSANCertificate + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + return LocalAppContext.GetCachedSwitchValue(DisableMultipleDNSEntriesInSANCertificateString, ref disableMultipleDNSEntriesInSANCertificate); + } + } + public static void SetDefaultsLessOrEqual_452() { // Define the switches that should be true for 4.5.2 or less, false for 4.6+. LocalAppContext.DefineSwitchDefault(EnableCachedEmptyDefaultAuthorizationContextString, true); } + + public static void SetDefaultsLessOrEqual_46() + { + // Define the switches that should be true for 4.6 or less, false for 4.6.1+. + LocalAppContext.DefineSwitchDefault(DisableMultipleDNSEntriesInSANCertificateString, true); + } } } diff --git a/System.IdentityModel/System/IdentityModel/Protocols/WSTrust/WSTrustSerializationHelper.cs b/System.IdentityModel/System/IdentityModel/Protocols/WSTrust/WSTrustSerializationHelper.cs index dba47077c..82834bcae 100644 --- a/System.IdentityModel/System/IdentityModel/Protocols/WSTrust/WSTrustSerializationHelper.cs +++ b/System.IdentityModel/System/IdentityModel/Protocols/WSTrust/WSTrustSerializationHelper.cs @@ -688,7 +688,7 @@ public static void WriteRequest(RequestSecurityToken rst, XmlWriter writer, WSTr } // Step 3: Write the custom attributes here from the Attributes bag. - // IDFX beta work item + // IDFX beta work item bug 878 // Step 4: Write the first class Element here requestSerializer.WriteKnownRequestElement(rst, writer, context); diff --git a/System.IdentityModel/System/IdentityModel/SafeCryptHandles.cs b/System.IdentityModel/System/IdentityModel/SafeCryptHandles.cs index f489407af..20faf7715 100644 --- a/System.IdentityModel/System/IdentityModel/SafeCryptHandles.cs +++ b/System.IdentityModel/System/IdentityModel/SafeCryptHandles.cs @@ -31,7 +31,7 @@ internal static SafeProvHandle InvalidHandle protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested in throwing an exception here if CloseHandle fails. return NativeMethods.CryptReleaseContext(handle, 0); } @@ -58,7 +58,7 @@ internal static SafeKeyHandle InvalidHandle protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested in throwing an exception here if CloseHandle fails. bool ret = NativeMethods.CryptDestroyKey(handle); if (this.provHandle != null) diff --git a/System.IdentityModel/System/IdentityModel/SecurityUtils.cs b/System.IdentityModel/System/IdentityModel/SecurityUtils.cs index 297c9df09..7b2b9f189 100644 --- a/System.IdentityModel/System/IdentityModel/SecurityUtils.cs +++ b/System.IdentityModel/System/IdentityModel/SecurityUtils.cs @@ -28,7 +28,7 @@ static class SecurityUtils public const int WindowsVistaMajorNumber = 6; static IIdentity anonymousIdentity; - // these should be kept in sync with IIS70 + // these should be kept in [....] with IIS70 public const string AuthTypeNTLM = "NTLM"; public const string AuthTypeNegotiate = "Negotiate"; public const string AuthTypeKerberos = "Kerberos"; @@ -727,7 +727,7 @@ public static void DisposeIfNecessary(IDisposable obj) } /// - /// Internal helper class to help keep Kerberos and Spnego in sync. + /// Internal helper class to help keep Kerberos and Spnego in [....]. /// This code is shared by: /// System\IdentityModel\Tokens\KerberosReceiverSecurityToken.cs /// System\ServiceModel\Security\WindowsSspiNegotiation.cs @@ -736,7 +736,7 @@ public static void DisposeIfNecessary(IDisposable obj) internal class ExtendedProtectionPolicyHelper { // - // keep the defaults: _protectionScenario and _policyEnforcement, in sync with: static class System.ServiceModel.Channel.ChannelBindingUtility + // keep the defaults: _protectionScenario and _policyEnforcement, in [....] with: static class System.ServiceModel.Channel.ChannelBindingUtility // We can't access those defaults as IdentityModel cannot take a dependency on ServiceModel // static ExtendedProtectionPolicy disabledPolicy = new ExtendedProtectionPolicy(PolicyEnforcement.Never); @@ -893,11 +893,11 @@ public void CheckServiceBinding(SafeDeleteContext securityContext, string defaul } /// - /// Keep this in sync with \System\ServiceModel\Channels\ChannelBindingUtility.cs + /// Keep this in [....] with \System\ServiceModel\Channels\ChannelBindingUtility.cs /// public static ExtendedProtectionPolicy DefaultPolicy { // - //keep the default in sync with : static class System.ServiceModel.Channels.ChannelBindingUtility + //keep the default in [....] with : static class System.ServiceModel.Channels.ChannelBindingUtility //we can't use these defaults as IdentityModel cannot take a dependency on ServiceModel // diff --git a/System.IdentityModel/System/IdentityModel/SignedXml.cs b/System.IdentityModel/System/IdentityModel/SignedXml.cs index e6e357812..183692828 100644 --- a/System.IdentityModel/System/IdentityModel/SignedXml.cs +++ b/System.IdentityModel/System/IdentityModel/SignedXml.cs @@ -155,6 +155,11 @@ public void EnsureDigestValidity(string id, object resolvedXmlSource) this.Signature.SignedInfo.EnsureDigestValidity(id, resolvedXmlSource); } + public bool EnsureDigestValidityIfIdMatches(string id, object resolvedXmlSource) + { + return this.Signature.SignedInfo.EnsureDigestValidityIfIdMatches(id, resolvedXmlSource); + } + public byte[] GetSignatureValue() { return this.Signature.GetSignatureBytes(); @@ -1226,7 +1231,7 @@ public void ReadFrom(XmlDictionaryReader reader, TransformFactory transformFacto { this.transformChain.ReadFrom(reader, transformFactory, dictionaryManager, ShouldPreserveComments(this.Uri)); } - + this.digestMethodElement.ReadFrom(reader, dictionaryManager); this.digestValueElement.ReadFrom(reader, dictionaryManager); diff --git a/System.IdentityModel/System/IdentityModel/SspiSafeHandles.cs b/System.IdentityModel/System/IdentityModel/SspiSafeHandles.cs index ff7086149..9f61b67d9 100644 --- a/System.IdentityModel/System/IdentityModel/SspiSafeHandles.cs +++ b/System.IdentityModel/System/IdentityModel/SspiSafeHandles.cs @@ -391,7 +391,7 @@ static unsafe int MustRunInitializeSecurityContext( { SSPIHandle credentialHandle = inCredentials._handle; - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // This API does not set Win32 Last Error. errorCode = InitializeSecurityContextW( ref credentialHandle, @@ -661,7 +661,7 @@ static unsafe int MustRunAcceptSecurityContext( { SSPIHandle credentialHandle = inCredentials._handle; - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // This API does not set Win32 Last Error. errorCode = AcceptSecurityContext( ref credentialHandle, @@ -741,7 +741,7 @@ public static int ImpersonateSecurityContext(SafeDeleteContext context) if (b) { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. status = ImpersonateSecurityContext(ref context._handle); context.DangerousRelease(); @@ -777,7 +777,7 @@ public static int EncryptMessage(SafeDeleteContext context, SecurityBufferDescri { if (b) { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. status = EncryptMessage(ref context._handle, 0, inputOutput, sequenceNumber); context.DangerousRelease(); @@ -857,7 +857,7 @@ internal int GetSecurityContextToken(out SafeCloseHandle safeHandle) { if (b) { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. The API returns a error code. status = QuerySecurityContextToken(ref _handle, out safeHandle); DangerousRelease(); @@ -875,7 +875,7 @@ protected override bool ReleaseHandle() if (this._EffectiveCredential != null) this._EffectiveCredential.DangerousRelease(); - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. return DeleteSecurityContext(ref _handle) == 0; } @@ -992,7 +992,7 @@ public static unsafe int AcquireCredentialsHandle( try { } finally { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. errorCode = AcquireCredentialsHandleW( null, @@ -1027,7 +1027,7 @@ public static unsafe int AcquireDefaultCredential( try { } finally { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. errorCode = AcquireCredentialsHandleW( null, @@ -1073,7 +1073,7 @@ public static unsafe int AcquireCredentialsHandle( try { } finally { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. errorCode = AcquireCredentialsHandleW( null, @@ -1114,7 +1114,7 @@ out SafeFreeCredentials outCredential try { } finally { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. errorCode = AcquireCredentialsHandleW( null, @@ -1138,7 +1138,7 @@ out timeStamp protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. It returns a error code. return FreeCredentialsHandle(ref _handle) == 0; } @@ -1220,7 +1220,7 @@ extern static bool CertFreeCertificateContext(// Suppressing returned status che protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. return CertFreeCertificateContext(handle); } @@ -1242,7 +1242,7 @@ internal unsafe void Set(IntPtr value) internal static int EnumeratePackages(out int pkgnum, out SafeFreeContextBuffer pkgArray) { int res = -1; - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. The API returns a error code. res = SafeFreeContextBuffer.EnumerateSecurityPackagesW(out pkgnum, out pkgArray); @@ -1295,7 +1295,7 @@ public static unsafe int QueryContextAttributes(SafeDeleteContext phContext, Con { if (b) { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. The API returns a error code. status = SafeFreeContextBuffer.QueryContextAttributesW(ref phContext._handle, contextAttribute, buffer); phContext.DangerousRelease(); @@ -1330,7 +1330,7 @@ public static unsafe int QueryContextAttributes(SafeDeleteContext phContext, Con protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The API does not set Win32 Last Error. The API returns a error code. return FreeContextBuffer(handle) == 0; } @@ -1371,7 +1371,7 @@ internal SafeCloseHandle(IntPtr handle, bool ownsHandle) protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested to throw an exception here. We can ignore the Last Error code. return CloseHandle(handle); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/BinaryKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/BinaryKeyIdentifierClause.cs index 3d76a71a0..7ba89951f 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/BinaryKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/BinaryKeyIdentifierClause.cs @@ -52,7 +52,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { BinaryKeyIdentifierClause that = keyIdentifierClause as BinaryKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.identificationData)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/EncryptedKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/EncryptedKeyIdentifierClause.cs index 51d63656e..ff6808845 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/EncryptedKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/EncryptedKeyIdentifierClause.cs @@ -62,7 +62,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { EncryptedKeyIdentifierClause that = keyIdentifierClause as EncryptedKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.GetRawBuffer(), this.encryptionMethod, this.carriedKeyName)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/GenericXmlSecurityKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/GenericXmlSecurityKeyIdentifierClause.cs index 4aa931b59..510637d61 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/GenericXmlSecurityKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/GenericXmlSecurityKeyIdentifierClause.cs @@ -31,7 +31,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { GenericXmlSecurityKeyIdentifierClause that = keyIdentifierClause as GenericXmlSecurityKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.ReferenceXml)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/LocalIdKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/LocalIdKeyIdentifierClause.cs index d019ee201..a58c07bc4 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/LocalIdKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/LocalIdKeyIdentifierClause.cs @@ -60,7 +60,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { LocalIdKeyIdentifierClause that = keyIdentifierClause as LocalIdKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.localId, this.OwnerType)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/RsaKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/RsaKeyIdentifierClause.cs index ff88bc9bd..6071c80be 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/RsaKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/RsaKeyIdentifierClause.cs @@ -58,7 +58,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { RsaKeyIdentifierClause that = keyIdentifierClause as RsaKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.rsa)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/Saml2SecurityTokenHandler.cs b/System.IdentityModel/System/IdentityModel/Tokens/Saml2SecurityTokenHandler.cs index 63ea232ef..3911fb648 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/Saml2SecurityTokenHandler.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/Saml2SecurityTokenHandler.cs @@ -370,7 +370,7 @@ public override ReadOnlyCollection ValidateToken(SecurityToken t if (this.samlSecurityTokenRequirement.MapToWindows) { - // TFS: 153865, Microsoft WindowsIdentity does not set Authtype. I don't think that authtype should be set here anyway. + // TFS: 153865, [....] WindowsIdentity does not set Authtype. I don't think that authtype should be set here anyway. // The authtype will be S4U (kerberos) it doesn't really matter that the upn arrived in a SAML token. claimsIdentity = this.CreateWindowsIdentity(this.FindUpn(claimsIdentity)); @@ -3447,8 +3447,8 @@ protected virtual Saml2AudienceRestriction ReadAudienceRestriction(XmlReader rea } // We are now laxing the uri check for audience restriction to support interop partners - // This is a specific request from server : - + // This is a specific request from server : Bug 11850 + // ReadSimpleUriElement now has a flag that turns lax reading ON/OFF. audienceRestriction = new Saml2AudienceRestriction(ReadSimpleUriElement(reader, UriKind.RelativeOrAbsolute, true)); while (reader.IsStartElement(Saml2Constants.Elements.Audience, Saml2Constants.Namespace)) { diff --git a/System.IdentityModel/System/IdentityModel/Tokens/SamlAssertionKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/SamlAssertionKeyIdentifierClause.cs index 39d9aa6fb..e455fc17b 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/SamlAssertionKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/SamlAssertionKeyIdentifierClause.cs @@ -74,7 +74,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { SamlAssertionKeyIdentifierClause that = keyIdentifierClause as SamlAssertionKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.assertionId)); } diff --git a/System.IdentityModel/System/IdentityModel/Tokens/SamlSecurityTokenHandler.cs b/System.IdentityModel/System/IdentityModel/Tokens/SamlSecurityTokenHandler.cs index 0fbf94a87..3ee5369d3 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/SamlSecurityTokenHandler.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/SamlSecurityTokenHandler.cs @@ -1020,7 +1020,7 @@ public override ReadOnlyCollection ValidateToken(SecurityToken t if (_samlSecurityTokenRequirement.MapToWindows) { - // TFS: 153865, Microsoft WindowsIdentity does not set Authtype. I don't think that authtype should be set here anyway. + // TFS: 153865, [....] WindowsIdentity does not set Authtype. I don't think that authtype should be set here anyway. // The authtype will be S4U (kerberos) it doesn't really matter that the upn arrived in a SAML token. WindowsIdentity windowsIdentity = CreateWindowsIdentity(FindUpn(claimsIdentity)); diff --git a/System.IdentityModel/System/IdentityModel/Tokens/WrappedSaml2AssertionKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/WrappedSaml2AssertionKeyIdentifierClause.cs index 05109450c..473c17bff 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/WrappedSaml2AssertionKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/WrappedSaml2AssertionKeyIdentifierClause.cs @@ -11,9 +11,9 @@ namespace System.IdentityModel.Tokens /// /// This class wraps a Saml2AssertionKeyIdentifierClause and delegates to the wrapped clause. - /// It derives off the SamlAssertionKeyIdentifierClause to get around a specific - - + /// It derives off the SamlAssertionKeyIdentifierClause to get around a specific bug in WCF + /// where the WCF runtime will call the Saml2SecurityToken to create a SamlAssertionKeyIdentifierClause. + /// internal class WrappedSaml2AssertionKeyIdentifierClause : SamlAssertionKeyIdentifierClause { private Saml2AssertionKeyIdentifierClause clause; diff --git a/System.IdentityModel/System/IdentityModel/Tokens/X509IssuerSerialKeyIdentifierClause.cs b/System.IdentityModel/System/IdentityModel/Tokens/X509IssuerSerialKeyIdentifierClause.cs index 5da0cc8a5..f714137f1 100644 --- a/System.IdentityModel/System/IdentityModel/Tokens/X509IssuerSerialKeyIdentifierClause.cs +++ b/System.IdentityModel/System/IdentityModel/Tokens/X509IssuerSerialKeyIdentifierClause.cs @@ -50,7 +50,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { X509IssuerSerialKeyIdentifierClause that = keyIdentifierClause as X509IssuerSerialKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.issuerName, this.issuerSerialNumber)); } diff --git a/System.IdentityModel/System/IdentityModel/X509Util.cs b/System.IdentityModel/System/IdentityModel/X509Util.cs index afdb09f58..965002cd3 100644 --- a/System.IdentityModel/System/IdentityModel/X509Util.cs +++ b/System.IdentityModel/System/IdentityModel/X509Util.cs @@ -165,7 +165,7 @@ internal static string GetCertificateIssuerName(X509Certificate2 certificate, Is /// The revocation mode to use. /// The store to use. /// The X509CertificateValidator. - /// Due to a WCF + /// Due to a WCF bug, X509CertificateValidatorEx must be used rather than WCF's validators directly internal static X509CertificateValidator CreateCertificateValidator( System.ServiceModel.Security.X509CertificateValidationMode certificateValidationMode, X509RevocationMode revocationMode, diff --git a/System.IdentityModel/System/ServiceModel/Security/BinarySecretKeyIdentifierClause.cs b/System.IdentityModel/System/ServiceModel/Security/BinarySecretKeyIdentifierClause.cs index 6389818fd..79ce39c17 100644 --- a/System.IdentityModel/System/ServiceModel/Security/BinarySecretKeyIdentifierClause.cs +++ b/System.IdentityModel/System/ServiceModel/Security/BinarySecretKeyIdentifierClause.cs @@ -50,7 +50,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { BinarySecretKeyIdentifierClause that = keyIdentifierClause as BinarySecretKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.GetRawBuffer())); } diff --git a/System.IdentityModel/System/ServiceModel/Security/KeyNameIdentifierClause.cs b/System.IdentityModel/System/ServiceModel/Security/KeyNameIdentifierClause.cs index a36d14136..6bbb93644 100644 --- a/System.IdentityModel/System/ServiceModel/Security/KeyNameIdentifierClause.cs +++ b/System.IdentityModel/System/ServiceModel/Security/KeyNameIdentifierClause.cs @@ -32,7 +32,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { KeyNameIdentifierClause that = keyIdentifierClause as KeyNameIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.keyName)); } diff --git a/System.IdentityModel/System/ServiceModel/Security/ReferenceList.cs b/System.IdentityModel/System/ServiceModel/Security/ReferenceList.cs index 297209874..38447200d 100644 --- a/System.IdentityModel/System/ServiceModel/Security/ReferenceList.cs +++ b/System.IdentityModel/System/ServiceModel/Security/ReferenceList.cs @@ -38,7 +38,7 @@ public string Id { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException()); } diff --git a/System.IdentityModel/System/ServiceModel/Security/RelAssertionDirectKeyIdentifierClause.cs b/System.IdentityModel/System/ServiceModel/Security/RelAssertionDirectKeyIdentifierClause.cs index 7a8ac3dc6..792dac6c2 100644 --- a/System.IdentityModel/System/ServiceModel/Security/RelAssertionDirectKeyIdentifierClause.cs +++ b/System.IdentityModel/System/ServiceModel/Security/RelAssertionDirectKeyIdentifierClause.cs @@ -32,7 +32,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { RelAssertionDirectKeyIdentifierClause that = keyIdentifierClause as RelAssertionDirectKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return (ReferenceEquals(this, that) || (that != null && that.AssertionId == this.AssertionId)); } diff --git a/System.IdentityModel/System/ServiceModel/Security/SamlAssertionDirectKeyIdentifierClause.cs b/System.IdentityModel/System/ServiceModel/Security/SamlAssertionDirectKeyIdentifierClause.cs index 94c196b34..517a9a502 100644 --- a/System.IdentityModel/System/ServiceModel/Security/SamlAssertionDirectKeyIdentifierClause.cs +++ b/System.IdentityModel/System/ServiceModel/Security/SamlAssertionDirectKeyIdentifierClause.cs @@ -32,7 +32,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { SamlAssertionDirectKeyIdentifierClause that = keyIdentifierClause as SamlAssertionDirectKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return (ReferenceEquals(this, that) || (that != null && that.SamlUri == this.SamlUri)); } diff --git a/System.IdentityModel/System/ServiceModel/Security/SecurityContextKeyIdentifierClause.cs b/System.IdentityModel/System/ServiceModel/Security/SecurityContextKeyIdentifierClause.cs index 3813a4e16..6f6c70a7a 100644 --- a/System.IdentityModel/System/ServiceModel/Security/SecurityContextKeyIdentifierClause.cs +++ b/System.IdentityModel/System/ServiceModel/Security/SecurityContextKeyIdentifierClause.cs @@ -50,7 +50,7 @@ public override bool Matches(SecurityKeyIdentifierClause keyIdentifierClause) { SecurityContextKeyIdentifierClause that = keyIdentifierClause as SecurityContextKeyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'that' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 return ReferenceEquals(this, that) || (that != null && that.Matches(this.contextId, this.generation)); } diff --git a/System.Net/net/PeerToPeer/Collaboration/ContactManager.cs b/System.Net/net/PeerToPeer/Collaboration/ContactManager.cs index 0a863133e..de8d5aab8 100644 --- a/System.Net/net/PeerToPeer/Collaboration/ContactManager.cs +++ b/System.Net/net/PeerToPeer/Collaboration/ContactManager.cs @@ -1561,7 +1561,7 @@ private void CreateContactAsyncHelper(object state) object userToken = createAsyncState.UserToken; // - // Call the sync version of createcontact + // Call the [....] version of createcontact // try{ peerContact = CreateContact(peerNearMe); diff --git a/System.Net/net/PeerToPeer/Collaboration/PeerNearMe.cs b/System.Net/net/PeerToPeer/Collaboration/PeerNearMe.cs index b72b6f990..66fae79ab 100644 --- a/System.Net/net/PeerToPeer/Collaboration/PeerNearMe.cs +++ b/System.Net/net/PeerToPeer/Collaboration/PeerNearMe.cs @@ -315,7 +315,7 @@ internal protected void InternalRefreshData(object state) if (exception != null){ // - // Throw exception for sync but call callback for async with exception + // Throw exception for [....] but call callback for async with exception // if (!isAsync) throw exception; @@ -328,7 +328,7 @@ internal protected void InternalRefreshData(object state) Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Found endpoint match in Request status changed."); // - // For async call the callback and for sync just return + // For async call the callback and for [....] just return // if (isAsync){ RefreshDataCompletedEventArgs args = new @@ -352,7 +352,7 @@ internal protected void InternalRefreshData(object state) // // Async case with exception fire callback here - // Sync would have already thrown this by now + // [....] would have already thrown this by now // if (exception != null){ RefreshDataCompletedEventArgs args = new diff --git a/System.Net/net/PeerToPeer/PeerName.cs b/System.Net/net/PeerToPeer/PeerName.cs index b9502c116..e4c8f05b9 100644 --- a/System.Net/net/PeerToPeer/PeerName.cs +++ b/System.Net/net/PeerToPeer/PeerName.cs @@ -433,7 +433,7 @@ public bool IsSecured /// I have considered using regular expressions. However, the regular expressions offer /// poor performance and or startup cost. Really there is no substiture for custom /// parsing logic. I decided to write this piece of code to parse the peername for now - /// - Microsoft 6/6/2005 + /// - [....] 6/6/2005 /// /// /// diff --git a/System.Net/net/PeerToPeer/PeerNameResolver.cs b/System.Net/net/PeerToPeer/PeerNameResolver.cs index 62397d824..887280f92 100644 --- a/System.Net/net/PeerToPeer/PeerNameResolver.cs +++ b/System.Net/net/PeerToPeer/PeerNameResolver.cs @@ -490,7 +490,7 @@ internal int TraceEventId /// - /// PeerNameResolver does sync and async resolves. + /// PeerNameResolver does [....] and async resolves. /// PeerNameResolver supports multiple outstanding async calls /// public class PeerNameResolver @@ -581,7 +581,7 @@ public PeerNameRecordCollection Resolve(PeerName peerName, int maxRecords) } /// - /// Implements sync resolve of the PeerName in the cloud given + /// Implements [....] resolve of the PeerName in the cloud given /// /// /// @@ -641,7 +641,7 @@ public PeerNameRecordCollection Resolve(PeerName peerName, Cloud cloud, int maxR //--------------------------------------------------------------- //Trace log //--------------------------------------------------------------- - Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Sync Resolve called with PeerName: {0}, Cloud: {1}, MaxRecords {2}", peerName, cloud, maxRecords); + Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "[....] Resolve called with PeerName: {0}, Cloud: {1}, MaxRecords {2}", peerName, cloud, maxRecords); SafePeerData shEndPointInfoArray; string NativeCloudName = cloud.InternalName; @@ -721,7 +721,7 @@ public PeerNameRecordCollection Resolve(PeerName peerName, Cloud cloud, int maxR shEndPointInfoArray.Dispose(); } } - Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Sync Resolve returnig with PeerNameRecord count :{0}", PeerNameRecords.Count); + Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "[....] Resolve returnig with PeerNameRecord count :{0}", PeerNameRecords.Count); return PeerNameRecords; } diff --git a/System.Numerics/System/Numerics/Complex.cs b/System.Numerics/System/Numerics/Complex.cs index 579a96446..c1c4e1acb 100644 --- a/System.Numerics/System/Numerics/Complex.cs +++ b/System.Numerics/System/Numerics/Complex.cs @@ -290,7 +290,7 @@ public static Complex Sin(Complex value) { return new Complex(Math.Sin(a) * Math.Cosh(b), Math.Cos(a) * Math.Sinh(b)); } - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sinh", Justification = "Microsoft: Existing Name")] + [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sinh", Justification = "[....]: Existing Name")] public static Complex Sinh(Complex value) /* Hyperbolic sin */ { double a = value.m_real; @@ -309,7 +309,7 @@ public static Complex Cos(Complex value) { return new Complex(Math.Cos(a) * Math.Cosh(b), - (Math.Sin(a) * Math.Sinh(b))); } - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cosh", Justification = "Microsoft: Existing Name")] + [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cosh", Justification = "[....]: Existing Name")] public static Complex Cosh(Complex value) /* Hyperbolic cos */ { double a = value.m_real; @@ -325,7 +325,7 @@ public static Complex Tan(Complex value) { return (Sin(value) / Cos(value)); } - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Tanh", Justification = "Microsoft: Existing Name")] + [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Tanh", Justification = "[....]: Existing Name")] public static Complex Tanh(Complex value) /* Hyperbolic tan */ { return (Sinh(value) / Cosh(value)); @@ -362,7 +362,7 @@ public static Complex Exp(Complex value) /* The complex number raised to e */ return (new Complex(result_re, result_im)); } - [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sqrt", Justification = "Microsoft: Existing Name")] + [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Sqrt", Justification = "[....]: Existing Name")] public static Complex Sqrt(Complex value) /* Square root ot the complex number */ { return Complex.FromPolarCoordinates(Math.Sqrt(value.Magnitude), value.Phase / 2.0); diff --git a/System.Numerics/System/Numerics/Vector2_Intrinsics.cs b/System.Numerics/System/Numerics/Vector2_Intrinsics.cs index 167a91563..cd526bd34 100644 --- a/System.Numerics/System/Numerics/Vector2_Intrinsics.cs +++ b/System.Numerics/System/Numerics/Vector2_Intrinsics.cs @@ -64,11 +64,18 @@ public void CopyTo(Single[] array) public void CopyTo(Single[] array, int index) { if (array == null) - throw new ArgumentNullException("values"); + { + // Match the JIT's exception type here. For perf, a NullReference is thrown instead of an ArgumentNull. + throw new NullReferenceException(SR.GetString("Arg_NullArgumentNullRef")); + } if (index < 0 || index >= array.Length) + { throw new ArgumentOutOfRangeException(SR.GetString("Arg_ArgumentOutOfRangeException", index)); + } if ((array.Length - index) < 2) + { throw new ArgumentException(SR.GetString("Arg_ElementsInSourceIsGreaterThanDestination", index)); + } array[index] = X; array[index + 1] = Y; } diff --git a/System.Numerics/System/Numerics/Vector3_Intrinsics.cs b/System.Numerics/System/Numerics/Vector3_Intrinsics.cs index 925fcc9f6..628301fd8 100644 --- a/System.Numerics/System/Numerics/Vector3_Intrinsics.cs +++ b/System.Numerics/System/Numerics/Vector3_Intrinsics.cs @@ -78,11 +78,18 @@ public void CopyTo(Single[] array) public void CopyTo(Single[] array, int index) { if (array == null) - throw new ArgumentNullException("values"); + { + // Match the JIT's exception type here. For perf, a NullReference is thrown instead of an ArgumentNull. + throw new NullReferenceException(SR.GetString("Arg_NullArgumentNullRef")); + } if (index < 0 || index >= array.Length) + { throw new ArgumentOutOfRangeException(SR.GetString("Arg_ArgumentOutOfRangeException", index)); + } if ((array.Length - index) < 3) + { throw new ArgumentException(SR.GetString("Arg_ElementsInSourceIsGreaterThanDestination", index)); + } array[index] = X; array[index + 1] = Y; array[index + 2] = Z; diff --git a/System.Numerics/System/Numerics/Vector4_Intrinsics.cs b/System.Numerics/System/Numerics/Vector4_Intrinsics.cs index 87c76a360..97ca8021f 100644 --- a/System.Numerics/System/Numerics/Vector4_Intrinsics.cs +++ b/System.Numerics/System/Numerics/Vector4_Intrinsics.cs @@ -106,11 +106,18 @@ public void CopyTo(Single[] array) public void CopyTo(Single[] array, int index) { if (array == null) - throw new ArgumentNullException("values"); + { + // Match the JIT's exception type here. For perf, a NullReference is thrown instead of an ArgumentNull. + throw new NullReferenceException(SR.GetString("Arg_NullArgumentNullRef")); + } if (index < 0 || index >= array.Length) + { throw new ArgumentOutOfRangeException(SR.GetString("Arg_ArgumentOutOfRangeException", index)); + } if ((array.Length - index) < 4) + { throw new ArgumentException(SR.GetString("Arg_ElementsInSourceIsGreaterThanDestination", index)); + } array[index] = X; array[index + 1] = Y; array[index + 2] = Z; diff --git a/System.Runtime.Caching/System/Caching/MemoryCache.cs b/System.Runtime.Caching/System/Caching/MemoryCache.cs index f1181d806..e807bbdd8 100644 --- a/System.Runtime.Caching/System/Caching/MemoryCache.cs +++ b/System.Runtime.Caching/System/Caching/MemoryCache.cs @@ -480,7 +480,7 @@ public override bool Contains(string key, string regionName = null) { return (GetInternal(key, regionName) != null); } - // Dev10 907758: Breaking + // Dev10 907758: Breaking bug in System.RuntimeCaching.MemoryCache.AddOrGetExisting (CacheItem, CacheItemPolicy) public override bool Add(CacheItem item, CacheItemPolicy policy) { CacheItem existingEntry = AddOrGetExisting(item, policy); return (existingEntry == null || existingEntry.Value == null); diff --git a/System.Runtime.Caching/System/Caching/PerfCounters.cs b/System.Runtime.Caching/System/Caching/PerfCounters.cs index f9c417c6e..ed1dd7733 100644 --- a/System.Runtime.Caching/System/Caching/PerfCounters.cs +++ b/System.Runtime.Caching/System/Caching/PerfCounters.cs @@ -135,7 +135,7 @@ public void Dispose() { for (int i = 0; i < NUM_COUNTERS; i++) { PerformanceCounter counter = counters[i]; if (counter != null) { - // decrement counter by its current value, to zero it out for this instance of the named cache (see Dev10 + // decrement counter by its current value, to zero it out for this instance of the named cache (see Dev10 Bug 680819) long value = Interlocked.Exchange(ref _counterValues[i], 0); if (value != 0) { counter.IncrementBy(-value); diff --git a/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstanceHandle.cs b/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstanceHandle.cs index fc6f606c0..95764cc2b 100644 --- a/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstanceHandle.cs +++ b/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstanceHandle.cs @@ -89,7 +89,7 @@ private set { Fx.Assert(value != Guid.Empty, "Cannot set an empty Id."); Fx.Assert(this.id == Guid.Empty, "Cannot set Id more than once."); - Fx.Assert(!this.idIsSet, "idIsSet out of sync with id."); + Fx.Assert(!this.idIsSet, "idIsSet out of [....] with id."); this.id = value; diff --git a/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstancePersistenceContext.cs b/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstancePersistenceContext.cs index 10f946682..f5e657cf6 100644 --- a/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstancePersistenceContext.cs +++ b/System.Runtime.DurableInstancing/System/Runtime/DurableInstancing/InstancePersistenceContext.cs @@ -1596,7 +1596,7 @@ void Cleanup(AsyncResult result, Exception exception) } finally { - Fx.AssertAndThrowFatal(this.context.Active, "Out-of-sync between InstanceExecutionContext and ExecutionAsyncResult."); + Fx.AssertAndThrowFatal(this.context.Active, "Out-of-[....] between InstanceExecutionContext and ExecutionAsyncResult."); this.context.LastAsyncResult = null; this.context.RootAsyncResult = null; diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/Configuration/SerializationSectionGroup.cs b/System.Runtime.Serialization/System/Runtime/Serialization/Configuration/SerializationSectionGroup.cs index 7b73dabbe..044ffea17 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/Configuration/SerializationSectionGroup.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/Configuration/SerializationSectionGroup.cs @@ -13,7 +13,7 @@ static public SerializationSectionGroup GetSectionGroup(Configuration config) { throw System.Runtime.Serialization.DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("config"); } -#pragma warning suppress 56506 // Microsoft, config is checked above +#pragma warning suppress 56506 // [....], config is checked above return (SerializationSectionGroup)config.SectionGroups[ConfigurationStrings.SectionGroupName]; } diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/DataContractSet.cs b/System.Runtime.Serialization/System/Runtime/Serialization/DataContractSet.cs index 3df69e897..6792bd999 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/DataContractSet.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/DataContractSet.cs @@ -507,8 +507,16 @@ static bool IsTypeReferenceable(Type type) CollectionDataContract.IsCollection(type, out itemType) || ClassDataContract.IsNonAttributedTypeValidForSerialization(type)); } - catch (System.IO.FileLoadException) - { // this can happen in Type.IsDefined when trying to load a referenced library that is not available at design time. + catch (Exception ex) + { + // An exception can be thrown in the designer when a project has a runtime binding redirection for a referenced assembly or a reference dependent assembly. + // Type.IsDefined is known to throw System.IO.FileLoadException. + // ClassDataContract.IsNonAttributedTypeValidForSerialization is known to throw System.IO.FileNotFoundException. + // We guard against all non-critical exceptions. + if (Fx.IsFatal(ex)) + { + throw; + } } return false; diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs b/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs index b8620e452..3f756c1dc 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonEncodingStreamWrapper.cs @@ -14,7 +14,7 @@ namespace System.Runtime.Serialization.Json // This wrapper does not support seek. // Supports: UTF-8, Unicode, BigEndianUnicode - // ASSUMPTION (Microsoft): This class will only be used for EITHER reading OR writing. It can be done, it would just mean more buffers. + // ASSUMPTION ([....]): This class will only be used for EITHER reading OR writing. It can be done, it would just mean more buffers. class JsonEncodingStreamWrapper : Stream { [Fx.Tag.SecurityNote(Miscellaneous = "RequiresReview - Static fields are marked SecurityCritical or readonly to prevent" diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs b/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs index 736af7f52..dc71490b9 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/Json/JsonWriterDelegator.cs @@ -199,7 +199,7 @@ internal override void WriteDateTime(DateTime value) void WriteDateTimeInDefaultFormat(DateTime value) { // ToUniversalTime() truncates dates to DateTime.MaxValue or DateTime.MinValue instead of throwing - // This will break round-tripping of these dates (see + // This will break round-tripping of these dates (see bug 9690 in CSD Developer Framework) if (value.Kind != DateTimeKind.Utc) { long tickCount = value.Ticks - TimeZone.CurrentTimeZone.GetUtcOffset(value).Ticks; diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs b/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs index de0ed526f..581e40aee 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/Json/XmlJsonWriter.cs @@ -792,7 +792,7 @@ public override void WriteRaw(char[] buffer, int index, int count) WriteString(new string(buffer, index, count)); } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")] // Microsoft, ToLowerInvariant is just used in Json error message + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")] // [....], ToLowerInvariant is just used in Json error message public override void WriteStartAttribute(string prefix, string localName, string ns) { if (IsClosed) @@ -1374,7 +1374,7 @@ void ThrowIfServerTypeWritten(string dataTypeSpecified) } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")] // Microsoft, ToLowerInvariant is just used in Json error message + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")] // [....], ToLowerInvariant is just used in Json error message void ThrowInvalidAttributeContent() { if (HasOpenAttribute) diff --git a/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs b/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs index a934c235d..0f68cd85c 100644 --- a/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs +++ b/System.Runtime.Serialization/System/Runtime/Serialization/XmlObjectSerializerReadContextComplex.cs @@ -193,7 +193,7 @@ object InternalDeserializeWithSurrogate(XmlReaderDelegator xmlReader, Type decla { if (TD.DCDeserializeWithSurrogateStartIsEnabled()) { - TD.DCDeserializeWithSurrogateStart(surrogateDataContract.UnderlyingType.FullName); + TD.DCDeserializeWithSurrogateStart(declaredType.FullName); } DataContract dataContract = surrogateDataContract ?? diff --git a/System.Runtime.Serialization/System/Xml/EncodingStreamWrapper.cs b/System.Runtime.Serialization/System/Xml/EncodingStreamWrapper.cs index b0a6487fc..bea64bce4 100644 --- a/System.Runtime.Serialization/System/Xml/EncodingStreamWrapper.cs +++ b/System.Runtime.Serialization/System/Xml/EncodingStreamWrapper.cs @@ -11,9 +11,9 @@ namespace System.Xml // This wrapper does not support seek. // Constructors consume/emit byte order mark. // Supports: UTF-8, Unicode, BigEndianUnicode - // ASSUMPTION (Microsoft): This class will only be used for EITHER reading OR writing. It can be done, it would just mean more buffers. - // ASSUMPTION (Microsoft): The byte buffer is large enough to hold the declaration - // ASSUMPTION (Microsoft): The buffer manipulation methods (FillBuffer/Compare/etc.) will only be used to parse the declaration + // ASSUMPTION ([....]): This class will only be used for EITHER reading OR writing. It can be done, it would just mean more buffers. + // ASSUMPTION ([....]): The byte buffer is large enough to hold the declaration + // ASSUMPTION ([....]): The buffer manipulation methods (FillBuffer/Compare/etc.) will only be used to parse the declaration // during construction. class EncodingStreamWrapper : Stream { @@ -749,7 +749,7 @@ public override void SetLength(long value) // Add format exceptions // Do we need to modify the stream position/Seek to account for the buffer? - // ASSUMPTION (Microsoft): This class will only be used for EITHER reading OR writing. + // ASSUMPTION ([....]): This class will only be used for EITHER reading OR writing. #if NO class UTF16Stream : Stream { diff --git a/System.Runtime.Serialization/System/Xml/UniqueID.cs b/System.Runtime.Serialization/System/Xml/UniqueID.cs index 53fe8347c..2db9f63d6 100644 --- a/System.Runtime.Serialization/System/Xml/UniqueID.cs +++ b/System.Runtime.Serialization/System/Xml/UniqueID.cs @@ -352,7 +352,7 @@ unsafe public override string ToString() if (object.ReferenceEquals(id1, null) || object.ReferenceEquals(id2, null)) return false; -#pragma warning suppress 56506 // Microsoft, checks for whether id1 and id2 are null done above. +#pragma warning suppress 56506 // [....], checks for whether id1 and id2 are null done above. if (id1.IsGuid && id2.IsGuid) { return id1.idLow == id2.idLow && id1.idHigh == id2.idHigh; diff --git a/System.Runtime.Serialization/System/Xml/ValueHandle.cs b/System.Runtime.Serialization/System/Xml/ValueHandle.cs index 5d18e55fe..74313dec9 100644 --- a/System.Runtime.Serialization/System/Xml/ValueHandle.cs +++ b/System.Runtime.Serialization/System/Xml/ValueHandle.cs @@ -539,7 +539,7 @@ public string GetString() } } - // ASSUMPTION (Microsoft): all chars in str will be ASCII + // ASSUMPTION ([....]): all chars in str will be ASCII public bool Equals2(string str, bool checkLower) { if (this.type != ValueHandleType.UTF8) diff --git a/System.Runtime.Serialization/System/Xml/XmlBaseReader.cs b/System.Runtime.Serialization/System/Xml/XmlBaseReader.cs index 92000c475..008ed195f 100644 --- a/System.Runtime.Serialization/System/Xml/XmlBaseReader.cs +++ b/System.Runtime.Serialization/System/Xml/XmlBaseReader.cs @@ -1,8 +1,8 @@ //------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. //------------------------------------------------------------ -// PERF, Microsoft, Microsoft: Make LookupNamespace do something smarter when lots of names -// PERF, Microsoft, Microsoft: Make Attribute lookup smarter when lots of attributes +// PERF, [....], [....]: Make LookupNamespace do something smarter when lots of names +// PERF, [....], [....]: Make Attribute lookup smarter when lots of attributes namespace System.Xml { using System; @@ -1566,7 +1566,13 @@ int ReadBytes(Encoding encoding, int byteBlock, int charBlock, byte[] buffer, in { int actualCharCount; if (readContent) + { actualCharCount = ReadContentAsChars(chars, charCount, maxCharCount - charCount); + // When deserializing base64 content which contains new line chars (CR, LF) chars from ReadObject, the reader reads in chunks of base64 content, LF char, base64 content, LF char and so on + // Relying on encoding.GetBytes' exception to handle LF char would result in performance degradation so skipping LF char here + if (actualCharCount == 1 && chars[charCount] == '\n') + continue; + } else actualCharCount = ReadValueChunk(chars, charCount, maxCharCount - charCount); if (actualCharCount == 0) diff --git a/System.Runtime.Serialization/System/Xml/XmlConverter.cs b/System.Runtime.Serialization/System/Xml/XmlConverter.cs index 3f683a495..3497ba645 100644 --- a/System.Runtime.Serialization/System/Xml/XmlConverter.cs +++ b/System.Runtime.Serialization/System/Xml/XmlConverter.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. //------------------------------------------------------------ -// PERF, Microsoft, Microsoft: Make LookupNamespace do something smarter when lots of names -// PERF, Microsoft, Microsoft: Make Attribute lookup smarter when lots of attributes -// PERF: Microsoft, Microsoft: Compare safe/unsafe versions +// PERF, [....], [....]: Make LookupNamespace do something smarter when lots of names +// PERF, [....], [....]: Make Attribute lookup smarter when lots of attributes +// PERF: [....], [....]: Compare safe/unsafe versions namespace System.Xml { diff --git a/System.Runtime.Serialization/System/Xml/XmlDictionaryWriter.cs b/System.Runtime.Serialization/System/Xml/XmlDictionaryWriter.cs index 3868664cd..bfb1b2a98 100644 --- a/System.Runtime.Serialization/System/Xml/XmlDictionaryWriter.cs +++ b/System.Runtime.Serialization/System/Xml/XmlDictionaryWriter.cs @@ -145,7 +145,7 @@ public virtual void WriteXmlnsAttribute(string prefix, string namespaceUri) { if (LookupPrefix(namespaceUri) != null) return; -#pragma warning suppress 56506 // Microsoft, namespaceUri is already checked +#pragma warning suppress 56506 // [....], namespaceUri is already checked prefix = namespaceUri.Length == 0 ? string.Empty : string.Concat("d", namespaceUri.Length.ToString(System.Globalization.NumberFormatInfo.InvariantInfo)); } WriteAttributeString("xmlns", prefix, null, namespaceUri); @@ -196,7 +196,7 @@ public virtual void WriteQualifiedName(XmlDictionaryString localName, XmlDiction throw System.Runtime.Serialization.DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("localName")); if (namespaceUri == null) namespaceUri = XmlDictionaryString.Empty; -#pragma warning suppress 56506 // Microsoft, XmlDictionaryString.Empty is never null +#pragma warning suppress 56506 // [....], XmlDictionaryString.Empty is never null WriteQualifiedName(localName.Value, namespaceUri.Value); } @@ -301,7 +301,7 @@ void CompleteAndReleaseStream(bool completedSynchronously, Exception completionE { if (completionException == null) { - // only release stream when no exception (mirrors sync behaviour) + // only release stream when no exception (mirrors [....] behaviour) this.streamProvider.ReleaseStream(this.stream); this.stream = null; } @@ -311,7 +311,7 @@ void CompleteAndReleaseStream(bool completedSynchronously, Exception completionE void ContinueWork(bool completedSynchronously, Exception completionException = null) { - // Individual Reads or writes may complete sync or async. A callback however + // Individual Reads or writes may complete [....] or async. A callback however // will always all ContinueWork() with CompletedSynchronously=false this flag // is used to complete this AsyncResult. try @@ -565,7 +565,7 @@ void CompleteAndReleaseStream(bool completedSynchronously, Exception completionE { if (completionException == null) { - // only release stream when no exception (mirrors sync behaviour) + // only release stream when no exception (mirrors [....] behaviour) this.streamProvider.ReleaseStream(this.stream); this.stream = null; } @@ -582,7 +582,7 @@ bool ContinueWork(IAsyncResult result) { if (HandleReadBlock(result)) { - // Read completed (sync or async, doesn't matter) + // Read completed ([....] or async, doesn't matter) if (this.bytesRead > 0) { // allow loop to continue at Write @@ -604,7 +604,7 @@ bool ContinueWork(IAsyncResult result) { if (this.writeBlockHandler(result, this)) { - // Write completed (sync or async, doesn't matter) + // Write completed ([....] or async, doesn't matter) AdjustBlockSize(); operation = Operation.Read; } diff --git a/System.Runtime.Serialization/System/Xml/XmlMtomReader.cs b/System.Runtime.Serialization/System/Xml/XmlMtomReader.cs index 1c5fd2c4c..69831c0d8 100644 --- a/System.Runtime.Serialization/System/Xml/XmlMtomReader.cs +++ b/System.Runtime.Serialization/System/Xml/XmlMtomReader.cs @@ -2102,7 +2102,7 @@ public override bool CanWrite public override long Length { -#pragma warning suppress 56503 // Microsoft, required by the XmlReader +#pragma warning suppress 56503 // [....], required by the XmlReader get { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupportedOnStream, this.GetType().FullName))); } } @@ -2110,7 +2110,7 @@ public override long Position { get { -#pragma warning suppress 56503 // Microsoft, required by the XmlReader +#pragma warning suppress 56503 // [....], required by the XmlReader throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupportedOnStream, this.GetType().FullName))); } set { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupportedOnStream, this.GetType().FullName))); } @@ -2831,7 +2831,7 @@ public override long Length { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream contract +#pragma warning suppress 56503 // [....], required by the Stream contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupportedOnStream, stream.GetType().FullName))); } } @@ -2840,7 +2840,7 @@ public override long Position { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream contract +#pragma warning suppress 56503 // [....], required by the Stream contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupportedOnStream, stream.GetType().FullName))); } set diff --git a/System.Runtime.Serialization/System/Xml/XmlStreamNodeWriter.cs b/System.Runtime.Serialization/System/Xml/XmlStreamNodeWriter.cs index a31aeb766..7162dbfa3 100644 --- a/System.Runtime.Serialization/System/Xml/XmlStreamNodeWriter.cs +++ b/System.Runtime.Serialization/System/Xml/XmlStreamNodeWriter.cs @@ -656,9 +656,13 @@ unsafe protected int UnsafeGetUTF8Chars(char* chars, int charCount, byte[] buffe while (true) { - while (chars < charsMax && *chars < 0x80) + while (chars < charsMax) { - *bytes = (byte)(*chars); + char t = *chars; + if (t >= 0x80) + break; + + *bytes = (byte)t; bytes++; chars++; } diff --git a/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedHttpContext.cs b/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedHttpContext.cs index 35fc01d8c..7c0fda2a9 100644 --- a/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedHttpContext.cs +++ b/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedHttpContext.cs @@ -193,7 +193,7 @@ public override HttpOutput GetHttpOutput(Message message) { HttpInput httpInput = this.GetHttpInput(false); - // work around http.sys keep alive + // work around http.sys keep alive bug with chunked requests, see MB 49676, this is fixed in Vista if ((httpInput != null && httpInput.ContentLength == -1 && !OSEnvironmentHelper.IsVistaOrGreater) || !this.KeepAliveEnabled) { result.SetConnectionClose(); diff --git a/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedImpersonationContext.cs b/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedImpersonationContext.cs index 591bf22f0..336347f16 100644 --- a/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedImpersonationContext.cs +++ b/System.ServiceModel.Activation/System/ServiceModel/Activation/HostedImpersonationContext.cs @@ -59,7 +59,7 @@ public HostedImpersonationContext() [SecurityCritical] static void CloseInvalidOutSafeHandleCritical(SafeHandle handle) { - // Workaround for 64-bit CLR + // Workaround for 64-bit CLR bug VSWhidbey 546830 - sometimes invalid SafeHandles come back null. if (handle != null) { Fx.Assert(handle.IsInvalid, "CloseInvalidOutSafeHandle called with a valid handle!"); diff --git a/System.ServiceModel.Activation/System/ServiceModel/ServiceHostingEnvironment.cs b/System.ServiceModel.Activation/System/ServiceModel/ServiceHostingEnvironment.cs index bede66c59..6b5fd7e5b 100644 --- a/System.ServiceModel.Activation/System/ServiceModel/ServiceHostingEnvironment.cs +++ b/System.ServiceModel.Activation/System/ServiceModel/ServiceHostingEnvironment.cs @@ -516,7 +516,7 @@ static void HookADUnhandledExceptionEvent() static bool GetIsSimpleApplicationHost() { // ASPNET won't provide API to check Cassini. But it's safe and performant to check only - // the ApplicationID prefix (MessageBus + // the ApplicationID prefix (MessageBus Bug 24832). return (string.Compare(ISAPIApplicationIdPrefix, 0, HostingEnvironmentWrapper.UnsafeApplicationID, 0, ISAPIApplicationIdPrefix.Length, StringComparison.OrdinalIgnoreCase) != 0); } diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/BufferedReceiveManager.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/BufferedReceiveManager.cs index b240804d4..e8670e2a0 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/BufferedReceiveManager.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/BufferedReceiveManager.cs @@ -83,7 +83,7 @@ public bool BufferReceive(OperationContext operationContext, ReceiveContext rece // Actual Buffering lock (this.thisLock) { - // Optimistic state check in case we just raced with the receiveContext + // Optimistic state check in case we just ----d with the receiveContext // faulting. If the receiveContext still faults after the state check, the above // cleanup routine will handle things correctly. In both cases, a double-release // of the throttle is protected. diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/DurableInstanceManager.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/DurableInstanceManager.cs index 198c51157..2ff32b65c 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/DurableInstanceManager.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/DurableInstanceManager.cs @@ -1323,7 +1323,7 @@ static void Finally(AsyncResult result, Exception exception) // This async result waits for store events and handle them (currently only support HasRunnableWorkflowEvent). // It is intended to always complete async to simplify caller usage. - // 1) no code to handle sync completion. + // 1) no code to handle [....] completion. // 2) recursive call will be safe from StackOverflow. // For simplicity, we handle (load/run) each event one-by-one. // We ---- certain set of exception (see HandleException). Other will crash the process. diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceContext.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceContext.cs index 96a92a8fe..eb135add2 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceContext.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceContext.cs @@ -102,7 +102,7 @@ internal PersistenceContext(PersistenceProviderDirectory directory, InstanceStor ReadSuspendedInfo(view); } - // If we were loaded or we locked the instance, the keys will have been sync'd. + // If we were loaded or we locked the instance, the keys will have been [....]'d. if (IsInitialized || IsLocked) { RationalizeSavedKeys(false); diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceProviderDirectory.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceProviderDirectory.cs index 126936ab2..ed99706cb 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceProviderDirectory.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/PersistenceProviderDirectory.cs @@ -1178,7 +1178,7 @@ bool Finish() this.pipeline.Publish(); } - // PersistenceContext.Open doesn't do anything, so it's ok to call sync. + // PersistenceContext.Open doesn't do anything, so it's ok to call [....]. this.context.Open(TimeSpan.Zero); IAsyncResult result; diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/WorkflowServiceInstance.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/WorkflowServiceInstance.cs index 539cdf580..e5ea1459f 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/WorkflowServiceInstance.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/Dispatcher/WorkflowServiceInstance.cs @@ -42,7 +42,7 @@ namespace System.ServiceModel.Activities.Dispatcher // NOTE: There is a small period of time where no one things they own the lock. Exit has "handed // off the lock by calling Set on the waiter, but the waiter has not yet executed the code // which sets ownsLock to true. - // Sync Handoff - During sync handoff the ref bool ownsLock will be set accordingly by the + // [....] Handoff - During [....] handoff the ref bool ownsLock will be set accordingly by the // Acquire* method. These methods should always be called in a try block with a finally // which calls ReleaseLock. // Async Handoff - During async handoff the callback can assume it has the lock if either @@ -655,12 +655,12 @@ bool CleanupIdleWaiter(AsyncWaitHandle idleEvent, Exception waitException, ref b { if (!this.idleWaiters.Remove(idleEvent)) { - // If it wasn't in the list that means we raced between throwing from Wait + // If it wasn't in the list that means we ----d between throwing from Wait // and setting the event. This thread now is responsible for the lock. if (waitException is TimeoutException) { // In the case of Timeout we let setting the event win and signal to - // swallow the exception + // ---- the exception ownsLock = true; return false; @@ -814,7 +814,7 @@ void ReleaseLock(ref bool ownsLock, bool hasBeenPersistedByIdlePolicy) if (!this.executorLock.Exit(isRunnable, ref ownsLock)) { // No one was waiting, but we had activeOperations (otherwise we would not have gotten - // to this branch of the if). This means that we raced with a timeout and should resume + // to this branch of the if). This means that we ----d with a timeout and should resume // the workflow's execution. If we don't resume execution we'll just hang ... no one // has the lock, the workflow is ready to execute, but it is not. Fx.Assert(this.activeOperations > 0, "We should always have active operations otherwise we should have taken a different code path."); @@ -3268,7 +3268,7 @@ static void OnNextIdle(object state, TimeoutException asyncException) { // If the waitHandle is not in either of these lists then it must have // been removed by the Set() path - that means we've got the lock, so let's - // just run with it (IE - swallow the exception). + // just run with it (IE - ---- the exception). if (thisPtr.instance.nextIdleWaiters.Remove(thisPtr.waitHandle) || thisPtr.instance.idleWaiters.Remove(thisPtr.waitHandle)) { thisPtr.Complete(false, asyncException); @@ -5311,7 +5311,7 @@ static void OnAsyncWaiterSignaled(object state, TimeoutException asyncException) { if (!asyncWaiter.Owner.waiters.Remove(asyncWaiter.Token)) { - // We raced between timing out and getting signaled. + // We ----d between timing out and getting signaled. // We'll take the signal which means we now own the lock completionException = null; @@ -5604,7 +5604,7 @@ public bool TryBeginComplete(AsyncCallback callback, object state, out IAsyncRes { // In the interest of allocating less objects we don't implement // the full async pattern here. Instead, we've flattened it to - // do the sync part and then optionally delegate down to the inner + // do the [....] part and then optionally delegate down to the inner // BeginCommit. if (this.contextOwnedTransaction != null) { diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/InternalSendMessage.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/InternalSendMessage.cs index ffbe82df4..835190494 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/InternalSendMessage.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/InternalSendMessage.cs @@ -1830,7 +1830,7 @@ bool BeginSendMessage() { if (asyncSend) { - //If there is a transaction that we could be flowing out then we create this blocking clone to sync with the commit processing. + //If there is a transaction that we could be flowing out then we create this blocking clone to [....] with the commit processing. if (this.currentTransactionContext != null) { this.dependentClone = this.currentTransactionContext.DependentClone(DependentCloneOption.BlockCommitUntilComplete); @@ -2664,9 +2664,9 @@ public FinalizeCorrelationAsyncResult(MessageCorrelationCallbackMessageProperty property.Instance.CorrelationSynchronizer.NotifyRequestSetByChannel(new Action(OnWorkflowCorrelationProcessingComplete)); // We have to do this dance with the lock because - // we aren't sure if we've been running sync or not. + // we aren't sure if we've been running [....] or not. // NOTE: It is possible for us to go async and - // still decide we're completing sync. This is fine + // still decide we're completing [....]. This is fine // as it does not violate the async pattern since // the work is done by the time Begin completes. completeSelf = false; @@ -2697,9 +2697,9 @@ void OnWorkflowCorrelationProcessingComplete(Message updatedMessage) this.message = updatedMessage; // We have to do this dance with the lock because - // we aren't sure if we've been running sync or not. + // we aren't sure if we've been running [....] or not. // NOTE: It is possible for us to go async and - // still decide we're completing sync. This is fine + // still decide we're completing [....]. This is fine // as it does not violate the async pattern since // the work is done by the time Begin completes. bool completeSelf = false; diff --git a/System.ServiceModel.Activities/System/ServiceModel/Activities/WorkflowOperationContext.cs b/System.ServiceModel.Activities/System/ServiceModel/Activities/WorkflowOperationContext.cs index 812d50813..d9edb71a7 100644 --- a/System.ServiceModel.Activities/System/ServiceModel/Activities/WorkflowOperationContext.cs +++ b/System.ServiceModel.Activities/System/ServiceModel/Activities/WorkflowOperationContext.cs @@ -94,7 +94,7 @@ class WorkflowOperationContext : AsyncResult try { - // set activity ID on the executing thread ( + // set activity ID on the executing thread (Bug 113386) if (TraceUtility.MessageFlowTracingOnly) { this.e2eActivityId = TraceUtility.GetReceivedActivityId(this.OperationContext); diff --git a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpChannelBase.cs b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpChannelBase.cs index 6e0f45677..bd420a64d 100644 --- a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpChannelBase.cs +++ b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpChannelBase.cs @@ -481,7 +481,7 @@ private bool BeginCloseOutputChannel() // AsyncResult.AsyncCompletionWrapperCallback takes care of catching the exceptions for us. IAsyncResult result = this.channel.UdpOutputChannel.BeginClose(this.timeoutHelper.RemainingTime(), this.PrepareAsyncCompletion(completeCloseOutputChannelCallback), this); - // SyncContinue calls CompleteCloseOutputChannel for us in sync case. + // SyncContinue calls CompleteCloseOutputChannel for us in [....] case. return this.SyncContinue(result); } @@ -490,7 +490,7 @@ private bool BeginBaseClose() // AsyncResult.AsyncCompletionWrapperCallback takes care of catching the exceptions for us. IAsyncResult result = this.baseBeginClose(this.timeoutHelper.RemainingTime(), this.PrepareAsyncCompletion(completeBaseCloseCallback), this); - // SyncContinue calls CompleteBaseClose for us in sync case. + // SyncContinue calls CompleteBaseClose for us in [....] case. return this.SyncContinue(result); } } diff --git a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpOutputChannel.cs b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpOutputChannel.cs index ebc66d5ea..2a932ecbe 100644 --- a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpOutputChannel.cs +++ b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpOutputChannel.cs @@ -664,7 +664,7 @@ public SendAsyncResult(UdpOutputChannel channel, Message message, TimeSpan timeo if (completedSynchronously && this.retransmissionEnabled) { - // initial send completed sync, now we need to start the retransmission process... + // initial send completed [....], now we need to start the retransmission process... completedSynchronously = this.BeginRetransmission(); } diff --git a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpSocket.cs b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpSocket.cs index 3ee507f1b..2b746ed3f 100644 --- a/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpSocket.cs +++ b/System.ServiceModel.Channels/System/ServiceModel/Channels/UdpSocket.cs @@ -222,8 +222,8 @@ static Exception ConvertNetworkError(SocketException socketException, int size, if (socketException.ErrorCode == UnsafeNativeMethods.ERROR_INVALID_HANDLE) { - //This would likely indicate a - + //This would likely indicate a bug in our ref-counting + //for instance, a channel is closing the socket multiple times... Fx.Assert("The socket appears to have been closed unexpectedly. This probably indicates incorrect ref counting (i.e. a channel is closing the socket multiple times)"); result = new CommunicationObjectAbortedException(socketException.Message, socketException); } diff --git a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/AnnouncementService.cs b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/AnnouncementService.cs index f464d031e..89dd02a9a 100644 --- a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/AnnouncementService.cs +++ b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/AnnouncementService.cs @@ -46,7 +46,7 @@ public AnnouncementService(int duplicateMessageHistoryLength) void IAnnouncementContractApril2005.HelloOperation(HelloMessageApril2005 message) { - Fx.Assert("The sync method IAnnouncementContractApril2005.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractApril2005.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractApril2005.BeginHelloOperation(HelloMessageApril2005 message, AsyncCallback callback, object state) @@ -61,7 +61,7 @@ void IAnnouncementContractApril2005.EndHelloOperation(IAsyncResult result) void IAnnouncementContractApril2005.ByeOperation(ByeMessageApril2005 message) { - Fx.Assert("The sync method IAnnouncementContractApril2005.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractApril2005.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractApril2005.BeginByeOperation(ByeMessageApril2005 message, AsyncCallback callback, object state) @@ -76,7 +76,7 @@ void IAnnouncementContractApril2005.EndByeOperation(IAsyncResult result) void IAnnouncementContract11.HelloOperation(HelloMessage11 message) { - Fx.Assert("The sync method IAnnouncementContract11.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContract11.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContract11.BeginHelloOperation(HelloMessage11 message, AsyncCallback callback, object state) @@ -91,7 +91,7 @@ void IAnnouncementContract11.EndHelloOperation(IAsyncResult result) void IAnnouncementContract11.ByeOperation(ByeMessage11 message) { - Fx.Assert("The sync method IAnnouncementContract11.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContract11.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContract11.BeginByeOperation(ByeMessage11 message, AsyncCallback callback, object state) @@ -106,7 +106,7 @@ void IAnnouncementContract11.EndByeOperation(IAsyncResult result) void IAnnouncementContractCD1.HelloOperation(HelloMessageCD1 message) { - Fx.Assert("The sync method IAnnouncementContractCD1.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractCD1.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractCD1.BeginHelloOperation(HelloMessageCD1 message, AsyncCallback callback, object state) @@ -121,7 +121,7 @@ void IAnnouncementContractCD1.EndHelloOperation(IAsyncResult result) void IAnnouncementContractCD1.ByeOperation(ByeMessageCD1 message) { - Fx.Assert("The sync method IAnnouncementContractCD1.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractCD1.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractCD1.BeginByeOperation(ByeMessageCD1 message, AsyncCallback callback, object state) diff --git a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryProxy.cs b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryProxy.cs index 7f2946925..8b32eb3d7 100644 --- a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryProxy.cs +++ b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryProxy.cs @@ -65,7 +65,7 @@ protected DiscoveryProxy( void IAnnouncementContractApril2005.HelloOperation(HelloMessageApril2005 message) { - Fx.Assert("The sync method IAnnouncementContractApril2005.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractApril2005.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractApril2005.BeginHelloOperation(HelloMessageApril2005 message, AsyncCallback callback, object state) @@ -80,7 +80,7 @@ void IAnnouncementContractApril2005.EndHelloOperation(IAsyncResult result) void IAnnouncementContractApril2005.ByeOperation(ByeMessageApril2005 message) { - Fx.Assert("The sync method IAnnouncementContractApril2005.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractApril2005.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractApril2005.BeginByeOperation(ByeMessageApril2005 message, AsyncCallback callback, object state) @@ -95,7 +95,7 @@ void IAnnouncementContractApril2005.EndByeOperation(IAsyncResult result) void IAnnouncementContract11.HelloOperation(HelloMessage11 message) { - Fx.Assert("The sync method IAnnouncementContract11.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContract11.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContract11.BeginHelloOperation(HelloMessage11 message, AsyncCallback callback, object state) @@ -110,7 +110,7 @@ void IAnnouncementContract11.EndHelloOperation(IAsyncResult result) void IAnnouncementContract11.ByeOperation(ByeMessage11 message) { - Fx.Assert("The sync method IAnnouncementContract11.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContract11.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContract11.BeginByeOperation(ByeMessage11 message, AsyncCallback callback, object state) @@ -125,7 +125,7 @@ void IAnnouncementContract11.EndByeOperation(IAsyncResult result) void IAnnouncementContractCD1.HelloOperation(HelloMessageCD1 message) { - Fx.Assert("The sync method IAnnouncementContractCD1.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractCD1.HelloOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractCD1.BeginHelloOperation(HelloMessageCD1 message, AsyncCallback callback, object state) @@ -140,7 +140,7 @@ void IAnnouncementContractCD1.EndHelloOperation(IAsyncResult result) void IAnnouncementContractCD1.ByeOperation(ByeMessageCD1 message) { - Fx.Assert("The sync method IAnnouncementContractCD1.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IAnnouncementContractCD1.ByeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IAnnouncementContractCD1.BeginByeOperation(ByeMessageCD1 message, AsyncCallback callback, object state) @@ -155,7 +155,7 @@ void IAnnouncementContractCD1.EndByeOperation(IAsyncResult result) void IDiscoveryContractApril2005.ProbeOperation(ProbeMessageApril2005 request) { - Fx.Assert("The sync method IDiscoveryContractApril2005.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractApril2005.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractApril2005.BeginProbeOperation(ProbeMessageApril2005 request, AsyncCallback callback, object state) @@ -170,7 +170,7 @@ void IDiscoveryContractApril2005.EndProbeOperation(IAsyncResult result) void IDiscoveryContractApril2005.ResolveOperation(ResolveMessageApril2005 request) { - Fx.Assert("The sync method IDiscoveryContractApril2005.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractApril2005.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractApril2005.BeginResolveOperation(ResolveMessageApril2005 request, AsyncCallback callback, object state) @@ -185,7 +185,7 @@ void IDiscoveryContractApril2005.EndResolveOperation(IAsyncResult result) void IDiscoveryContractAdhoc11.ProbeOperation(ProbeMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractAdhoc11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhoc11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhoc11.BeginProbeOperation(ProbeMessage11 request, AsyncCallback callback, object state) @@ -200,7 +200,7 @@ void IDiscoveryContractAdhoc11.EndProbeOperation(IAsyncResult result) void IDiscoveryContractAdhoc11.ResolveOperation(ResolveMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractAdhoc11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhoc11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhoc11.BeginResolveOperation(ResolveMessage11 request, AsyncCallback callback, object state) @@ -215,7 +215,7 @@ void IDiscoveryContractAdhoc11.EndResolveOperation(IAsyncResult result) ProbeMatchesMessage11 IDiscoveryContractManaged11.ProbeOperation(ProbeMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractManaged11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManaged11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -231,7 +231,7 @@ ProbeMatchesMessage11 IDiscoveryContractManaged11.EndProbeOperation(IAsyncResult ResolveMatchesMessage11 IDiscoveryContractManaged11.ResolveOperation(ResolveMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractManaged11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManaged11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -247,7 +247,7 @@ ResolveMatchesMessage11 IDiscoveryContractManaged11.EndResolveOperation(IAsyncRe void IDiscoveryContractAdhocCD1.ProbeOperation(ProbeMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractAdhocCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhocCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhocCD1.BeginProbeOperation(ProbeMessageCD1 request, AsyncCallback callback, object state) @@ -262,7 +262,7 @@ void IDiscoveryContractAdhocCD1.EndProbeOperation(IAsyncResult result) void IDiscoveryContractAdhocCD1.ResolveOperation(ResolveMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractAdhocCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhocCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhocCD1.BeginResolveOperation(ResolveMessageCD1 request, AsyncCallback callback, object state) @@ -277,7 +277,7 @@ void IDiscoveryContractAdhocCD1.EndResolveOperation(IAsyncResult result) ProbeMatchesMessageCD1 IDiscoveryContractManagedCD1.ProbeOperation(ProbeMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractManagedCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManagedCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -293,7 +293,7 @@ ProbeMatchesMessageCD1 IDiscoveryContractManagedCD1.EndProbeOperation(IAsyncResu ResolveMatchesMessageCD1 IDiscoveryContractManagedCD1.ResolveOperation(ResolveMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractManagedCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManagedCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } diff --git a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryService.cs b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryService.cs index 98adc930d..b7119cb08 100644 --- a/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryService.cs +++ b/System.ServiceModel.Discovery/System/ServiceModel/Discovery/DiscoveryService.cs @@ -69,7 +69,7 @@ internal DiscoveryMessageSequenceGenerator MessageSequenceGenerator void IDiscoveryContractApril2005.ProbeOperation(ProbeMessageApril2005 request) { - Fx.Assert("The sync method IDiscoveryContractApril2005.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractApril2005.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractApril2005.BeginProbeOperation(ProbeMessageApril2005 request, AsyncCallback callback, object state) @@ -84,7 +84,7 @@ void IDiscoveryContractApril2005.EndProbeOperation(IAsyncResult result) void IDiscoveryContractApril2005.ResolveOperation(ResolveMessageApril2005 request) { - Fx.Assert("The sync method IDiscoveryContractApril2005.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractApril2005.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractApril2005.BeginResolveOperation(ResolveMessageApril2005 request, AsyncCallback callback, object state) @@ -99,7 +99,7 @@ void IDiscoveryContractApril2005.EndResolveOperation(IAsyncResult result) void IDiscoveryContractAdhoc11.ProbeOperation(ProbeMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractAdhoc11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhoc11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhoc11.BeginProbeOperation(ProbeMessage11 request, AsyncCallback callback, object state) @@ -114,7 +114,7 @@ void IDiscoveryContractAdhoc11.EndProbeOperation(IAsyncResult result) void IDiscoveryContractAdhoc11.ResolveOperation(ResolveMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractAdhoc11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhoc11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhoc11.BeginResolveOperation(ResolveMessage11 request, AsyncCallback callback, object state) @@ -129,7 +129,7 @@ void IDiscoveryContractAdhoc11.EndResolveOperation(IAsyncResult result) ProbeMatchesMessage11 IDiscoveryContractManaged11.ProbeOperation(ProbeMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractManaged11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManaged11.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -145,7 +145,7 @@ ProbeMatchesMessage11 IDiscoveryContractManaged11.EndProbeOperation(IAsyncResult ResolveMatchesMessage11 IDiscoveryContractManaged11.ResolveOperation(ResolveMessage11 request) { - Fx.Assert("The sync method IDiscoveryContractManaged11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManaged11.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -162,7 +162,7 @@ ResolveMatchesMessage11 IDiscoveryContractManaged11.EndResolveOperation(IAsyncRe void IDiscoveryContractAdhocCD1.ProbeOperation(ProbeMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractAdhocCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhocCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhocCD1.BeginProbeOperation(ProbeMessageCD1 request, AsyncCallback callback, object state) @@ -177,7 +177,7 @@ void IDiscoveryContractAdhocCD1.EndProbeOperation(IAsyncResult result) void IDiscoveryContractAdhocCD1.ResolveOperation(ResolveMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractAdhocCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractAdhocCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); } IAsyncResult IDiscoveryContractAdhocCD1.BeginResolveOperation(ResolveMessageCD1 request, AsyncCallback callback, object state) @@ -192,7 +192,7 @@ void IDiscoveryContractAdhocCD1.EndResolveOperation(IAsyncResult result) ProbeMatchesMessageCD1 IDiscoveryContractManagedCD1.ProbeOperation(ProbeMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractManagedCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManagedCD1.ProbeOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } @@ -208,7 +208,7 @@ ProbeMatchesMessageCD1 IDiscoveryContractManagedCD1.EndProbeOperation(IAsyncResu ResolveMatchesMessageCD1 IDiscoveryContractManagedCD1.ResolveOperation(ResolveMessageCD1 request) { - Fx.Assert("The sync method IDiscoveryContractManagedCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); + Fx.Assert("The [....] method IDiscoveryContractManagedCD1.ResolveOperation must not get invoked. It is marked with PreferAsyncInvocation flag."); return null; } diff --git a/System.ServiceModel.Internals/System/Runtime/AsyncResult.cs b/System.ServiceModel.Internals/System/Runtime/AsyncResult.cs index 996b8bece..652bb8721 100644 --- a/System.ServiceModel.Internals/System/Runtime/AsyncResult.cs +++ b/System.ServiceModel.Internals/System/Runtime/AsyncResult.cs @@ -402,7 +402,7 @@ protected static TAsyncResult End(IAsyncResult result) return asyncResult; } - // can be utilized by subclasses to write core completion code for both the sync and async paths + // can be utilized by subclasses to write core completion code for both the [....] and async paths // in one location, signalling chainable synchronous completion with the boolean result, // and leveraging PrepareAsyncCompletion for conversion to an AsyncCallback. // NOTE: requires that "this" is passed in as the state object to the asynchronous sub-call being used with a completion routine. diff --git a/System.ServiceModel.Internals/System/Runtime/Diagnostics/DiagnosticTraceBase.cs b/System.ServiceModel.Internals/System/Runtime/Diagnostics/DiagnosticTraceBase.cs index b05c6e8fb..5089c8727 100644 --- a/System.ServiceModel.Internals/System/Runtime/Diagnostics/DiagnosticTraceBase.cs +++ b/System.ServiceModel.Internals/System/Runtime/Diagnostics/DiagnosticTraceBase.cs @@ -482,7 +482,7 @@ void ShutdownTracing() { OnShutdownTracing(); } -#pragma warning suppress 56500 //Microsoft; Taken care of by FxCop +#pragma warning suppress 56500 //[....]; Taken care of by FxCop catch (Exception exception) { if (Fx.IsFatal(exception)) diff --git a/System.ServiceModel.Internals/System/Runtime/Diagnostics/EtwDiagnosticTrace.cs b/System.ServiceModel.Internals/System/Runtime/Diagnostics/EtwDiagnosticTrace.cs index c2a0ca931..4a81f353c 100644 --- a/System.ServiceModel.Internals/System/Runtime/Diagnostics/EtwDiagnosticTrace.cs +++ b/System.ServiceModel.Internals/System/Runtime/Diagnostics/EtwDiagnosticTrace.cs @@ -642,7 +642,7 @@ void ShutdownEtwProvider() { this.etwProvider.Dispose(); //no need to set this.etwProvider as null as Dispose() provides the necessary guard - //leaving it non-null protects trace calls from NullReferenceEx, CSDMain + //leaving it non-null protects trace calls from NullReferenceEx, CSDMain Bug 136228 } } catch (Exception exception) diff --git a/System.ServiceModel.Internals/System/Runtime/IOThreadScheduler.cs b/System.ServiceModel.Internals/System/Runtime/IOThreadScheduler.cs index a5185f4f5..7160ac29b 100644 --- a/System.ServiceModel.Internals/System/Runtime/IOThreadScheduler.cs +++ b/System.ServiceModel.Internals/System/Runtime/IOThreadScheduler.cs @@ -209,7 +209,7 @@ bool ScheduleCallbackLowPriHelper(Action callback, object state) if (Bits.Count(ht) == -1) { // Use a temporary local here to store the result of the Interlocked.CompareExchange. This - // works around a codegen + // works around a codegen bug in the 32-bit JIT (TFS 749182). int interlockedResult = Interlocked.CompareExchange(ref this.headTail, ht + Bits.HiOne, ht); if (ht == interlockedResult) { diff --git a/System.ServiceModel.Internals/System/Runtime/MruCache.cs b/System.ServiceModel.Internals/System/Runtime/MruCache.cs index dada2897f..91555c98f 100644 --- a/System.ServiceModel.Internals/System/Runtime/MruCache.cs +++ b/System.ServiceModel.Internals/System/Runtime/MruCache.cs @@ -60,7 +60,7 @@ public void Add(TKey key, TValue value) Fx.Assert(null != key, ""); // if anything goes wrong (duplicate entry, etc) we should - // clear our caches so that we don't get out of sync + // clear our caches so that we don't get out of [....] bool success = false; try { diff --git a/System.ServiceModel.Internals/System/Runtime/ThreadNeutralSemaphore.cs b/System.ServiceModel.Internals/System/Runtime/ThreadNeutralSemaphore.cs index 054e0504f..814d7819b 100644 --- a/System.ServiceModel.Internals/System/Runtime/ThreadNeutralSemaphore.cs +++ b/System.ServiceModel.Internals/System/Runtime/ThreadNeutralSemaphore.cs @@ -105,7 +105,7 @@ static void OnEnteredAsync(object state, TimeoutException exception) { if (!thisPtr.RemoveWaiter(data.Waiter)) { - // The timeout raced with Exit and exit won. + // The timeout ----d with Exit and exit won. // We've successfully entered. exceptionToPropagate = null; } @@ -160,7 +160,7 @@ public bool TryEnter(TimeSpan timeout) if (timedOut && !RemoveWaiter(waiter)) { - // The timeout raced with Exit and exit won. + // The timeout ----d with Exit and exit won. // We've successfully entered. timedOut = false; diff --git a/System.ServiceModel.Internals/System/Runtime/TraceLevelHelper.cs b/System.ServiceModel.Internals/System/Runtime/TraceLevelHelper.cs index 9eaf540e6..2098afd1b 100644 --- a/System.ServiceModel.Internals/System/Runtime/TraceLevelHelper.cs +++ b/System.ServiceModel.Internals/System/Runtime/TraceLevelHelper.cs @@ -10,7 +10,7 @@ namespace System.Runtime using System.Diagnostics; /// - /// Microsoft (11/15/10, CSDMain 194940) - Previously, this code first checked that the opcode was set to informational. If not, it would check + /// [....] (11/15/10, CSDMain 194940) - Previously, this code first checked that the opcode was set to informational. If not, it would check /// the opcode name for start, stop, suspend, or resume and use that or return Information otherwise. This does not work well with the latest /// ETW changes where almost every event has a task and opcode. With the old logic, if an opcode is set on the event with a level such as /// warning or error, the level would be incorrectly reported in diagnostic tracing as informational. Also, start/stop/suspend/resume events diff --git a/System.ServiceModel.Routing/System/ServiceModel/Routing/ProcessRequestAsyncResult.cs b/System.ServiceModel.Routing/System/ServiceModel/Routing/ProcessRequestAsyncResult.cs index 96de71799..707fae242 100644 --- a/System.ServiceModel.Routing/System/ServiceModel/Routing/ProcessRequestAsyncResult.cs +++ b/System.ServiceModel.Routing/System/ServiceModel/Routing/ProcessRequestAsyncResult.cs @@ -248,6 +248,22 @@ bool HandleClientOperationFailure(Exception exception) return true; } } + else if (exception is ProtocolException) + { + // This exception may happen when the current cached channel was closed due to end service recycles. + // We abort the channel in this case and clean it up from the session. + // We will then retry the request one more time only. In retried request, it will create a new channel because the cached channel has been cleaned up. + if (!this.abortedRetry) + { + SessionChannels sessionChannels = this.service.GetSessionChannels(this.messageRpc.Impersonating); + if (sessionChannels != null) + { + this.abortedRetry = true; + sessionChannels.AbortChannel(sendOperation.CurrentEndpoint); + return true; + } + } + } if (sendOperation.TryMoveToAlternate(exception)) { diff --git a/System.ServiceModel.Routing/System/ServiceModel/Routing/RoutingService.cs b/System.ServiceModel.Routing/System/ServiceModel/Routing/RoutingService.cs index d136269d2..32e9d3dcf 100644 --- a/System.ServiceModel.Routing/System/ServiceModel/Routing/RoutingService.cs +++ b/System.ServiceModel.Routing/System/ServiceModel/Routing/RoutingService.cs @@ -200,7 +200,7 @@ void IDisposable.Dispose() { if (this.perMessageChannels != null) { - //This is for impersonation, thus it's supposed to complete sync + //This is for impersonation, thus it's supposed to complete [....] IAsyncResult result = this.perMessageChannels.BeginClose(this.ChannelExtension.OperationTimeout, null, null); this.perMessageChannels.EndClose(result); this.perMessageChannels = null; diff --git a/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs b/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs index 83b5943fb..7e9b5bf65 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Description/WebHttpBehavior.cs @@ -116,12 +116,12 @@ public virtual void ApplyClientBehavior(ServiceEndpoint endpoint, ClientRuntime { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR2.CrossDomainJavascriptNotsupported)); } -#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null +#pragma warning disable 56506 // [....], endpoint.Contract is never null this.reflector = new XmlSerializerOperationBehavior.Reflector(endpoint.Contract.Namespace, null); foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { -#pragma warning disable 56506 // Microsoft, clientRuntime.Operations is never null +#pragma warning disable 56506 // [....], clientRuntime.Operations is never null if (clientRuntime.Operations.Contains(od.Name)) #pragma warning restore 56506 { @@ -169,7 +169,7 @@ public virtual void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDisp { this.HelpUri = new UriTemplate(HelpPage.OperationListHelpPageUriTemplate).BindByPosition(endpoint.ListenUri); } -#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null +#pragma warning disable 56506 // [....], endpoint.Contract is never null this.reflector = new XmlSerializerOperationBehavior.Reflector(endpoint.Contract.Namespace, null); #pragma warning restore 56506 @@ -177,12 +177,12 @@ public virtual void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDisp endpointDispatcher.AddressFilter = new PrefixEndpointAddressMessageFilter(endpoint.Address); endpointDispatcher.ContractFilter = new MatchAllMessageFilter(); // operation selector -#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime is never null +#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime is never null endpointDispatcher.DispatchRuntime.OperationSelector = this.GetOperationSelector(endpoint); #pragma warning restore 56506 // unhandled operation string actionStarOperationName = null; -#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null +#pragma warning disable 56506 // [....], endpoint.Contract is never null foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -197,7 +197,7 @@ public virtual void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDisp { // WCF v1 installs any Action="*" op into UnhandledDispatchOperation, but WebHttpBehavior // doesn't want this, so we 'move' that operation back into normal set of operations -#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.{Operations,UnhandledDispatchOperation} is never null +#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.{Operations,UnhandledDispatchOperation} is never null endpointDispatcher.DispatchRuntime.Operations.Add( endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation); #pragma warning restore 56506 @@ -228,7 +228,7 @@ public virtual void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDisp jsonContentType = JsonMessageEncoderFactory.GetContentType(null); } -#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null +#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null // always install UnhandledDispatchOperation (WebHttpDispatchOperationSelector may choose not to use it) endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation = new DispatchOperation(endpointDispatcher.DispatchRuntime, "*", WildcardAction, WildcardAction); endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation.DeserializeRequest = false; @@ -239,13 +239,13 @@ public virtual void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDisp foreach (OperationDescription od in endpoint.Contract.Operations) { DispatchOperation dop = null; -#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime, DispatchRuntime.Operations are never null +#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime, DispatchRuntime.Operations are never null if (endpointDispatcher.DispatchRuntime.Operations.Contains(od.Name)) #pragma warning restore 56506 { dop = endpointDispatcher.DispatchRuntime.Operations[od.Name]; } -#pragma warning disable 56506 // Microsoft, endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null +#pragma warning disable 56506 // [....], endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation is never null else if (endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation.Name == od.Name) { dop = endpointDispatcher.DispatchRuntime.UnhandledDispatchOperation; @@ -600,7 +600,7 @@ protected virtual IDispatchMessageFormatter GetReplyDispatchFormatter(OperationD WebMessageFormat responseFormat = GetResponseFormat(operationDescription); // Determine if we should add a json formatter; If the ResponseFormat is json, we always add the json formatter even if the - // operation is XmlSerializerFormat because the formatter constructor throws the exception: "json not valid with XmlSerializerFormat" [Microsoft] + // operation is XmlSerializerFormat because the formatter constructor throws the exception: "json not valid with XmlSerializerFormat" [[....]] bool useJson = (responseFormat == WebMessageFormat.Json || SupportsJsonFormat(operationDescription)); IDispatchMessageFormatter innerFormatter; diff --git a/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs b/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs index 8913c7090..bfa998237 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Description/WebScriptEnablingBehavior.cs @@ -126,7 +126,7 @@ public override bool FaultExceptionEnabled public override void ApplyClientBehavior(ServiceEndpoint endpoint, ClientRuntime clientRuntime) { base.ApplyClientBehavior(endpoint, clientRuntime); -#pragma warning disable 56506 // Microsoft, clientRuntime.MessageInspectors is never null +#pragma warning disable 56506 // [....], clientRuntime.MessageInspectors is never null clientRuntime.MessageInspectors.Add(new JsonClientMessageInspector()); #pragma warning restore 56506 } @@ -142,7 +142,7 @@ public override void ApplyDispatchBehavior(ServiceEndpoint endpoint, EndpointDis } catch (XmlException exception) { - // Microsoft, need to reference this resource string although fix for 13332 was removed + // [....], need to reference this resource string although fix for 13332 was removed throw System.ServiceModel.DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR2.GetString(SR2.InvalidXmlCharactersInNameUsedWithPOSTMethod, string.Empty, string.Empty, string.Empty), exception)); } } @@ -151,7 +151,7 @@ public override void Validate(ServiceEndpoint endpoint) { base.Validate(endpoint); -#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null +#pragma warning disable 56506 // [....], endpoint.Contract is never null foreach (OperationDescription operation in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -232,7 +232,7 @@ protected override void AddServerErrorHandlers(ServiceEndpoint endpoint, Endpoin throw System.ServiceModel.DiagnosticUtility.ExceptionUtility.ThrowHelperArgument( "endpointDispatcher", SR2.GetString(SR2.ChannelDispatcherMustBePresent)); } -#pragma warning disable 56506 // Microsoft, endpointDispatcher.ChannelDispatcher.ErrorHandlers never null +#pragma warning disable 56506 // [....], endpointDispatcher.ChannelDispatcher.ErrorHandlers never null endpointDispatcher.ChannelDispatcher.ErrorHandlers.Add(new JsonErrorHandler(endpoint, endpointDispatcher.ChannelDispatcher.IncludeExceptionDetailInFaults)); #pragma warning restore 56506 } diff --git a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs index 8596a0101..84ca48641 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HelpHtmlBuilder.cs @@ -165,7 +165,7 @@ public static XDocument CreateServerErrorPage(Uri helpUri, Exception error) { if (error != null) { - //TFS + //TFS Bug 500275: it is not necessary to HtmlEncode the error.Message string here because XElement ctor will encode it. div.Add(new XElement(HtmlPElementName, SR2.GetString(SR2.HelpServerErrorProcessingRequestWithDetails, error.Message))); div.Add(new XElement(HtmlPElementName, error.StackTrace ?? String.Empty)); } @@ -179,7 +179,7 @@ public static XDocument CreateServerErrorPage(Uri helpUri, Exception error) string encodedHelpLink = HttpUtility.HtmlEncode(helpUri.AbsoluteUri); if (error != null) { - //TFS + //TFS Bug 500275: XElement.Parse does not HtmlEncode the string passed to it, so we need to encode it before calling Parse. string errorMessage = AppSettings.DisableHtmlErrorPageExceptionHtmlEncoding ? error.Message : HttpUtility.HtmlEncode(error.Message); div.Add(XElement.Parse(SR2.GetString(SR2.HelpServerErrorProcessingRequestWithDetailsAndLink, encodedHelpLink, errorMessage))); div.Add(new XElement(HtmlPElementName, error.StackTrace ?? String.Empty)); diff --git a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs index 523e330f0..22389d6d9 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/HttpUnhandledOperationInvoker.cs @@ -36,7 +36,7 @@ public object Invoke(object instance, object[] inputs, out object[] outputs) { Message message = inputs[0] as Message; outputs = null; -#pragma warning disable 56506 // Microsoft, message.Properties is never null +#pragma warning disable 56506 // [....], message.Properties is never null if (message == null) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException( diff --git a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs index dba20ddce..ee73a7fd9 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Dispatcher/WebHttpDispatchOperationSelector.cs @@ -47,7 +47,7 @@ public WebHttpDispatchOperationSelector(ServiceEndpoint endpoint) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException( SR2.GetString(SR2.EndpointAddressCannotBeNull))); } -#pragma warning disable 56506 // Microsoft, endpoint.Address.Uri is never null +#pragma warning disable 56506 // [....], endpoint.Address.Uri is never null Uri baseUri = endpoint.Address.Uri; this.methodSpecificTables = new Dictionary(); this.templates = new Dictionary(); @@ -61,7 +61,7 @@ public WebHttpDispatchOperationSelector(ServiceEndpoint endpoint) Dictionary alreadyHaves = new Dictionary(); -#pragma warning disable 56506 // Microsoft, endpoint.Contract is never null +#pragma warning disable 56506 // [....], endpoint.Contract is never null foreach (OperationDescription od in endpoint.Contract.Operations) #pragma warning restore 56506 { @@ -156,7 +156,7 @@ public string SelectOperation(ref Message message) } bool uriMatched; string result = this.SelectOperation(ref message, out uriMatched); -#pragma warning disable 56506 // Microsoft, Message.Properties is never null +#pragma warning disable 56506 // [....], Message.Properties is never null message.Properties.Add(HttpOperationSelectorUriMatchedPropertyName, uriMatched); #pragma warning restore 56506 if (result != null) @@ -164,7 +164,7 @@ public string SelectOperation(ref Message message) message.Properties.Add(HttpOperationNamePropertyName, result); if (DiagnosticUtility.ShouldTraceInformation) { -#pragma warning disable 56506 // Microsoft, Message.Headers is never null +#pragma warning disable 56506 // [....], Message.Headers is never null TraceUtility.TraceEvent(TraceEventType.Information, TraceCode.WebRequestMatchesOperation, SR2.GetString(SR2.TraceCodeWebRequestMatchesOperation, message.Headers.To, result)); #pragma warning restore 56506 } @@ -186,7 +186,7 @@ protected virtual string SelectOperation(ref Message message, out bool uriMatche return this.catchAllOperationName; } -#pragma warning disable 56506 // Microsoft, message.Properties is never null +#pragma warning disable 56506 // [....], message.Properties is never null if (!message.Properties.ContainsKey(HttpRequestMessageProperty.Name)) { return this.catchAllOperationName; diff --git a/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs b/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs index 34857a865..4a3d17d51 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Web/HttpDateParse.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------ +//------------------------------------------------------------ // Copyright (c) Microsoft Corporation. All rights reserved. //------------------------------------------------------------ namespace System.ServiceModel.Web @@ -9,9 +9,9 @@ namespace System.ServiceModel.Web // DO NOT EDIT THIS CODE. // // All of the code from this class was taken from build 20717.00 - // of System.Net.HttpDateParse. If there is a - - + // of System.Net.HttpDateParse. If there is a bug with this code + // it should be fixed in the original System.Net.HttpDateParse + // and then ported here. [[....]] internal static class HttpDateParse { @@ -48,7 +48,7 @@ internal static class HttpDateParse private const int DATE_TOKEN_JANUARY = 1; private const int DATE_TOKEN_FEBRUARY = 2; - private const int DATE_TOKEN_Microsoft = 3; + private const int DATE_TOKEN_MARCH = 3; private const int DATE_TOKEN_APRIL = 4; private const int DATE_TOKEN_MAY = 5; private const int DATE_TOKEN_JUNE = 6; @@ -145,7 +145,7 @@ static int MapDayMonthToDword(char[] lpszDay, int index) switch (MakeUpper(lpszDay[index + 2])) { case 'R': - return DATE_TOKEN_Microsoft; + return DATE_TOKEN_MARCH; case 'Y': return DATE_TOKEN_MAY; } diff --git a/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs b/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs index aaff3cea2..e6d3a74f4 100644 --- a/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs +++ b/System.ServiceModel.Web/System/ServiceModel/Web/WebOperationContext.cs @@ -37,7 +37,7 @@ public WebOperationContext(OperationContext operationContext) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("operationContext"); } this.operationContext = operationContext; -#pragma warning disable 56506 // Microsoft, operationContext.Extensions is never null +#pragma warning disable 56506 // [....], operationContext.Extensions is never null if (operationContext.Extensions.Find() == null) { operationContext.Extensions.Add(this); diff --git a/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs b/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs index 2b72d5577..7fd8d6fd5 100644 --- a/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs +++ b/System.ServiceModel.Web/System/ServiceModel/WebHttpBinding.cs @@ -195,7 +195,7 @@ public bool CrossDomainScriptAccessEnabled } } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] // Microsoft, This is the pattern we use on the standard bindings in Indigo V1 + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")] // [....], This is the pattern we use on the standard bindings in Indigo V1 bool IBindingRuntimePreferences.ReceiveSynchronously { get { return false; } diff --git a/System.ServiceModel/InternalApis/Clr/inc/AppContextDefaultValues.cs b/System.ServiceModel/InternalApis/Clr/inc/AppContextDefaultValues.cs index 124f9f45a..8a130a0f3 100644 --- a/System.ServiceModel/InternalApis/Clr/inc/AppContextDefaultValues.cs +++ b/System.ServiceModel/InternalApis/Clr/inc/AppContextDefaultValues.cs @@ -25,7 +25,6 @@ public static void PopulateDefaultValues() /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can /// more easily support this on other platforms. /// - [System.Security.SecuritySafeCritical] private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) { string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; diff --git a/System.ServiceModel/System/ServiceModel/Activation/Configuration/ServiceModelActivationSectionGroup.cs b/System.ServiceModel/System/ServiceModel/Activation/Configuration/ServiceModelActivationSectionGroup.cs index 19c842d4e..5688f5591 100644 --- a/System.ServiceModel/System/ServiceModel/Activation/Configuration/ServiceModelActivationSectionGroup.cs +++ b/System.ServiceModel/System/ServiceModel/Activation/Configuration/ServiceModelActivationSectionGroup.cs @@ -19,7 +19,7 @@ static public ServiceModelActivationSectionGroup GetSectionGroup(Configuration c { throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("config"); } -#pragma warning suppress 56506 // Microsoft, Configuration.SectionGroups cannot be null +#pragma warning suppress 56506 // [....], Configuration.SectionGroups cannot be null return (ServiceModelActivationSectionGroup)config.SectionGroups[ConfigurationStrings.SectionGroupName]; } diff --git a/System.ServiceModel/System/ServiceModel/Activation/ListenerUnsafeNativeMethods.cs b/System.ServiceModel/System/ServiceModel/Activation/ListenerUnsafeNativeMethods.cs index 2b4bdc9f1..6e8d01914 100644 --- a/System.ServiceModel/System/ServiceModel/Activation/ListenerUnsafeNativeMethods.cs +++ b/System.ServiceModel/System/ServiceModel/Activation/ListenerUnsafeNativeMethods.cs @@ -257,7 +257,7 @@ internal SafeCloseHandle(IntPtr handle, bool ownsHandle) protected override bool ReleaseHandle() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // We are not interested to throw an exception here. We can ignore the Last Error code. return CloseHandle(handle); } @@ -279,7 +279,7 @@ internal SafeServiceHandle() override protected bool ReleaseHandle() { -#pragma warning suppress 56523 // Microsoft, should only fail if there is a +#pragma warning suppress 56523 // [....], should only fail if there is a bug (invalid handle); MDA will be raised return ListenerUnsafeNativeMethods.CloseServiceHandle(handle); } } diff --git a/System.ServiceModel/System/ServiceModel/Activation/Utility.cs b/System.ServiceModel/System/ServiceModel/Activation/Utility.cs index 9a011db96..32b1ecdc9 100644 --- a/System.ServiceModel/System/ServiceModel/Activation/Utility.cs +++ b/System.ServiceModel/System/ServiceModel/Activation/Utility.cs @@ -33,7 +33,7 @@ internal static Uri FormatListenerEndpoint(string serviceName, string listenerEn static SafeCloseHandle OpenCurrentProcessForWrite() { int processId = Process.GetCurrentProcess().Id; -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() SafeCloseHandle process = ListenerUnsafeNativeMethods.OpenProcess(ListenerUnsafeNativeMethods.PROCESS_QUERY_INFORMATION | ListenerUnsafeNativeMethods.WRITE_DAC | ListenerUnsafeNativeMethods.READ_CONTROL, false, processId); if (process.IsInvalid) { @@ -46,7 +46,7 @@ static SafeCloseHandle OpenCurrentProcessForWrite() static SafeCloseHandle OpenProcessForQuery(int pid) { -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() SafeCloseHandle process = ListenerUnsafeNativeMethods.OpenProcess(ListenerUnsafeNativeMethods.PROCESS_QUERY_INFORMATION, false, pid); if (process.IsInvalid) { @@ -99,7 +99,7 @@ static void GetTokenInformation(SafeCloseHandle token, ListenerUnsafeNativeMetho static SafeServiceHandle OpenSCManager() { -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() SafeServiceHandle scManager = ListenerUnsafeNativeMethods.OpenSCManager(null, null, ListenerUnsafeNativeMethods.SC_MANAGER_CONNECT); if (scManager.IsInvalid) { @@ -112,7 +112,7 @@ static SafeServiceHandle OpenSCManager() static SafeServiceHandle OpenService(SafeServiceHandle scManager, string serviceName, int purpose) { -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() SafeServiceHandle service = ListenerUnsafeNativeMethods.OpenService(scManager, serviceName, purpose); if (service.IsInvalid) { @@ -249,7 +249,7 @@ static void EditKernelObjectSecurity(SafeCloseHandle kernelObject, List @@ -78,7 +78,7 @@ public override long Length { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream.Length contract +#pragma warning suppress 56503 // [....], required by the Stream.Length contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.ReadNotSupported))); } } @@ -87,7 +87,7 @@ public override long Position { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream.Position contract +#pragma warning suppress 56503 // [....], required by the Stream.Position contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupported))); } set @@ -126,10 +126,19 @@ ByteBuffer GetCurrentBuffer() public override void Close() { - this.FlushPendingBuffer(); - stream.Close(); - this.WaitForAllWritesToComplete(); - this.closed = true; + try + { + if (!this.closed) + { + this.FlushPendingBuffer(); + stream.Close(); + this.WaitForAllWritesToComplete(); + } + } + finally + { + this.closed = true; + } } public override void Flush() @@ -326,7 +335,7 @@ public override void WriteByte(byte value) void DequeueAndFlush(ByteBuffer currentBuffer, AsyncEventArgsCallback callback) { // Dequeue does a checkout of the buffer from its slot. - // the callback for the sync path only enqueues the buffer. + // the callback for the [....] path only enqueues the buffer. // The WriteAsync callback needs to enqueue and also complete. this.currentByteBuffer = null; ByteBuffer dequeued = this.buffers.Dequeue(); @@ -747,7 +756,7 @@ static void WriteCallback(IAsyncResult result) buffer.stream.EndWrite(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/ChannelDemuxer.cs b/System.ServiceModel/System/ServiceModel/Channels/ChannelDemuxer.cs index bf44d9efe..8187627a3 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ChannelDemuxer.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ChannelDemuxer.cs @@ -127,6 +127,24 @@ TypedChannelDemuxer GetTypedDemuxer(Type channelType, BindingContext context) abstract class TypedChannelDemuxer { + internal static void AbortMessage(RequestContext request) + { + // RequestContext.RequestMessage can throw an AddressMismatch exception. + try + { + AbortMessage(request.RequestMessage); + } + catch (Exception e) + { + if (Fx.IsFatal(e)) + { + throw; + } + + DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); + } + } + internal static void AbortMessage(Message message) { try @@ -582,10 +600,11 @@ bool ProcessItem(TInnerItem item) { try { - Message message = this.GetMessage(item); + Message message = null; IChannelListener matchingListener = null; try { + message = this.GetMessage(item); matchingListener = MatchListener(message); } // The message may be bad because of which running the listener filters may throw @@ -1285,7 +1304,7 @@ public ReplyChannelDemuxer(BindingContext context) protected override void AbortItem(RequestContext request) { - AbortMessage(request.RequestMessage); + AbortMessage(request); request.Abort(); } @@ -2938,7 +2957,7 @@ public ReplySessionChannelDemuxer(BindingContext context, TimeSpan peekTimeout, protected override void AbortItem(RequestContext request) { - AbortMessage(request.RequestMessage); + AbortMessage(request); request.Abort(); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/CompositeDuplexBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/CompositeDuplexBindingElement.cs index 1dcac8496..f038eb553 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/CompositeDuplexBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/CompositeDuplexBindingElement.cs @@ -86,7 +86,7 @@ public override IChannelListener BuildChannelListener(Bindin else { // -#pragma warning suppress 56506 // Microsoft, context.Binding will never be null. +#pragma warning suppress 56506 // [....], context.Binding will never be null. context.ListenUriRelativeAddress = String.Empty; context.ListenUriMode = ListenUriMode.Unique; } diff --git a/System.ServiceModel/System/ServiceModel/Channels/Connection.cs b/System.ServiceModel/System/ServiceModel/Channels/Connection.cs index c795e66a1..9934d41ff 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/Connection.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/Connection.cs @@ -338,7 +338,7 @@ public override long Length { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream.Length contract +#pragma warning suppress 56503 // [....], required by the Stream.Length contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupported))); } } @@ -347,7 +347,7 @@ public override long Position { get { -#pragma warning suppress 56503 // Microsoft, required by the Stream.Position contract +#pragma warning suppress 56503 // [....], required by the Stream.Position contract throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotSupportedException(SR.GetString(SR.SeekNotSupported))); } set @@ -470,7 +470,7 @@ static void OnAsyncIOComplete(object state) { thisPtr.HandleIO(thisPtr.connection); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/ConnectionDemuxer.cs b/System.ServiceModel/System/ServiceModel/Channels/ConnectionDemuxer.cs index 9f50f397f..0a74ee019 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ConnectionDemuxer.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ConnectionDemuxer.cs @@ -554,7 +554,7 @@ bool HandlePreambleComplete(IAsyncResult result) IConnection upgradedConnection = this.serverSingletonPreambleReader.EndCompletePreamble(result); ServerSingletonConnectionReader singletonReader = new ServerSingletonConnectionReader(serverSingletonPreambleReader, upgradedConnection, this.demuxer); - //singletonReader doesn't have async version of ReceiveRequest, so just call the sync method for now. + //singletonReader doesn't have async version of ReceiveRequest, so just call the [....] method for now. RequestContext requestContext = singletonReader.ReceiveRequest(this.timeoutHelper.RemainingTime()); singletonChannelListener.ReceiveRequest(requestContext, serverSingletonPreambleReader.ConnectionDequeuedCallback, true); diff --git a/System.ServiceModel/System/ServiceModel/Channels/ConnectionModeReader.cs b/System.ServiceModel/System/ServiceModel/Channels/ConnectionModeReader.cs index 57a54e084..de091c4ea 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ConnectionModeReader.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ConnectionModeReader.cs @@ -134,7 +134,7 @@ static void ReadCallback(object state) completeSelf = reader.ContinueReading(); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception e) { if (Fx.IsFatal(e)) @@ -201,7 +201,7 @@ public void StartReading(TimeSpan receiveTimeout, Action connectionDequeuedCallb { completeSelf = ContinueReading(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/ConnectionPool.cs b/System.ServiceModel/System/ServiceModel/Channels/ConnectionPool.cs index fcab3692d..a76041897 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ConnectionPool.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ConnectionPool.cs @@ -1213,7 +1213,7 @@ static void OnConnect(IAsyncResult result) { completeSelf = thisPtr.HandleConnect(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1292,7 +1292,7 @@ static void OnProcessConnection(IAsyncResult result) thisPtr.SnapshotConnection(); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/ContentOnlyMessage.cs b/System.ServiceModel/System/ServiceModel/Channels/ContentOnlyMessage.cs index 0173e2b62..a2413853a 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ContentOnlyMessage.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ContentOnlyMessage.cs @@ -28,7 +28,7 @@ public override MessageHeaders Headers { if (IsDisposed) { -#pragma warning suppress 56503 // Microsoft, required by base class contract +#pragma warning suppress 56503 // [....], required by base class contract throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); } @@ -42,7 +42,7 @@ public override MessageProperties Properties { if (IsDisposed) { -#pragma warning suppress 56503 // Microsoft, required by base class contract +#pragma warning suppress 56503 // [....], required by base class contract throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/FramingChannels.cs b/System.ServiceModel/System/ServiceModel/Channels/FramingChannels.cs index 41c0e1f37..f232b0f7d 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/FramingChannels.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/FramingChannels.cs @@ -641,7 +641,7 @@ static void OnWritePreamble(object asyncState) { completeSelf = thisPtr.HandleWritePreamble(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -669,7 +669,7 @@ static void OnReadPreambleAck(object state) { completeSelf = thisPtr.HandlePreambleAck(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -702,7 +702,7 @@ static void OnUpgradeInitiatorOpen(IAsyncResult result) { completeSelf = thisPtr.HandleInitiatorOpen(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -735,7 +735,7 @@ static void OnUpgrade(IAsyncResult result) { completeSelf = thisPtr.HandleUpgrade(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -768,7 +768,7 @@ static void OnUpgradeInitiatorClose(IAsyncResult result) { completeSelf = thisPtr.HandleInitiatorClose(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -796,7 +796,7 @@ static void OnWritePreambleEnd(object asyncState) thisPtr.connection.EndWrite(); completeSelf = thisPtr.ReadAck(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -826,7 +826,7 @@ void OnFailedPreamble(IAsyncResult result) { ConnectionUpgradeHelper.EndDecodeFramingFault(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -913,7 +913,7 @@ static void OnEstablishConnection(IAsyncResult result) { completeSelf = thisPtr.HandleEstablishConnection(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1172,7 +1172,7 @@ static void OnReadFaultData(object state) { thisPtr.CompleteReadFaultData(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1335,7 +1335,7 @@ static void OnReadUpgradeResponse(object state) completeSelf = thisPtr.Begin(); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1366,7 +1366,7 @@ static void OnFailedUpgrade(IAsyncResult result) { ConnectionUpgradeHelper.EndDecodeFramingFault(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1392,7 +1392,7 @@ static void OnWriteUpgradeBytes(object asyncState) completeSelf = thisPtr.Begin(); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1423,7 +1423,7 @@ static void OnInitiateUpgrade(IAsyncResult result) thisPtr.CompleteUpgrade(result); completeSelf = thisPtr.Begin(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/FramingDecoders.cs b/System.ServiceModel/System/ServiceModel/Channels/FramingDecoders.cs index dbd6ca609..8c5b4e614 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/FramingDecoders.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/FramingDecoders.cs @@ -32,7 +32,7 @@ public int Value get { if (!isValueDecoded) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return value; } @@ -108,7 +108,7 @@ public string Value get { if (currentState != State.Done) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return value; } @@ -236,7 +236,7 @@ public Uri ValueAsUri get { if (!IsValueDecoded) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return via; } @@ -544,7 +544,7 @@ public FramingMode Mode get { if (currentState != State.Done) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return mode; } @@ -555,7 +555,7 @@ public int MajorVersion get { if (currentState != State.Done) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return majorVersion; } @@ -566,7 +566,7 @@ public int MinorVersion get { if (currentState != State.Done) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return minorVersion; } @@ -624,7 +624,7 @@ public string ContentType get { if (currentState < State.PreUpgradeStart) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return contentType; } @@ -635,7 +635,7 @@ public Uri Via get { if (currentState < State.ReadingContentTypeRecord) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return viaDecoder.ValueAsUri; } @@ -652,7 +652,7 @@ public string Upgrade get { if (currentState != State.UpgradeRequest) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return upgrade; } @@ -663,7 +663,7 @@ public int EnvelopeSize get { if (currentState < State.EnvelopeStart) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return envelopeSize; } @@ -880,7 +880,7 @@ public int ChunkSize { if (currentState < State.ChunkStart) { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); } @@ -1009,7 +1009,7 @@ public Uri Via get { if (currentState < State.ReadingContentTypeRecord) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return viaDecoder.ValueAsUri; } @@ -1020,7 +1020,7 @@ public string ContentType get { if (currentState < State.PreUpgradeStart) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return contentType; } @@ -1031,7 +1031,7 @@ public string Upgrade get { if (currentState != State.UpgradeRequest) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return upgrade; } @@ -1280,7 +1280,7 @@ public Uri Via get { if (currentState < State.ReadingContentTypeRecord) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return viaDecoder.ValueAsUri; } @@ -1291,7 +1291,7 @@ public string ContentType get { if (currentState < State.Start) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return contentType; } @@ -1386,7 +1386,7 @@ public int EnvelopeSize get { if (CurrentState < ClientFramingDecoderState.EnvelopeStart) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return envelopeSize; } @@ -1397,7 +1397,7 @@ public override string Fault get { if (CurrentState < ClientFramingDecoderState.Fault) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return faultDecoder.Value; } @@ -1543,7 +1543,7 @@ public override string Fault get { if (CurrentState < ClientFramingDecoderState.Fault) -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.FramingValueNotAvailable))); return faultDecoder.Value; } diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpChannelFactory.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpChannelFactory.cs index 8dd383564..482d0bfde 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpChannelFactory.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpChannelFactory.cs @@ -1305,7 +1305,7 @@ public Message WaitForReply(TimeSpan timeout) } catch (NullReferenceException nullReferenceException) { - // workaround for Whidbey + // workaround for Whidbey bug #558605 - only happens in streamed case. if (TransferModeHelper.IsRequestStreamed(this.factory.transferMode)) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( @@ -1496,7 +1496,7 @@ static void OnGetWebRequestCompletedCallback(IAsyncResult result) { completeSelf = thisPtr.OnGetWebRequestCompleted(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1610,7 +1610,7 @@ bool CompleteSend(IAsyncResult result) } catch (NullReferenceException nullReferenceException) { - // workaround for Whidbey + // workaround for Whidbey bug #558605 - only happens in streamed case. if (TransferModeHelper.IsRequestStreamed(this.factory.transferMode)) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( @@ -1667,7 +1667,7 @@ bool CompleteGetResponse(IAsyncResult result) } catch (NullReferenceException nullReferenceException) { - // workaround for Whidbey + // workaround for Whidbey bug #558605 - only happens in streamed case. if (TransferModeHelper.IsRequestStreamed(this.factory.transferMode)) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( @@ -1810,7 +1810,7 @@ static void OnParseIncomingMessage(IAsyncResult result) { thisPtr.CompleteParseIncomingMessage(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1837,7 +1837,7 @@ static void OnSend(IAsyncResult result) { completeSelf = thisPtr.CompleteSend(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1882,7 +1882,7 @@ static void OnGetResponse(IAsyncResult result) completeSelf = true; completionException = new CommunicationException(webException.Message, webException); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2068,7 +2068,7 @@ static void OnGetSspiCredential(IAsyncResult result) thisPtr.CompleteGetSspiCredential(result); thisPtr.CloseTokenProvidersIfRequired(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2096,7 +2096,7 @@ static void OnGetUserNameCredential(IAsyncResult result) thisPtr.CompleteGetUserNameCredential(result); thisPtr.CloseTokenProvidersIfRequired(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpChannelHelpers.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpChannelHelpers.cs index f346cfc93..5df21319d 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpChannelHelpers.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpChannelHelpers.cs @@ -780,7 +780,7 @@ static void OnRead(IAsyncResult result) { completeSelf = thisPtr.ContinueReading(thisPtr.inputStream.EndRead(result)); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1522,6 +1522,11 @@ void WriteStreamedMessage(TimeSpan timeout) { mtomMessageEncoder.WriteMessage(this.message, this.outputStream, this.mtomBoundary); } + + if (this.supportsConcurrentIO) + { + this.outputStream.Close(); + } } finally { @@ -1683,6 +1688,12 @@ bool HandleWriteStreamedMessage(IAsyncResult result) } httpOutput.messageEncoder.EndWriteMessage(result); + + if (this.httpOutput.supportsConcurrentIO) + { + httpOutput.outputStream.Close(); + } + return true; } else @@ -1712,6 +1723,11 @@ bool HandleWriteStreamedMessage(IAsyncResult result) content.EndWriteToStream(result); } + if (this.httpOutput.supportsConcurrentIO) + { + httpOutput.outputStream.Close(); + } + return true; } } @@ -2177,7 +2193,7 @@ bool WriteMessage(bool isStillSynchronous) bool WriteStreamedMessage() { - // return a bool to determine if we are sync. + // return a bool to determine if we are [....]. if (onWriteStreamedMessage == null) { @@ -2273,7 +2289,7 @@ static void OnGetOutputStream(IAsyncResult result) completeSelf = true; } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2299,7 +2315,7 @@ static void OnWriteStreamedMessageLater(object state) { completeSelf = thisPtr.WriteStreamedMessage(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2333,7 +2349,7 @@ static void OnWriteBody(IAsyncResult result) thisPtr.CompleteWriteBody(result); thisPtr.httpOutput.TraceSend(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2496,14 +2512,14 @@ protected override bool PrepareHttpSend(Message message) if (action != null) { - //This code is calling UrlPathEncode due to MessageBus - - - - - - - + //This code is calling UrlPathEncode due to MessageBus bug 53362. + //After reviewing this decision, we + //feel that this was probably the wrong thing to do because UrlPathEncode + //doesn't escape some characters like '+', '%', etc. The real issue behind + //bug 53362 may have been as simple as being encoded multiple times on the client + //but being decoded one time on the server. Calling UrlEncode would correctly + //escape these characters, but since we don't want to break any customers and no + //customers have complained, we will leave this as is for now... action = string.Format(CultureInfo.InvariantCulture, "\"{0}\"", UrlUtility.UrlPathEncode(action)); } @@ -2765,7 +2781,7 @@ static void OnGetRequestStream(IAsyncResult result) { thisPtr.CompleteGetRequestStream(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpPipeline.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpPipeline.cs index 2b6563596..ee321225b 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpPipeline.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpPipeline.cs @@ -444,7 +444,7 @@ public override void SendReply(Message message, TimeSpan timeout) bool lockTaken = false; try { - // We need this lock only in sync reply case. In this case, we hopped the thread in the request side, so it's possible to send the response here + // We need this lock only in [....] reply case. In this case, we hopped the thread in the request side, so it's possible to send the response here // before the TransportIntegrationHandler is ready on another thread (thus a race condition). So we use the lock here. In the incoming path, we won't // release the lock until the TransportIntegrationHandler is ready. Once we get the lock on the outgoing path, we can then call Wait() on this handler safely. Monitor.TryEnter(this.ThisLock, TimeoutHelper.ToMilliseconds(helper.RemainingTime()), ref lockTaken); @@ -615,7 +615,7 @@ protected virtual void SendHttpPipelineResponse() this.cancellationTokenSource.Dispose(); this.wasProcessInboundRequestSuccessful = true; //// shortcut scenario - //// Currently we are always doing sync send even async send is enabled. + //// Currently we are always doing [....] send even async send is enabled. this.SendAndClose(t.Result); } else if (this.isAsyncReply) diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpRequestContext.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpRequestContext.cs index c2f0b9b70..e76fb3a43 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpRequestContext.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpRequestContext.cs @@ -829,7 +829,7 @@ protected override void OnAcceptWebSocketSuccess(WebSocketContext context, HttpR public override HttpOutput GetHttpOutput(Message message) { - // work around http.sys keep alive + // work around http.sys keep alive bug with chunked requests, see MB 49676, this is fixed in Vista if (listenerContext.Request.ContentLength64 == -1 && !OSEnvironmentHelper.IsVistaOrGreater) { listenerContext.Response.KeepAlive = false; diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpTransportBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpTransportBindingElement.cs index c173b4317..479ca4862 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpTransportBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpTransportBindingElement.cs @@ -528,7 +528,7 @@ public override T GetProperty(BindingContext context) } else { -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null if (context.BindingParameters.Find() == null) { context.BindingParameters.Add(new TextMessageEncodingBindingElement()); @@ -578,7 +578,7 @@ public override IChannelFactory BuildChannelFactory(BindingC if (!this.CanBuildChannelFactory(context)) { -#pragma warning suppress 56506 // Microsoft, context.Binding will never be null. +#pragma warning suppress 56506 // [....], context.Binding will never be null. throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("TChannel", SR.GetString(SR.CouldnTCreateChannelForChannelType2, context.Binding.Name, typeof(TChannel))); } @@ -649,7 +649,7 @@ public override IChannelListener BuildChannelListener(Bindin if (!this.CanBuildChannelListener(context)) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument( -#pragma warning suppress 56506 // Microsoft, context.Binding will never be null. +#pragma warning suppress 56506 // [....], context.Binding will never be null. "TChannel", SR.GetString(SR.CouldnTCreateChannelForChannelType2, context.Binding.Name, typeof(TChannel))); } @@ -672,7 +672,7 @@ protected void UpdateAuthenticationSchemes(BindingContext context) if (effectiveAutheSchemes == AuthenticationSchemes.None) { -#pragma warning suppress 56506 // Microsoft, context.Binding will never be null. +#pragma warning suppress 56506 // [....], context.Binding will never be null. string bindingName = context.Binding.Name; if (this.AuthenticationScheme == AuthenticationSchemes.None) diff --git a/System.ServiceModel/System/ServiceModel/Channels/HttpsChannelFactory.cs b/System.ServiceModel/System/ServiceModel/Channels/HttpsChannelFactory.cs index 6f0924176..6b2511b4c 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/HttpsChannelFactory.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/HttpsChannelFactory.cs @@ -488,7 +488,7 @@ static void OnGetBaseWebRequestCallback(IAsyncResult result) thisPtr.request = thisPtr.httpsChannel.EndBaseGetWebRequest(result); thisPtr.factory.AddServerCertMappingOrSetRemoteCertificateValidationCallback(thisPtr.request, thisPtr.to); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -514,7 +514,7 @@ static void OnGetTokenCallback(IAsyncResult result) thisPtr.OnGetToken(result); completeSelf = thisPtr.GetWebRequest(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/IdlingCommunicationPool.cs b/System.ServiceModel/System/ServiceModel/Channels/IdlingCommunicationPool.cs index e576d74b1..b2563cc48 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/IdlingCommunicationPool.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/IdlingCommunicationPool.cs @@ -37,7 +37,7 @@ protected TimeSpan LeaseTimeout protected override void CloseItemAsync(TItem item, TimeSpan timeout) { - // Default behavior is sync. Derived classes can override. + // Default behavior is [....]. Derived classes can override. this.CloseItem(item, timeout); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/InitialServerConnectionReader.cs b/System.ServiceModel/System/ServiceModel/Channels/InitialServerConnectionReader.cs index d9d1af921..4bc768331 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/InitialServerConnectionReader.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/InitialServerConnectionReader.cs @@ -404,7 +404,7 @@ static void OnAcceptUpgrade(IAsyncResult result) { thisPtr.CompleteAcceptUpgrade(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/InputChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/InputChannel.cs index b4e5202fa..26f1e3aa3 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/InputChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/InputChannel.cs @@ -223,7 +223,7 @@ static void OnReceive(IAsyncResult result) { thisPtr.HandleReceiveComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexBindingElement.cs index 5abee3c70..dc126777c 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexBindingElement.cs @@ -69,7 +69,7 @@ public override IChannelFactory BuildChannelFactory(BindingC } else { -#pragma warning suppress 56506 // Microsoft, context.RemainingBindingElements will never be null +#pragma warning suppress 56506 // [....], context.RemainingBindingElements will never be null context.RemainingBindingElements.Clear(); } LocalAddressProvider localAddressProvider = context.BindingParameters.Remove(); diff --git a/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexChannelListener.cs b/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexChannelListener.cs index 9f3022762..279523221 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexChannelListener.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/InternalDuplexChannelListener.cs @@ -345,7 +345,7 @@ static void SendCompleteCallback(IAsyncResult result) { thisPtr.CompleteSend(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/Message.cs b/System.ServiceModel/System/ServiceModel/Channels/Message.cs index 2ae3bf5e3..5ea731f08 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/Message.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/Message.cs @@ -34,7 +34,7 @@ public virtual bool IsFault get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return false; @@ -46,7 +46,7 @@ public virtual bool IsEmpty get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return false; @@ -978,7 +978,7 @@ public override bool IsFault get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return bodyWriter.IsFault; } @@ -989,7 +989,7 @@ public override bool IsEmpty get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return bodyWriter.IsEmpty; } @@ -1000,7 +1000,7 @@ public override MessageHeaders Headers get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return headers; } @@ -1011,7 +1011,7 @@ public override MessageProperties Properties get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); if (properties == null) properties = new MessageProperties(); @@ -1024,7 +1024,7 @@ public override MessageVersion Version get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return headers.MessageVersion; } @@ -1306,7 +1306,7 @@ public override MessageHeaders Headers get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return headers; } @@ -1522,7 +1522,7 @@ public override MessageHeaders Headers get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return headers; } @@ -1541,7 +1541,7 @@ public override MessageProperties Properties get { if (IsDisposed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); return properties; } diff --git a/System.ServiceModel/System/ServiceModel/Channels/MessageBuffer.cs b/System.ServiceModel/System/ServiceModel/Channels/MessageBuffer.cs index 383bf17b7..4a1588076 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MessageBuffer.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MessageBuffer.cs @@ -197,7 +197,7 @@ public override int BufferSize lock (ThisLock) { if (closed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(CreateBufferDisposedException()); return messageData.Buffer.Count; } @@ -224,7 +224,7 @@ public override string MessageContentType lock (ThisLock) { if (closed) -#pragma warning suppress 56503 // Microsoft, Invalid State after dispose +#pragma warning suppress 56503 // [....], Invalid State after dispose throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(CreateBufferDisposedException()); return messageData.MessageEncoder.ContentType; } diff --git a/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElement.cs index 72af69543..1dcae5bf0 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElement.cs @@ -38,7 +38,7 @@ internal IChannelFactory InternalBuildChannelFactory(Binding throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters never be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters never be null context.BindingParameters.Add(this); return context.BuildInnerChannelFactory(); } @@ -50,7 +50,7 @@ internal bool InternalCanBuildChannelFactory(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters never be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters never be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelFactory(); } @@ -63,7 +63,7 @@ internal IChannelListener InternalBuildChannelListener(Bindi throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters never be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters never be null context.BindingParameters.Add(this); return context.BuildInnerChannelListener(); } @@ -76,7 +76,7 @@ internal bool InternalCanBuildChannelListener(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters never be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters never be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelListener(); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElementImporter.cs b/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElementImporter.cs index 3662da87d..6b4de1fab 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElementImporter.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MessageEncodingBindingElementImporter.cs @@ -25,7 +25,7 @@ void IWsdlImportExtension.ImportEndpoint(WsdlImporter importer, WsdlEndpointConv throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, these properties cannot be null in this context +#pragma warning suppress 56506 // [....], these properties cannot be null in this context if (context.Endpoint.Binding == null) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context.Endpoint.Binding"); diff --git a/System.ServiceModel/System/ServiceModel/Channels/MessageFault.cs b/System.ServiceModel/System/ServiceModel/Channels/MessageFault.cs index 09e60dfff..5803f1710 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MessageFault.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MessageFault.cs @@ -69,7 +69,7 @@ public static MessageFault CreateFault(Message message, int maxBufferSize) { try { -#pragma warning suppress 56506 // Microsoft, Message.Version can never be null +#pragma warning suppress 56506 // [....], Message.Version can never be null EnvelopeVersion envelopeVersion = message.Version.Envelope; MessageFault fault; if (envelopeVersion == EnvelopeVersion.Soap12) diff --git a/System.ServiceModel/System/ServiceModel/Channels/MessageHeaders.cs b/System.ServiceModel/System/ServiceModel/Channels/MessageHeaders.cs index 5accd13b6..de966e449 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MessageHeaders.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MessageHeaders.cs @@ -490,7 +490,7 @@ public void CopyHeaderFrom(MessageHeaders collection, int headerIndex) if (collection.version != version) { -#pragma warning suppress 56506 // Microsoft, collection.version is never null +#pragma warning suppress 56506 // [....], collection.version is never null throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentException(SR.GetString(SR.MessageHeaderVersionMismatch, collection.version.ToString(), version.ToString()), "collection")); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/MsmqDecodeHelper.cs b/System.ServiceModel/System/ServiceModel/Channels/MsmqDecodeHelper.cs index 0fe664c4b..4fba9a574 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/MsmqDecodeHelper.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/MsmqDecodeHelper.cs @@ -325,8 +325,8 @@ static Message DecodeSessiongramMessage( throw listener.NormalizePoisonException(messageProperty.LookupId, MaxMessageSizeStream.CreateMaxReceivedMessageSizeExceededException(listener.MaxReceivedMessageSize)); } - // Fix for CSDMain - + // Fix for CSDMain bug 17842 + // size is derived from user data, check for corruption if ((size + offset) > buffer.Length) { listener.MsmqReceiveHelper.FinalDisposition(messageProperty); diff --git a/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelFactory.cs b/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelFactory.cs index c37698a5e..f45463a33 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelFactory.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelFactory.cs @@ -763,7 +763,7 @@ static void OnOpen(IAsyncResult result) thisPtr.CompleteOpen(result); completeSelf = thisPtr.SendMessage(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -796,7 +796,7 @@ static void OnInnerSend(IAsyncResult result) { thisPtr.innerChannel.EndSend(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelListener.cs b/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelListener.cs index afba9b018..ef8abafcf 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelListener.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/OneWayChannelListener.cs @@ -429,7 +429,7 @@ static void OnReceiveRequest(IAsyncResult result) { completeSelf = thisPtr.HandleReceiveRequestComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -461,7 +461,7 @@ static void OnReply(IAsyncResult result) { completeSelf = thisPtr.HandleReplyComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -770,7 +770,7 @@ void AcceptLoop(IAsyncResult pendingResult) return; } } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -809,7 +809,7 @@ bool ProcessEndAccept(IAsyncResult result, out IDuplexSessionChannel channel) { DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -940,7 +940,7 @@ void HandleAcceptComplete(IDuplexSessionChannel channel) } DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -1007,7 +1007,7 @@ void CompleteOpen(IDuplexSessionChannel channel, IAsyncResult result) } DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -1274,7 +1274,7 @@ public void StartReceiving() { DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -1379,7 +1379,7 @@ bool OnCompleteReceive(IAsyncResult result, out bool dispatchLater) DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); startLoop = (this.channel.State == CommunicationState.Opened); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) @@ -1415,7 +1415,7 @@ void OnMessageDequeued() { DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to input queue to be pulled off by user +#pragma warning suppress 56500 // [....], transferring exception to input queue to be pulled off by user catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/OverlappedContext.cs b/System.ServiceModel/System/ServiceModel/Channels/OverlappedContext.cs index f03b40799..7af860972 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/OverlappedContext.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/OverlappedContext.cs @@ -109,7 +109,7 @@ public void Free() } if (this.syncOperationPending) { - throw Fx.AssertAndThrow("OverlappedContext.Free called while sync operation is pending."); + throw Fx.AssertAndThrow("OverlappedContext.Free called while [....] operation is pending."); } if (this.nativeOverlapped == null) { @@ -172,7 +172,7 @@ public void StartAsyncOperation(byte[] buffer, OverlappedIOCompleteCallback call } if (this.syncOperationPending) { - throw Fx.AssertAndThrow("StartAsyncOperation called while a sync operation was already pending."); + throw Fx.AssertAndThrow("StartAsyncOperation called while a [....] operation was already pending."); } if (this.nativeOverlapped == null) { @@ -249,7 +249,7 @@ public void StartSyncOperation(byte[] buffer, ref object holder) this.overlapped.EventHandleIntPtr = EventHandle; - // Sync operations do NOT root this object. If it gets finalized, we need to know not to free the buffer. + // [....] operations do NOT root this object. If it gets finalized, we need to know not to free the buffer. // We do root the event. this.rootedHolder.EventHolder = this.completionEvent; this.syncOperationPending = true; @@ -292,7 +292,7 @@ public bool WaitForSyncOperation(TimeSpan timeout, ref object holder) } Fx.Assert(this.bufferPtr == null || this.bufferPtr == (byte*)Marshal.UnsafeAddrOfPinnedArrayElement((byte[])holder, 0), - "The buffer moved during a sync call!"); + "The buffer moved during a [....] call!"); CancelSyncOperation(ref holder); return true; @@ -333,7 +333,7 @@ public byte* BufferPtr byte* ptr = this.bufferPtr; if (ptr == null) { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("Pointer requested while no operation pending or no buffer provided."); } return ptr; @@ -348,7 +348,7 @@ public NativeOverlapped* NativeOverlapped NativeOverlapped* ptr = this.nativeOverlapped; if (ptr == null) { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("NativeOverlapped pointer requested after it was freed."); } return ptr; @@ -446,14 +446,14 @@ static void CleanupCallback(object state, bool timedOut) Fx.Assert(pThis.bufferPtr == null || pThis.bufferPtr == (byte*)Marshal.UnsafeAddrOfPinnedArrayElement((byte[])pThis.bufferHolder[0], 0), "Buffer moved during synchronous deferred cleanup!"); - Fx.Assert(pThis.syncOperationPending, "OverlappedContext.CleanupCallback called with no sync operation pending."); + Fx.Assert(pThis.syncOperationPending, "OverlappedContext.CleanupCallback called with no [....] operation pending."); pThis.pinnedTarget = null; pThis.rootedHolder.EventHolder.Close(); Overlapped.Free(pThis.nativeOverlapped); } // This class is always held onto (rooted) by the packed Overlapped. The OverlappedContext instance moves itself in and out of - // this object to root itself. It's also used to root the ManualResetEvent during sync operations. + // this object to root itself. It's also used to root the ManualResetEvent during [....] operations. // It needs to be an IAsyncResult since that's what Overlapped takes. class RootedHolder : IAsyncResult { @@ -493,7 +493,7 @@ object IAsyncResult.AsyncState { get { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("RootedHolder.AsyncState called."); } } @@ -502,7 +502,7 @@ WaitHandle IAsyncResult.AsyncWaitHandle { get { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("RootedHolder.AsyncWaitHandle called."); } } @@ -511,7 +511,7 @@ bool IAsyncResult.CompletedSynchronously { get { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("RootedHolder.CompletedSynchronously called."); } } @@ -520,7 +520,7 @@ bool IAsyncResult.IsCompleted { get { -#pragma warning suppress 56503 // Microsoft, not a publicly accessible API +#pragma warning suppress 56503 // [....], not a publicly accessible API throw Fx.AssertAndThrow("RootedHolder.IsCompleted called."); } } diff --git a/System.ServiceModel/System/ServiceModel/Channels/PeerCustomResolverBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/PeerCustomResolverBindingElement.cs index 00ba45b87..a9e8a8ea0 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/PeerCustomResolverBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/PeerCustomResolverBindingElement.cs @@ -52,7 +52,7 @@ public PeerCustomResolverBindingElement(BindingContext context, PeerCustomResolv if (context == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); -#pragma warning suppress 56506 // Microsoft, context.BindingParameters is never null +#pragma warning suppress 56506 // [....], context.BindingParameters is never null credentials = context.BindingParameters.Find(); } public override T GetProperty(System.ServiceModel.Channels.BindingContext context) @@ -110,7 +110,7 @@ public override IChannelFactory BuildChannelFactory(BindingC if (context == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); -#pragma warning suppress 56506 // Microsoft, context.BindingParameters is never null +#pragma warning suppress 56506 // [....], context.BindingParameters is never null context.BindingParameters.Add(this); credentials = context.BindingParameters.Find(); return context.BuildInnerChannelFactory(); @@ -120,7 +120,7 @@ public override bool CanBuildChannelFactory(BindingContext context) { if (context == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); -#pragma warning suppress 56506 // Microsoft, context.BindingParameters is never null +#pragma warning suppress 56506 // [....], context.BindingParameters is never null this.credentials = context.BindingParameters.Find(); context.BindingParameters.Add(this); return context.CanBuildInnerChannelFactory(); @@ -131,7 +131,7 @@ public override IChannelListener BuildChannelListener(Bindin if (context == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); -#pragma warning suppress 56506 // Microsoft, context.BindingParameters is never null +#pragma warning suppress 56506 // [....], context.BindingParameters is never null context.BindingParameters.Add(this); this.credentials = context.BindingParameters.Find(); return context.BuildInnerChannelListener(); @@ -141,7 +141,7 @@ public override bool CanBuildChannelListener(BindingContext context) { if (context == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ArgumentNullException("context")); -#pragma warning suppress 56506 // Microsoft, context.BindingParameters is never null +#pragma warning suppress 56506 // [....], context.BindingParameters is never null this.credentials = context.BindingParameters.Find(); context.BindingParameters.Add(this); return context.CanBuildInnerChannelListener(); diff --git a/System.ServiceModel/System/ServiceModel/Channels/PeerFlooder.cs b/System.ServiceModel/System/ServiceModel/Channels/PeerFlooder.cs index 9559bfb66..b3866971e 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/PeerFlooder.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/PeerFlooder.cs @@ -938,7 +938,7 @@ public void MarkEnd(bool success) //this is the callback routine for async completion on channel BeginSend() operations. - //if we are done, simply return. This can happen if user called sync EndX. + //if we are done, simply return. This can happen if user called [....] EndX. //if the flooder is still processing BeginSend(), then we probably cant complete. In this case, add the result to pending and return //main thread will flush the pending completions in MarkEnd(). //otherwise, call EndX on the result and remove it from results. diff --git a/System.ServiceModel/System/ServiceModel/Channels/PeerNeighborManager.cs b/System.ServiceModel/System/ServiceModel/Channels/PeerNeighborManager.cs index 1698d2788..0ae8268e7 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/PeerNeighborManager.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/PeerNeighborManager.cs @@ -1635,7 +1635,7 @@ public NeighborOpenAsyncResult(PeerNeighbor neighbor, PeerNodeAddress remoteAddr throw; } - // Indicate sync completion to the caller + // Indicate [....] completion to the caller if (result.CompletedSynchronously) base.Complete(true); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/PipeConnection.cs b/System.ServiceModel/System/ServiceModel/Channels/PipeConnection.cs index 70538c75b..f50e36671 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/PipeConnection.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/PipeConnection.cs @@ -798,7 +798,7 @@ void FinishPendingWrite(TimeSpan timeout) ulong GetServerPid() { ulong id; -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() if (!UnsafeNativeMethods.GetNamedPipeServerProcessId(pipe, out id)) { Win32Exception e = new Win32Exception(); @@ -810,7 +810,7 @@ ulong GetServerPid() ulong GetClientPid() { ulong id; -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() if (!UnsafeNativeMethods.GetNamedPipeServerProcessId(pipe, out id)) { Win32Exception e = new Win32Exception(); @@ -885,7 +885,7 @@ unsafe void OnAsyncReadComplete(bool haveResult, int error, int numBytes) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(ConvertPipeException(e, TransferOperation.Read)); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception e) { if (Fx.IsFatal(e)) @@ -955,7 +955,7 @@ unsafe void OnAsyncWriteComplete(bool haveResult, int error, int numBytes) throw DiagnosticUtility.ExceptionUtility.ThrowHelper(ConvertPipeException(e, TransferOperation.Write), ExceptionEventType); } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2293,7 +2293,7 @@ unsafe void StartAccept(bool synchronous) } } } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/ReplyChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/ReplyChannel.cs index 58c50c38a..3f258f164 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ReplyChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ReplyChannel.cs @@ -129,7 +129,7 @@ static void OnReceiveRequest(IAsyncResult result) { thisPtr.HandleReceiveRequestComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/RequestChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/RequestChannel.cs index f6e2de5fe..687c24254 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/RequestChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/RequestChannel.cs @@ -415,7 +415,7 @@ static void OnCompleteWaitCallBack(object state, bool timedOut) } thisPtr.CleanupEvents(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/RequestContextBase.cs b/System.ServiceModel/System/ServiceModel/Channels/RequestContextBase.cs index 269367ec4..f062f22e9 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/RequestContextBase.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/RequestContextBase.cs @@ -45,7 +45,7 @@ public override Message RequestMessage { if (this.requestMessageException != null) { -#pragma warning suppress 56503 // Microsoft, see outcome of DCR 50092 +#pragma warning suppress 56503 // [....], see outcome of DCR 50092 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(this.requestMessageException); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/SecurityBindingElementImporter.cs b/System.ServiceModel/System/ServiceModel/Channels/SecurityBindingElementImporter.cs index 340b136e9..4a1402464 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SecurityBindingElementImporter.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SecurityBindingElementImporter.cs @@ -349,7 +349,7 @@ void ImportMessageScopeProtectionPolicy(MetadataImporter importer, PolicyConvers // normalize protection level settings at the operation scope if possible to help avoid typed message generation if (hasProtectionLevel && isProtectionLevelUniform) { - // (Microsoft) remove the foreach message here + // ([....]) remove the foreach message here // foreach (MessageDescription message in operation.Messages) this.ResetProtectionLevelForMessages(operation); @@ -665,7 +665,7 @@ void IPolicyImportExtension.ImportPolicy(MetadataImporter importer, PolicyConver { // We already have found and imported the message security binding element above. Hence this could be the dual mode security. // Now let us see if there is HttpsTransportBinding assertion also below it .This is to avoid the - // warning messages while importing wsdl representing the message security over Https transport security scenario. See + // warning messages while importing wsdl representing the message security over Https transport security scenario. See Bug:136416. SecurityBindingElement tbe = null; this.TryImportTransportSecurityBindingElement(importer, policyContext, out tbe, true); diff --git a/System.ServiceModel/System/ServiceModel/Channels/ServiceChannelProxy.cs b/System.ServiceModel/System/ServiceModel/Channels/ServiceChannelProxy.cs index 8469527be..d2551e9e3 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/ServiceChannelProxy.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/ServiceChannelProxy.cs @@ -765,7 +765,7 @@ public Object Current { get { -#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext +#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SFxDictionaryIsEmpty))); } } @@ -778,7 +778,7 @@ public Object Key { get { -#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext +#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SFxDictionaryIsEmpty))); } } @@ -787,7 +787,7 @@ public Object Value { get { -#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext +#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SFxDictionaryIsEmpty))); } } @@ -796,7 +796,7 @@ public DictionaryEntry Entry { get { -#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext +#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SFxDictionaryIsEmpty))); } } diff --git a/System.ServiceModel/System/ServiceModel/Channels/SessionConnectionReader.cs b/System.ServiceModel/System/ServiceModel/Channels/SessionConnectionReader.cs index 62fff724f..71a06c030 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SessionConnectionReader.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SessionConnectionReader.cs @@ -1465,7 +1465,7 @@ void OnAsyncReadComplete(object state) } } } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/SingletonConnectionReader.cs b/System.ServiceModel/System/ServiceModel/Channels/SingletonConnectionReader.cs index 4cb52f579..5660eb1b9 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SingletonConnectionReader.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SingletonConnectionReader.cs @@ -595,7 +595,7 @@ bool BeginUpgrade(out IAsyncResult upgradeAsyncResult) if (!upgradeAsyncResult.CompletedSynchronously) { - upgradeAsyncResult = null; //caller shouldn't use this out param unless completed sync. + upgradeAsyncResult = null; //caller shouldn't use this out param unless completed [....]. return false; } @@ -1295,7 +1295,7 @@ static void OnReceiveScheduled(object state) { thisPtr.message = thisPtr.parent.Receive(thisPtr.timeout); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception exception) { if (Fx.IsFatal(exception)) @@ -1892,7 +1892,7 @@ static void OnWriteStartBytesCallbackHelper(object asyncState) completeSelf = thisPtr.HandleWriteStartBytes(); throwing = false; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1928,7 +1928,7 @@ static void OnWriteBufferedMessage(object asyncState) completeSelf = thisPtr.HandleWriteBufferedMessage(); throwing = false; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1963,7 +1963,7 @@ static void OnWriteEndBytes(object asyncState) completeSelf = thisPtr.HandleWriteEndBytes(); success = true; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/SocketConnection.cs b/System.ServiceModel/System/ServiceModel/Channels/SocketConnection.cs index 6690af5b3..2a57b0bdb 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SocketConnection.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SocketConnection.cs @@ -941,7 +941,7 @@ void OnSendAsync(object sender, SocketAsyncEventArgs eventArgs) { this.asyncWriteException = ConvertSendException(socketException, TimeSpan.MaxValue); } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception exception) { if (Fx.IsFatal(exception)) @@ -1274,7 +1274,7 @@ void OnReceive(IAsyncResult result) { this.asyncReadException = ConvertObjectDisposedException(objectDisposedException, TransferOperation.Read); } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception exception) { if (Fx.IsFatal(exception)) @@ -1306,7 +1306,7 @@ void OnReceiveAsync(object sender, SocketAsyncEventArgs eventArgs) { asyncReadException = ConvertReceiveException(socketException, TimeSpan.MaxValue); } -#pragma warning suppress 56500 // Microsoft, transferring exception to caller +#pragma warning suppress 56500 // [....], transferring exception to caller catch (Exception exception) { if (Fx.IsFatal(exception)) @@ -1927,7 +1927,7 @@ static void OnConnect(IAsyncResult result) { completeSelf = thisPtr.StartConnect(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2234,7 +2234,7 @@ static void StartAccept(object state) { completeSelf = thisPtr.StartAccept(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityBindingElement.cs index 957aefd91..baf6e2dfd 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityBindingElement.cs @@ -89,7 +89,7 @@ public override IChannelFactory BuildChannelFactory(BindingC throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.BuildInnerChannelFactory(); } @@ -101,7 +101,7 @@ public override bool CanBuildChannelFactory(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelFactory(); } @@ -113,7 +113,7 @@ public override IChannelListener BuildChannelListener(Bindin throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.BuildInnerChannelListener(); } @@ -125,7 +125,7 @@ public override bool CanBuildChannelListener(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelListener(); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityUpgradeProvider.cs b/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityUpgradeProvider.cs index a9761c4dc..a675b3993 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityUpgradeProvider.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SslStreamSecurityUpgradeProvider.cs @@ -439,7 +439,7 @@ void OnOpenTokenAuthenticator(IAsyncResult result) { completeSelf = this.HandleOpenAuthenticatorComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -470,7 +470,7 @@ void OnOpenTokenProvider(IAsyncResult result) { completeSelf = this.HandleOpenTokenProviderComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -501,7 +501,7 @@ void OnGetToken(IAsyncResult result) { completeSelf = this.HandleGetTokenComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -532,7 +532,7 @@ void OnCloseTokenProvider(IAsyncResult result) { completeSelf = this.HandleCloseTokenProviderComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1142,7 +1142,7 @@ void OnBaseOpen(IAsyncResult result) { completeSelf = this.HandleBaseOpenComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1173,7 +1173,7 @@ void OnOpenTokenProvider(IAsyncResult result) { completeSelf = this.HandleOpenTokenProviderComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1204,7 +1204,7 @@ void OnGetClientToken(IAsyncResult result) { completeSelf = this.HandleGetTokenComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1294,7 +1294,7 @@ void OnBaseClose(IAsyncResult result) { completeSelf = this.HandleBaseCloseComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1324,7 +1324,7 @@ void OnCloseTokenProvider(IAsyncResult result) { SecurityUtils.EndCloseTokenProviderIfRequired(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/StandardBindingImporter.cs b/System.ServiceModel/System/ServiceModel/Channels/StandardBindingImporter.cs index 364205eab..55a2020f7 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/StandardBindingImporter.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/StandardBindingImporter.cs @@ -21,7 +21,7 @@ void IWsdlImportExtension.ImportEndpoint(WsdlImporter importer, WsdlEndpointConv if (endpointContext == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("endpointContext"); -#pragma warning suppress 56506 // Microsoft, endpointContext.Endpoint is never null +#pragma warning suppress 56506 // [....], endpointContext.Endpoint is never null if (endpointContext.Endpoint.Binding == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("endpointContext.Binding"); diff --git a/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeAcceptorAsyncResult.cs b/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeAcceptorAsyncResult.cs index f045513e2..fb32637e2 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeAcceptorAsyncResult.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeAcceptorAsyncResult.cs @@ -90,7 +90,7 @@ static void OnAuthenticateAsServer(IAsyncResult result) { acceptUpgradeAsyncResult.CompleteAuthenticateAsServer(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeInitiatorAsyncResult.cs b/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeInitiatorAsyncResult.cs index 37d443c87..5d18a8df1 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeInitiatorAsyncResult.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/StreamSecurityUpgradeInitiatorAsyncResult.cs @@ -93,7 +93,7 @@ static void OnAuthenticateAsClient(IAsyncResult result) { thisPtr.CompleteAuthenticateAsClient(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs index ccfc53f43..fc5e285e2 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/StreamedFramingRequestChannel.cs @@ -348,7 +348,7 @@ static void OnWritePreamble(object asyncState) { completeSelf = thisPtr.HandleWritePreamble(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -377,7 +377,7 @@ static void OnWritePreambleEnd(object asyncState) thisPtr.connection.EndWrite(); completeSelf = thisPtr.ReadPreambleAck(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -405,7 +405,7 @@ static void OnReadPreambleAck(object state) { completeSelf = thisPtr.HandlePreambleAck(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -438,7 +438,7 @@ static void OnUpgrade(IAsyncResult result) { completeSelf = thisPtr.HandleUpgrade(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -470,7 +470,7 @@ static void OnFailedUpgrade(IAsyncResult result) { ConnectionUpgradeHelper.EndDecodeFramingFault(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -763,7 +763,7 @@ static void OnEstablishConnection(IAsyncResult result) completeSelf = thisPtr.HandleEstablishConnection(result); throwing = false; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -805,7 +805,7 @@ static void OnWriteMessage(IAsyncResult result) completeSelf = thisPtr.HandleWriteMessage(result); throwing = false; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -842,7 +842,7 @@ static void OnReceiveReply(IAsyncResult result) completeSelf = thisPtr.CompleteReceiveReply(result); throwing = false; } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/SynchronizedMessageSource.cs b/System.ServiceModel/System/ServiceModel/Channels/SynchronizedMessageSource.cs index 91df25a65..993807584 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/SynchronizedMessageSource.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/SynchronizedMessageSource.cs @@ -176,7 +176,7 @@ static void OnEnterComplete(object state, Exception asyncException) thisPtr.exitLock = true; completeSelf = thisPtr.PerformOperation(thisPtr.timeoutHelper.RemainingTime()); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -225,7 +225,7 @@ static void OnReceiveComplete(object state) { thisPtr.SetReturnValue(thisPtr.Source.EndReceive()); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -270,7 +270,7 @@ static void OnWaitForMessageComplete(object state) { thisPtr.SetReturnValue(thisPtr.Source.EndWaitForMessage()); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElement.cs index 799f5ba41..c1727702b 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElement.cs @@ -117,7 +117,7 @@ public override T GetProperty(BindingContext context) // to cover all our bases, let's iterate through the BindingParameters to make sure // we haven't missed a query (since we're the Transport and we're at the bottom) -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null Collection bindingElements = context.BindingParameters.FindAll(); T result = default(T); @@ -154,7 +154,7 @@ ChannelProtectionRequirements GetProtectionRequirements(AddressingVersion addres internal ChannelProtectionRequirements GetProtectionRequirements(BindingContext context) { AddressingVersion addressingVersion = AddressingVersion.WSAddressing10; -#pragma warning suppress 56506 // Microsoft, CustomBinding.Elements can never be null +#pragma warning suppress 56506 // [....], CustomBinding.Elements can never be null MessageEncodingBindingElement messageEncoderBindingElement = context.Binding.Elements.Find(); if (messageEncoderBindingElement != null) { @@ -183,7 +183,7 @@ internal static void ExportWsdlEndpoint(WsdlExporter exporter, WsdlEndpointConve } // Set SoapBinding Transport URI -#pragma warning suppress 56506 // Microsoft, these properties cannot be null in this context +#pragma warning suppress 56506 // [....], these properties cannot be null in this context BindingElementCollection bindingElements = endpointContext.Endpoint.Binding.CreateBindingElements(); if (wsdlTransportUri != null) { diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElementImporter.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElementImporter.cs index 9e6b90657..3cd450b6d 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElementImporter.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportBindingElementImporter.cs @@ -36,20 +36,20 @@ void IWsdlImportExtension.ImportEndpoint(WsdlImporter importer, WsdlEndpointConv throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, these properties cannot be null in this context +#pragma warning suppress 56506 // [....], these properties cannot be null in this context if (context.Endpoint.Binding == null) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context.Endpoint.Binding"); } -#pragma warning suppress 56506 // Microsoft, CustomBinding.Elements never be null +#pragma warning suppress 56506 // [....], CustomBinding.Elements never be null TransportBindingElement transportBindingElement = GetBindingElements(context).Find(); bool transportHandledExternaly = (transportBindingElement != null) && !StateHelper.IsRegisteredTransportBindingElement(importer, context); if (transportHandledExternaly) return; -#pragma warning suppress 56506 // Microsoft, these properties cannot be null in this context +#pragma warning suppress 56506 // [....], these properties cannot be null in this context WsdlNS.SoapBinding soapBinding = (WsdlNS.SoapBinding)context.WsdlBinding.Extensions.Find(typeof(WsdlNS.SoapBinding)); if (soapBinding != null && transportBindingElement == null) { diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportDefaults.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportDefaults.cs index f689dc4a0..4de327474 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportDefaults.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportDefaults.cs @@ -202,7 +202,10 @@ static class TransportDefaults internal const bool RequireClientCertificate = false; internal const int MaxFaultSize = MaxBufferSize; internal const int MaxSecurityFaultSize = 16384; - internal const SslProtocols SslProtocols = SslProtocols.Ssl3 | SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12; + internal const SslProtocols SslProtocols = System.Security.Authentication.SslProtocols.Ssl3 | + System.Security.Authentication.SslProtocols.Tls | + System.Security.Authentication.SslProtocols.Tls11 | + System.Security.Authentication.SslProtocols.Tls12; // Calling CreateFault on an incoming message can expose some DoS-related security // vulnerabilities when a service is in streaming mode. See MB 47592 for more details. diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs index d0a75974c..ec0777219 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportDuplexSessionChannel.cs @@ -739,7 +739,7 @@ static void OnCloseOutputSession(IAsyncResult result) { completeSelf = thisPtr.HandleCloseOutputSession(result, false); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -771,7 +771,7 @@ static void OnCloseInputSession(IAsyncResult result) { completeSelf = thisPtr.HandleCloseInputSession(result, false); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -937,7 +937,7 @@ static void OnEnterComplete(object state, Exception asyncException) { completeSelf = thisPtr.WriteEndBytes(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -965,7 +965,7 @@ static void OnWriteComplete(object asyncState) { thisPtr.HandleWriteEndBytesComplete(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1105,7 +1105,7 @@ static void OnEnterComplete(object state, Exception asyncException) { completeSelf = thisPtr.WriteCore(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1133,7 +1133,7 @@ static void OnWriteComplete(object asyncState) { thisPtr.channel.FinishWritingMessage(); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1290,7 +1290,7 @@ static void OnReceive(IAsyncResult result) DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportManager.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportManager.cs index 5bf91cc01..aedfcbdd3 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportManager.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportManager.cs @@ -345,7 +345,7 @@ void OnScheduled() { this.OnScheduled(this.parent); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/TransportSecurityHelpers.cs b/System.ServiceModel/System/ServiceModel/Channels/TransportSecurityHelpers.cs index 84154efa7..3abbf4e36 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/TransportSecurityHelpers.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/TransportSecurityHelpers.cs @@ -606,7 +606,7 @@ static void OnGetToken(IAsyncResult result) { thisPtr.CompleteGetToken(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -700,7 +700,7 @@ static void OnGetToken(IAsyncResult result) { thisPtr.CompleteGetToken(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/Channels/UnsafeNativeMethods.cs b/System.ServiceModel/System/ServiceModel/Channels/UnsafeNativeMethods.cs index 2634898e8..bade3dab6 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/UnsafeNativeMethods.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/UnsafeNativeMethods.cs @@ -1152,7 +1152,7 @@ internal PipeHandle(IntPtr handle) internal int GetClientPid() { int pid; -#pragma warning suppress 56523 // Microsoft, Win32Exception ctor calls Marshal.GetLastWin32Error() +#pragma warning suppress 56523 // [....], Win32Exception ctor calls Marshal.GetLastWin32Error() bool success = UnsafeNativeMethods.GetNamedPipeClientProcessId(this, out pid); if (!success) { diff --git a/System.ServiceModel/System/ServiceModel/Channels/UriPrefixTable.cs b/System.ServiceModel/System/ServiceModel/Channels/UriPrefixTable.cs index 4795a0917..71549cd70 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/UriPrefixTable.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/UriPrefixTable.cs @@ -56,7 +56,7 @@ object ThisLock { // The UriPrefixTable instance itself is used as a // synchronization primitive in the TransportManagers and the - // TransportManagerContainers so we return 'this' to keep them in sync. + // TransportManagerContainers so we return 'this' to keep them in [....]. return this; } } diff --git a/System.ServiceModel/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs b/System.ServiceModel/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs index b342bddf9..91558a6d5 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/WebSocketTransportDuplexSessionChannel.cs @@ -664,7 +664,7 @@ async Task ReadBufferedMessageAsync() new ArraySegment(internalBuffer, receivedByteCount, internalBuffer.Length - receivedByteCount), CancellationToken.None); - await receiveTask.ContinueOnCapturedContextFlow(); + await receiveTask.ConfigureAwait(false); result = receiveTask.Result; this.CheckCloseStatus(result); @@ -847,7 +847,8 @@ async void StartNextReceiveAsync() if (this.streamWaitTask != null) { //// Wait until the previous stream message finished. - await this.streamWaitTask.Task.ContinueOnCapturedContextFlow(); + + await this.streamWaitTask.Task.ConfigureAwait(false); } this.streamWaitTask = new TaskCompletionSource(); @@ -857,7 +858,7 @@ async void StartNextReceiveAsync() { if (!this.useStreaming) { - await this.ReadBufferedMessageAsync(); + await this.ReadBufferedMessageAsync().ConfigureAwait(false); } else { @@ -875,7 +876,8 @@ async void StartNextReceiveAsync() Task receiveTask = this.webSocket.ReceiveAsync( new ArraySegment(buffer, 0, this.receiveBufferSize), CancellationToken.None); - await receiveTask.ContinueOnCapturedContextFlow(); + + await receiveTask.ConfigureAwait(false); WebSocketReceiveResult result = receiveTask.Result; this.CheckCloseStatus(result); diff --git a/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityBindingElement.cs b/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityBindingElement.cs index e1f36707c..8f027c01c 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityBindingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityBindingElement.cs @@ -57,7 +57,7 @@ public override IChannelFactory BuildChannelFactory(BindingC throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.BuildInnerChannelFactory(); } @@ -69,7 +69,7 @@ public override bool CanBuildChannelFactory(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelFactory(); } @@ -81,7 +81,7 @@ public override IChannelListener BuildChannelListener(Bindin throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.BuildInnerChannelListener(); } @@ -93,7 +93,7 @@ public override bool CanBuildChannelListener(BindingContext context) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("context"); } -#pragma warning suppress 56506 // Microsoft, BindingContext.BindingParameters cannot be null +#pragma warning suppress 56506 // [....], BindingContext.BindingParameters cannot be null context.BindingParameters.Add(this); return context.CanBuildInnerChannelListener(); } diff --git a/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityUpgradeProvider.cs b/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityUpgradeProvider.cs index 441c80b91..feaf5f1b1 100644 --- a/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityUpgradeProvider.cs +++ b/System.ServiceModel/System/ServiceModel/Channels/WindowsStreamSecurityUpgradeProvider.cs @@ -614,7 +614,7 @@ void OnBaseOpen(IAsyncResult result) { completeSelf = this.HandleBaseOpenComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -645,7 +645,7 @@ void OnOpenTokenProvider(IAsyncResult result) { completeSelf = this.HandleOpenTokenProviderComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -676,7 +676,7 @@ void OnGetSspiCredential(IAsyncResult result) { completeSelf = this.HandleGetSspiCredentialComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -758,7 +758,7 @@ void OnBaseClose(IAsyncResult result) { completeSelf = this.HandleBaseCloseComplete(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -788,7 +788,7 @@ void OnCloseTokenProvider(IAsyncResult result) { SecurityUtils.EndCloseTokenProviderIfRequired(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) diff --git a/System.ServiceModel/System/ServiceModel/ClientBase.cs b/System.ServiceModel/System/ServiceModel/ClientBase.cs index 9da24fb18..c969544ef 100644 --- a/System.ServiceModel/System/ServiceModel/ClientBase.cs +++ b/System.ServiceModel/System/ServiceModel/ClientBase.cs @@ -376,7 +376,7 @@ ex is ObjectDisposedException || } else { -#pragma warning suppress 56503 // Microsoft, We throw only for unknown exceptions. +#pragma warning suppress 56503 // [....], We throw only for unknown exceptions. throw; } } diff --git a/System.ServiceModel/System/ServiceModel/ComIntegration/SafeNativeMethods.cs b/System.ServiceModel/System/ServiceModel/ComIntegration/SafeNativeMethods.cs index 5a64e2fec..5b37e80a6 100644 --- a/System.ServiceModel/System/ServiceModel/ComIntegration/SafeNativeMethods.cs +++ b/System.ServiceModel/System/ServiceModel/ComIntegration/SafeNativeMethods.cs @@ -56,7 +56,7 @@ enum ComRights ACTIVATE_LOCAL = 0x08, ACTIVATE_REMOTE = 0x10 } - + enum TOKEN_INFORMATION_CLASS { TokenUser = 1, @@ -96,6 +96,7 @@ enum Win32Error ERROR_INSUFFICIENT_BUFFER = 122, ERROR_NO_TOKEN = 1008, ERROR_NONE_MAPPED = 1332, + ERROR_NO_SUCH_DOMAIN = 1355, } enum EXTENDED_NAME_FORMAT @@ -112,6 +113,32 @@ enum EXTENDED_NAME_FORMAT NameDnsDomainName = 12 } + [Flags] + enum DSFlags : uint + { + DS_FORCE_REDISCOVERY = 0x00000001, + DS_DIRECTORY_SERVICE_REQUIRED = 0x00000010, + DS_DIRECTORY_SERVICE_PREFERRED = 0x00000020, + DS_GC_SERVER_REQUIRED = 0x00000040, + DS_PDC_REQUIRED = 0x00000080, + DS_BACKGROUND_ONLY = 0x00000100, + DS_IP_REQUIRED = 0x00000200, + DS_KDC_REQUIRED = 0x00000400, + DS_TIMESERV_REQUIRED = 0x00000800, + DS_WRITABLE_REQUIRED = 0x00001000, + DS_GOOD_TIMESERV_PREFERRED = 0x00002000, + DS_AVOID_SELF = 0x00004000, + DS_ONLY_LDAP_NEEDED = 0x00008000, + DS_IS_FLAT_NAME = 0x00010000, + DS_IS_DNS_NAME = 0x00020000, + DS_TRY_NEXTCLOSEST_SITE = 0x00040000, + DS_DIRECTORY_SERVICE_6_REQUIRED = 0x00080000, + DS_WEB_SERVICE_REQUIRED = 0x00100000, + DS_DIRECTORY_SERVICE_8_REQUIRED = 0x00200000, + DS_RETURN_DNS_NAME = 0x40000000, + DS_RETURN_FLAT_NAME = 0x80000000, + } + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] struct TagVariant { @@ -228,6 +255,7 @@ static class SafeNativeMethods internal const String OLEAUT32 = "oleaut32.dll"; internal const String COMSVCS = "comsvcs.dll"; internal const String SECUR32 = "secur32.dll"; + internal const String NETAPI32 = "netapi32.dll"; internal const int ERROR_MORE_DATA = 0xEA; internal const int ERROR_SUCCESS = 0; @@ -493,7 +521,21 @@ internal static extern int LoadRegTypeLib(ref Guid rguid, ushort major, ushort m [DllImport(SECUR32, CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.U1)] [ResourceExposure(ResourceScope.None)] - internal extern static bool TranslateName(string input, EXTENDED_NAME_FORMAT inputFormat, EXTENDED_NAME_FORMAT outputFormat, StringBuilder outputString, out uint size); + internal static extern bool TranslateName(string input, EXTENDED_NAME_FORMAT inputFormat, EXTENDED_NAME_FORMAT outputFormat, StringBuilder outputString, out uint size); + + [DllImport(NETAPI32, ExactSpelling = true, EntryPoint = "DsGetDcNameW", CharSet = CharSet.Unicode, SetLastError = true)] + [ResourceExposure(ResourceScope.None)] + internal static extern int DsGetDcName( + [In] string computerName, + [In] string domainName, + [In] IntPtr domainGuid, + [In] string siteName, + [In] uint flags, + [Out] out IntPtr domainControllerInfo); + + [DllImport(NETAPI32)] + [ResourceExposure(ResourceScope.None)] + internal static extern int NetApiBufferFree([In] IntPtr buffer); } internal static class InterfaceHelper diff --git a/System.ServiceModel/System/ServiceModel/Configuration/BinaryMessageEncodingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/BinaryMessageEncodingElement.cs index 94912a949..05db2a829 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/BinaryMessageEncodingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/BinaryMessageEncodingElement.cs @@ -63,7 +63,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) binding.MaxSessionSize = this.MaxSessionSize; binding.MaxReadPoolSize = this.MaxReadPoolSize; binding.MaxWritePoolSize = this.MaxWritePoolSize; -#pragma warning suppress 56506 //Microsoft; base.ApplyConfiguration() checks for 'binding' being null +#pragma warning suppress 56506 //[....]; base.ApplyConfiguration() checks for 'binding' being null this.ReaderQuotas.ApplyConfiguration(binding.ReaderQuotas); binding.CompressionFormat = this.CompressionFormat; } @@ -73,7 +73,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); BinaryMessageEncodingElement source = (BinaryMessageEncodingElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.MaxSessionSize = source.MaxSessionSize; this.MaxReadPoolSize = source.MaxReadPoolSize; this.MaxWritePoolSize = source.MaxWritePoolSize; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/CallbackDebugElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/CallbackDebugElement.cs index 68aaa7192..e9ffa4980 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/CallbackDebugElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/CallbackDebugElement.cs @@ -25,7 +25,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); CallbackDebugElement source = (CallbackDebugElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() check for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() check for 'from' being null this.IncludeExceptionDetailInFaults = source.IncludeExceptionDetailInFaults; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/CallbackTimeoutsElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/CallbackTimeoutsElement.cs index e998b23a0..c12e897d2 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/CallbackTimeoutsElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/CallbackTimeoutsElement.cs @@ -29,7 +29,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); CallbackTimeoutsElement source = (CallbackTimeoutsElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.TransactionTimeout = source.TransactionTimeout; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ClientCredentialsElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ClientCredentialsElement.cs index 71c11065a..ca6fdc463 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ClientCredentialsElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ClientCredentialsElement.cs @@ -96,7 +96,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ClientCredentialsElement source = (ClientCredentialsElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.ClientCertificate.Copy(source.ClientCertificate); this.ServiceCertificate.Copy(source.ServiceCertificate); this.Windows.Copy(source.Windows); diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ClientViaElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ClientViaElement.cs index 33e4d36bd..7c79bab3f 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ClientViaElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ClientViaElement.cs @@ -25,7 +25,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ClientViaElement source = (ClientViaElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() check for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() check for 'from' being null this.ViaUri = source.ViaUri; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/CommonEndpointBehaviorElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/CommonEndpointBehaviorElement.cs index d5220b39c..6913327c2 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/CommonEndpointBehaviorElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/CommonEndpointBehaviorElement.cs @@ -23,7 +23,7 @@ public override void Add(BehaviorExtensionElement element) { if (!typeof(System.ServiceModel.Description.IEndpointBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidCommonEndpointBehaviorType, element.ConfigurationElementName, typeof(System.ServiceModel.Description.IEndpointBehavior).FullName), @@ -44,7 +44,7 @@ public override bool CanAdd(BehaviorExtensionElement element) { if (!typeof(System.ServiceModel.Description.IEndpointBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidCommonEndpointBehaviorType, element.ConfigurationElementName, typeof(System.ServiceModel.Description.IEndpointBehavior).FullName), diff --git a/System.ServiceModel/System/ServiceModel/Configuration/CommonServiceBehaviorElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/CommonServiceBehaviorElement.cs index ab4e50ac0..963969c6d 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/CommonServiceBehaviorElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/CommonServiceBehaviorElement.cs @@ -23,7 +23,7 @@ public override void Add(BehaviorExtensionElement element) { if (!typeof(System.ServiceModel.Description.IServiceBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidCommonServiceBehaviorType, element.ConfigurationElementName, typeof(System.ServiceModel.Description.IServiceBehavior).FullName), @@ -44,7 +44,7 @@ public override bool CanAdd(BehaviorExtensionElement element) { if (!typeof(System.ServiceModel.Description.IServiceBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidCommonServiceBehaviorType, element.ConfigurationElementName, typeof(System.ServiceModel.Description.IServiceBehavior).FullName), diff --git a/System.ServiceModel/System/ServiceModel/Configuration/CompositeDuplexElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/CompositeDuplexElement.cs index 960392bb7..8367bce36 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/CompositeDuplexElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/CompositeDuplexElement.cs @@ -35,7 +35,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); CompositeDuplexElement source = (CompositeDuplexElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ClientBaseAddress = source.ClientBaseAddress; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ConfigurationHelpers.cs b/System.ServiceModel/System/ServiceModel/Configuration/ConfigurationHelpers.cs index 527194745..74e3234cf 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ConfigurationHelpers.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ConfigurationHelpers.cs @@ -37,7 +37,7 @@ internal static BindingCollectionElement GetAssociatedBindingCollectionElement(C new ConfigurationErrorsException(SR.GetString(SR.ConfigBindingExtensionNotFound, ConfigurationHelpers.GetBindingsSectionPath(bindingCollectionName)))); } - catch (NullReferenceException) // System.Configuration.ConfigurationElement + catch (NullReferenceException) // System.Configuration.ConfigurationElement bug { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( new ConfigurationErrorsException(SR.GetString(SR.ConfigBindingExtensionNotFound, @@ -69,7 +69,7 @@ internal static BindingCollectionElement UnsafeGetAssociatedBindingCollectionEle new ConfigurationErrorsException(SR.GetString(SR.ConfigBindingExtensionNotFound, ConfigurationHelpers.GetBindingsSectionPath(bindingCollectionName)))); } - catch (NullReferenceException) // System.Configuration.ConfigurationElement + catch (NullReferenceException) // System.Configuration.ConfigurationElement bug { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( new ConfigurationErrorsException(SR.GetString(SR.ConfigBindingExtensionNotFound, @@ -99,7 +99,7 @@ internal static EndpointCollectionElement GetAssociatedEndpointCollectionElement new ConfigurationErrorsException(SR.GetString(SR.ConfigEndpointExtensionNotFound, ConfigurationHelpers.GetEndpointsSectionPath(endpointCollectionName)))); } - catch (NullReferenceException) // System.Configuration.ConfigurationElement + catch (NullReferenceException) // System.Configuration.ConfigurationElement bug { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( new ConfigurationErrorsException(SR.GetString(SR.ConfigEndpointExtensionNotFound, @@ -131,7 +131,7 @@ internal static EndpointCollectionElement UnsafeGetAssociatedEndpointCollectionE new ConfigurationErrorsException(SR.GetString(SR.ConfigEndpointExtensionNotFound, ConfigurationHelpers.GetEndpointsSectionPath(endpointCollectionName)))); } - catch (NullReferenceException) // System.Configuration.ConfigurationElement + catch (NullReferenceException) // System.Configuration.ConfigurationElement bug { throw DiagnosticUtility.ExceptionUtility.ThrowHelperError( new ConfigurationErrorsException(SR.GetString(SR.ConfigEndpointExtensionNotFound, diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ConnectionOrientedTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ConnectionOrientedTransportElement.cs index d9f93eff4..40411ccbc 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ConnectionOrientedTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ConnectionOrientedTransportElement.cs @@ -111,7 +111,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ConnectionOrientedTransportElement source = (ConnectionOrientedTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ConnectionBufferSize = source.ConnectionBufferSize; this.HostNameComparisonMode = source.HostNameComparisonMode; this.ChannelInitializationTimeout = source.ChannelInitializationTimeout; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/DataContractSerializerElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/DataContractSerializerElement.cs index 2997f3209..ac7dea534 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/DataContractSerializerElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/DataContractSerializerElement.cs @@ -38,7 +38,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); DataContractSerializerElement source = (DataContractSerializerElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.IgnoreExtensionDataObject = source.IgnoreExtensionDataObject; this.MaxItemsInObjectGraph = source.MaxItemsInObjectGraph; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/EndpointBehaviorElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/EndpointBehaviorElement.cs index 4c079f993..02733601e 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/EndpointBehaviorElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/EndpointBehaviorElement.cs @@ -37,7 +37,7 @@ public override void Add(BehaviorExtensionElement element) } if (!typeof(System.ServiceModel.Description.IEndpointBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidEndpointBehaviorType, element.ConfigurationElementName, this.Name), @@ -62,7 +62,7 @@ public override bool CanAdd(BehaviorExtensionElement element) } if (!typeof(System.ServiceModel.Description.IEndpointBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidEndpointBehaviorType, element.ConfigurationElementName, this.Name), diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ExtensionElementCollection.cs b/System.ServiceModel/System/ServiceModel/Configuration/ExtensionElementCollection.cs index ba05d703c..066afddd9 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ExtensionElementCollection.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ExtensionElementCollection.cs @@ -87,7 +87,7 @@ void EnforceUniqueElement(ExtensionElement element) else if (element.TypeName.Equals(extension.TypeName, StringComparison.Ordinal)) { // In order to avoid extra assemblies being loaded, we perform type comparison only if the type names - // are the same. See + // are the same. See bug CSDMain 222573. Type elementType = Type.GetType(element.Type, false); if (null != elementType && elementType.Equals(Type.GetType(extension.Type, false))) { diff --git a/System.ServiceModel/System/ServiceModel/Configuration/HttpTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/HttpTransportElement.cs index b3df15d6f..e8e8d211e 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/HttpTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/HttpTransportElement.cs @@ -211,7 +211,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); HttpTransportElement source = (HttpTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.AllowCookies = source.AllowCookies; this.RequestInitializationTimeout = source.RequestInitializationTimeout; this.AuthenticationScheme = source.AuthenticationScheme; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/HttpsTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/HttpsTransportElement.cs index 5e54dbf2f..38d9700d5 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/HttpsTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/HttpsTransportElement.cs @@ -30,7 +30,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); HttpsTransportElement source = (HttpsTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.RequireClientCertificate = source.RequireClientCertificate; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/IdentityElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/IdentityElement.cs index e7ec1f864..50ed2a799 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/IdentityElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/IdentityElement.cs @@ -111,7 +111,7 @@ public void InitializeFrom(EndpointIdentity identity) else if (identity is X509CertificateEndpointIdentity) { X509Certificate2Collection certs = ((X509CertificateEndpointIdentity)identity).Certificates; -#pragma warning suppress 56506 //Microsoft; this.Certificate can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; this.Certificate can never be null (underlying configuration system guarantees) this.Certificate.EncodedValue = Convert.ToBase64String(certs.Export(certs.Count == 1 ? X509ContentType.SerializedCert : X509ContentType.SerializedStore)); } } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenClientElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenClientElement.cs index 7c925c490..c12c1022c 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenClientElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenClientElement.cs @@ -94,17 +94,17 @@ public void Copy(IssuedTokenClientElement from) this.MaxIssuedTokenCachingTime = from.MaxIssuedTokenCachingTime; this.IssuedTokenRenewalThresholdPercentage = from.IssuedTokenRenewalThresholdPercentage; -#pragma warning suppress 56506 //Microsoft; from.ElementInformation.Properties[ConfigurationStrings.LocalIssuerIssuedTokenParameters] can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; from.ElementInformation.Properties[ConfigurationStrings.LocalIssuerIssuedTokenParameters] can never be null (underlying configuration system guarantees) if (PropertyValueOrigin.Default != from.ElementInformation.Properties[ConfigurationStrings.LocalIssuer].ValueOrigin) { this.LocalIssuer.Copy(from.LocalIssuer); } -#pragma warning suppress 56506 //Microsoft; from.ElementInformation.Properties[ConfigurationStrings.LocalIssuerChannelBehaviors] can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; from.ElementInformation.Properties[ConfigurationStrings.LocalIssuerChannelBehaviors] can never be null (underlying configuration system guarantees) if (PropertyValueOrigin.Default != from.ElementInformation.Properties[ConfigurationStrings.LocalIssuerChannelBehaviors].ValueOrigin) { this.LocalIssuerChannelBehaviors = from.LocalIssuerChannelBehaviors; } -#pragma warning suppress 56506 //Microsoft; from.ElementInformation.Properties[ConfigurationStrings.IssuerChannelBehaviors] can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; from.ElementInformation.Properties[ConfigurationStrings.IssuerChannelBehaviors] can never be null (underlying configuration system guarantees) if (PropertyValueOrigin.Default != from.ElementInformation.Properties[ConfigurationStrings.IssuerChannelBehaviors].ValueOrigin) { foreach (IssuedTokenClientBehaviorsElement element in from.IssuerChannelBehaviors) diff --git a/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenServiceElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenServiceElement.cs index 5d7544aeb..426a9ae19 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenServiceElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/IssuedTokenServiceElement.cs @@ -114,7 +114,7 @@ public void Copy(IssuedTokenServiceElement from) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("from"); } this.SamlSerializerType = from.SamlSerializerType; -#pragma warning suppress 56506 // Microsoft; ElementInformation is never null. +#pragma warning suppress 56506 // [....]; ElementInformation is never null. PropertyInformationCollection propertyInfo = from.ElementInformation.Properties; if (propertyInfo[ConfigurationStrings.KnownCertificates].ValueOrigin != PropertyValueOrigin.Default) { diff --git a/System.ServiceModel/System/ServiceModel/Configuration/MtomMessageEncodingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/MtomMessageEncodingElement.cs index 6ad15c1e4..8f40a1356 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/MtomMessageEncodingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/MtomMessageEncodingElement.cs @@ -24,7 +24,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) binding.WriteEncoding = this.WriteEncoding; binding.MaxReadPoolSize = this.MaxReadPoolSize; binding.MaxWritePoolSize = this.MaxWritePoolSize; -#pragma warning suppress 56506 //Microsoft; base.ApplyConfiguration() checks for 'binding' being null +#pragma warning suppress 56506 //[....]; base.ApplyConfiguration() checks for 'binding' being null this.ReaderQuotas.ApplyConfiguration(binding.ReaderQuotas); binding.MaxBufferSize = this.MaxBufferSize; } @@ -39,7 +39,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); MtomMessageEncodingElement source = (MtomMessageEncodingElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.MessageVersion = source.MessageVersion; this.WriteEncoding = source.WriteEncoding; this.MaxReadPoolSize = source.MaxReadPoolSize; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/NamedPipeTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/NamedPipeTransportElement.cs index d5cfd7558..941b4601c 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/NamedPipeTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/NamedPipeTransportElement.cs @@ -22,7 +22,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) { base.ApplyConfiguration(bindingElement); NamedPipeTransportBindingElement binding = (NamedPipeTransportBindingElement)bindingElement; -#pragma warning suppress 56506 //Microsoft; base.ApplyConfiguration above checks for bindingElement being null +#pragma warning suppress 56506 //[....]; base.ApplyConfiguration above checks for bindingElement being null this.ConnectionPoolSettings.ApplyConfiguration(binding.ConnectionPoolSettings); this.PipeSettings.ApplyConfiguration(binding.PipeSettings); } @@ -30,7 +30,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) protected internal override void InitializeFrom(BindingElement bindingElement) { base.InitializeFrom(bindingElement); -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument NamedPipeTransportBindingElement binding = (NamedPipeTransportBindingElement)bindingElement; this.ConnectionPoolSettings.InitializeFrom(binding.ConnectionPoolSettings); this.PipeSettings.InitializeFrom(binding.PipeSettings); @@ -40,7 +40,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) { base.CopyFrom(from); NamedPipeTransportElement source = (NamedPipeTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ConnectionPoolSettings.CopyFrom(source.ConnectionPoolSettings); this.PipeSettings.CopyFrom(source.PipeSettings); } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/OneWayElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/OneWayElement.cs index c3d3c3692..0c90b056a 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/OneWayElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/OneWayElement.cs @@ -47,7 +47,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) PropertyInformationCollection propertyInfo = this.ElementInformation.Properties; if (propertyInfo[ConfigurationStrings.ChannelPoolSettings].ValueOrigin != PropertyValueOrigin.Default) { -#pragma warning suppress 56506 // Microsoft, base.ApplyConfiguration() validates the argument +#pragma warning suppress 56506 // [....], base.ApplyConfiguration() validates the argument this.ChannelPoolSettings.ApplyConfiguration(oneWayBindingElement.ChannelPoolSettings); } oneWayBindingElement.MaxAcceptedChannels = this.MaxAcceptedChannels; @@ -59,7 +59,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); OneWayElement source = (OneWayElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument PropertyInformationCollection propertyInfo = source.ElementInformation.Properties; if (propertyInfo[ConfigurationStrings.ChannelPoolSettings].ValueOrigin != PropertyValueOrigin.Default) { diff --git a/System.ServiceModel/System/ServiceModel/Configuration/PeerTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/PeerTransportElement.cs index ddc638c79..5b8d687f3 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/PeerTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/PeerTransportElement.cs @@ -68,7 +68,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) binding.Port = this.Port; binding.MaxBufferPoolSize = this.MaxBufferPoolSize; binding.MaxReceivedMessageSize = this.MaxReceivedMessageSize; -#pragma warning suppress 56506 //Microsoft; base.ApplyConfiguration() checks for 'binding' being null +#pragma warning suppress 56506 //[....]; base.ApplyConfiguration() checks for 'binding' being null this.Security.ApplyConfiguration(binding.Security); } @@ -77,7 +77,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); PeerTransportElement source = (PeerTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ListenIPAddress = source.ListenIPAddress; this.Port = source.Port; this.MaxBufferPoolSize = source.MaxBufferPoolSize; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/PrivacyNoticeElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/PrivacyNoticeElement.cs index bdfdf19f5..c8e310db5 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/PrivacyNoticeElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/PrivacyNoticeElement.cs @@ -50,7 +50,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); PrivacyNoticeElement source = (PrivacyNoticeElement) from; - #pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument + #pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.Url = source.Url; this.Version = source.Version; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ReliableMessagingVersionConverter.cs b/System.ServiceModel/System/ServiceModel/Configuration/ReliableMessagingVersionConverter.cs index dff1f8fd2..5ea78edda 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ReliableMessagingVersionConverter.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ReliableMessagingVersionConverter.cs @@ -32,7 +32,7 @@ public override bool CanConvertTo(ITypeDescriptorContext context, Type destinati public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) { string version = value as string; -#pragma warning suppress 56507 // Microsoft, Really checking for null (meaning value was not a string) versus String.Empty +#pragma warning suppress 56507 // [....], Really checking for null (meaning value was not a string) versus String.Empty if (version != null) { switch (version) diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ReliableSessionElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ReliableSessionElement.cs index 78c194c19..5fa338c0c 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ReliableSessionElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ReliableSessionElement.cs @@ -104,7 +104,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ReliableSessionElement source = (ReliableSessionElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.AcknowledgementInterval = source.AcknowledgementInterval; this.FlowControlEnabled = source.FlowControlEnabled; this.InactivityTimeout = source.InactivityTimeout; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/RemoveBehaviorElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/RemoveBehaviorElement.cs index 04f104761..f7d061da2 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/RemoveBehaviorElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/RemoveBehaviorElement.cs @@ -23,7 +23,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); RemoveBehaviorElement source = (RemoveBehaviorElement) from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.Name = source.Name; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/SecurityElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/SecurityElement.cs index 6866807d7..70c98b016 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/SecurityElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/SecurityElement.cs @@ -37,7 +37,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) SecurityElement source = (SecurityElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null if (PropertyValueOrigin.Default != source.ElementInformation.Properties[ConfigurationStrings.SecureConversationBootstrap].ValueOrigin) this.SecureConversationBootstrap.CopyFrom(source.SecureConversationBootstrap); } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/SecurityElementBase.cs b/System.ServiceModel/System/ServiceModel/Configuration/SecurityElementBase.cs index f27d8b8a4..98c71d0c3 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/SecurityElementBase.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/SecurityElementBase.cs @@ -173,7 +173,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) SecurityBindingElement sbe = (SecurityBindingElement)bindingElement; -#pragma warning disable 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning disable 56506 //[....]; base.CopyFrom() checks for 'from' being null if (PropertyValueOrigin.Default != this.ElementInformation.Properties[ConfigurationStrings.DefaultAlgorithmSuite].ValueOrigin) sbe.DefaultAlgorithmSuite = this.DefaultAlgorithmSuite; if (PropertyValueOrigin.Default != this.ElementInformation.Properties[ConfigurationStrings.IncludeTimestamp].ValueOrigin) diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceAuthorizationElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceAuthorizationElement.cs index bea61241b..3871c52a5 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceAuthorizationElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceAuthorizationElement.cs @@ -84,7 +84,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceAuthorizationElement source = (ServiceAuthorizationElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.PrincipalPermissionMode = source.PrincipalPermissionMode; this.RoleProviderName = source.RoleProviderName; this.ImpersonateCallerForAllOperations = source.ImpersonateCallerForAllOperations; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceBehaviorElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceBehaviorElement.cs index feac09174..28a42f4bf 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceBehaviorElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceBehaviorElement.cs @@ -37,7 +37,7 @@ public override void Add(BehaviorExtensionElement element) } if (!typeof(System.ServiceModel.Description.IServiceBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidServiceBehaviorType, element.ConfigurationElementName, this.Name), @@ -62,7 +62,7 @@ public override bool CanAdd(BehaviorExtensionElement element) } if (!typeof(System.ServiceModel.Description.IServiceBehavior).IsAssignableFrom(element.BehaviorType)) { -#pragma warning disable 56506 //Microsoft; element.ElementInformation is guaranteed to be non-null(System.Configuration) +#pragma warning disable 56506 //[....]; element.ElementInformation is guaranteed to be non-null(System.Configuration) throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new ConfigurationErrorsException(SR.GetString(SR.ConfigInvalidServiceBehaviorType, element.ConfigurationElementName, this.Name), diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceCredentialsElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceCredentialsElement.cs index ae57ebb3f..050bca034 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceCredentialsElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceCredentialsElement.cs @@ -98,7 +98,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceCredentialsElement source = (ServiceCredentialsElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.ClientCertificate.Copy(source.ClientCertificate); this.ServiceCertificate.Copy(source.ServiceCertificate); this.UserNameAuthentication.Copy(source.UserNameAuthentication); diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceDebugElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceDebugElement.cs index c3e7c986f..86a1000cb 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceDebugElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceDebugElement.cs @@ -86,7 +86,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceDebugElement source = (ServiceDebugElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() check for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() check for 'from' being null this.HttpHelpPageEnabled = source.HttpHelpPageEnabled; this.HttpHelpPageUrl = source.HttpHelpPageUrl; this.HttpsHelpPageEnabled = source.HttpsHelpPageEnabled; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceMetadataPublishingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceMetadataPublishingElement.cs index f23ce7621..236a9d882 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceMetadataPublishingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceMetadataPublishingElement.cs @@ -95,7 +95,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceMetadataPublishingElement source = (ServiceMetadataPublishingElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() check for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() check for 'from' being null this.HttpGetEnabled = source.HttpGetEnabled; this.HttpGetUrl = source.HttpGetUrl; this.HttpsGetEnabled = source.HttpsGetEnabled; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelConfigurationElementCollection.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelConfigurationElementCollection.cs index 576cff6c0..277cdad03 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelConfigurationElementCollection.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelConfigurationElementCollection.cs @@ -239,7 +239,7 @@ public virtual ConfigurationElementType this[object key] } else { -#pragma warning disable 56506 //Microsoft; Variable 'key' checked for null previously +#pragma warning disable 56506 //[....]; Variable 'key' checked for null previously throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(SR.GetString(SR.ConfigKeysDoNotMatch, this.GetElementKey(value).ToString(), key.ToString())); diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelExtensionCollectionElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelExtensionCollectionElement.cs index 798ad08c8..eba49b2e2 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelExtensionCollectionElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelExtensionCollectionElement.cs @@ -48,7 +48,7 @@ public TServiceModelExtensionElement this[Type extensionType] if (!this.CollectionElementBaseType.IsAssignableFrom(extensionType)) { -#pragma warning disable 56506 //Microsoft; Variable 'extensionType' checked for null previously +#pragma warning disable 56506 //[....]; Variable 'extensionType' checked for null previously throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("extensionType", SR.GetString(SR.ConfigInvalidExtensionType, extensionType.ToString(), @@ -326,8 +326,8 @@ TServiceModelExtensionElement CreateNewSection(string name) } catch (ConfigurationErrorsException e) { - // Work-around for - + // Work-around for bug 219506@CSDMain: if the extension type cannot be loaded, we'll ignore + // the exception when running in win8 app container and reading from machine.config. if (System.ServiceModel.Channels.AppContainerInfo.IsRunningInAppContainer && evaluationContext.IsMachineLevel) { DiagnosticUtility.TraceHandledException(e, TraceEventType.Information); diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelSectionGroup.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelSectionGroup.cs index 112d210c2..c05708f7b 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelSectionGroup.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceModelSectionGroup.cs @@ -74,7 +74,7 @@ public static ServiceModelSectionGroup GetSectionGroup(Configuration config) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("config"); } -#pragma warning suppress 56506 //Microsoft; config.SectionGroups can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; config.SectionGroups can never be null (underlying configuration system guarantees) return (ServiceModelSectionGroup)config.SectionGroups[ConfigurationStrings.SectionGroupName]; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceSecurityAuditElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceSecurityAuditElement.cs index 5cbdf80e1..a26244ce5 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceSecurityAuditElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceSecurityAuditElement.cs @@ -52,7 +52,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) { base.CopyFrom(from); ServiceSecurityAuditElement source = (ServiceSecurityAuditElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.AuditLogLocation = source.AuditLogLocation; this.SuppressAuditFailure = source.SuppressAuditFailure; this.ServiceAuthorizationAuditLevel = source.ServiceAuthorizationAuditLevel; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceThrottlingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceThrottlingElement.cs index b6df0f71a..11f81f426 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceThrottlingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceThrottlingElement.cs @@ -44,7 +44,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceThrottlingElement source = (ServiceThrottlingElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.MaxConcurrentCalls = source.MaxConcurrentCalls; this.MaxConcurrentSessions = source.MaxConcurrentSessions; this.MaxConcurrentInstances = source.MaxConcurrentInstances; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/ServiceTimeoutsElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/ServiceTimeoutsElement.cs index 573b1d9a9..9bd23149f 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/ServiceTimeoutsElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/ServiceTimeoutsElement.cs @@ -29,7 +29,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); ServiceTimeoutsElement source = (ServiceTimeoutsElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.TransactionTimeout = source.TransactionTimeout; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/SslStreamSecurityElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/SslStreamSecurityElement.cs index 247bd119d..025ebc794 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/SslStreamSecurityElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/SslStreamSecurityElement.cs @@ -60,7 +60,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); SslStreamSecurityElement source = (SslStreamSecurityElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.RequireClientCertificate = source.RequireClientCertificate; this.SslProtocols = source.SslProtocols; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/StandardBindingCollectionElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/StandardBindingCollectionElement.cs index ed2e5bb7e..64932814a 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/StandardBindingCollectionElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/StandardBindingCollectionElement.cs @@ -44,7 +44,7 @@ public override bool ContainsKey(string name) { // This line needed because of the IBindingSection implementation StandardBindingCollectionElement me = (StandardBindingCollectionElement)this; -#pragma warning suppress 56506 //Microsoft; me.Bindings can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; me.Bindings can never be null (underlying configuration system guarantees) return me.Bindings.ContainsKey(name); } protected internal override Binding GetDefault() diff --git a/System.ServiceModel/System/ServiceModel/Configuration/StandardEndpointCollectionElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/StandardEndpointCollectionElement.cs index 848b2d899..51b14b08d 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/StandardEndpointCollectionElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/StandardEndpointCollectionElement.cs @@ -44,7 +44,7 @@ public override ReadOnlyCollection ConfiguredEndpoints public override bool ContainsKey(string name) { StandardEndpointCollectionElement me = (StandardEndpointCollectionElement)this; -#pragma warning suppress 56506 //Microsoft; me.Endpoints can never be null (underlying configuration system guarantees) +#pragma warning suppress 56506 //[....]; me.Endpoints can never be null (underlying configuration system guarantees) return me.Endpoints.ContainsKey(name); } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TcpTransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/TcpTransportElement.cs index bed3878e5..e792c9cab 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TcpTransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TcpTransportElement.cs @@ -19,7 +19,7 @@ public TcpTransportElement() public override void ApplyConfiguration(BindingElement bindingElement) { base.ApplyConfiguration(bindingElement); -#pragma warning suppress 56506 // Microsoft, base.ApplyConfiguration() validates the argument +#pragma warning suppress 56506 // [....], base.ApplyConfiguration() validates the argument TcpTransportBindingElement binding = (TcpTransportBindingElement)bindingElement; PropertyInformationCollection propertyInfo = this.ElementInformation.Properties; if (this.ListenBacklog != TcpTransportDefaults.ListenBacklogConst) @@ -28,7 +28,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) } binding.PortSharingEnabled = this.PortSharingEnabled; binding.TeredoEnabled = this.TeredoEnabled; -#pragma warning suppress 56506 // Microsoft, base.ApplyConfiguration() validates the argument +#pragma warning suppress 56506 // [....], base.ApplyConfiguration() validates the argument this.ConnectionPoolSettings.ApplyConfiguration(binding.ConnectionPoolSettings); binding.ExtendedProtectionPolicy = ChannelBindingUtility.BuildPolicy(this.ExtendedProtectionPolicy); } @@ -43,7 +43,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); TcpTransportElement source = (TcpTransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ListenBacklog = source.ListenBacklog; this.PortSharingEnabled = source.PortSharingEnabled; this.TeredoEnabled = source.TeredoEnabled; @@ -59,7 +59,7 @@ protected override TransportBindingElement CreateDefaultBindingElement() protected internal override void InitializeFrom(BindingElement bindingElement) { base.InitializeFrom(bindingElement); -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument TcpTransportBindingElement binding = (TcpTransportBindingElement)bindingElement; if (binding.IsListenBacklogSet) { diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TextMessageEncodingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/TextMessageEncodingElement.cs index ec04b51b2..bf6497235 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TextMessageEncodingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TextMessageEncodingElement.cs @@ -24,7 +24,7 @@ public override void ApplyConfiguration(BindingElement bindingElement) binding.WriteEncoding = this.WriteEncoding; binding.MaxReadPoolSize = this.MaxReadPoolSize; binding.MaxWritePoolSize = this.MaxWritePoolSize; -#pragma warning suppress 56506 //Microsoft; base.ApplyConfiguration() checks for 'binding' being null +#pragma warning suppress 56506 //[....]; base.ApplyConfiguration() checks for 'binding' being null this.ReaderQuotas.ApplyConfiguration(binding.ReaderQuotas); } @@ -38,7 +38,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); TextMessageEncodingElement source = (TextMessageEncodingElement)from; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.MessageVersion = source.MessageVersion; this.WriteEncoding = source.WriteEncoding; this.MaxReadPoolSize = source.MaxReadPoolSize; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TransactedBatchingElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/TransactedBatchingElement.cs index 176571cd0..b74805626 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TransactedBatchingElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TransactedBatchingElement.cs @@ -22,7 +22,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); TransactedBatchingElement source = from as TransactedBatchingElement; -#pragma warning suppress 56506 //Microsoft; base.CopyFrom() checks for 'from' being null +#pragma warning suppress 56506 //[....]; base.CopyFrom() checks for 'from' being null this.MaxBatchSize = source.MaxBatchSize; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TransactionFlowElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/TransactionFlowElement.cs index de6601252..652f729b0 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TransactionFlowElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TransactionFlowElement.cs @@ -53,7 +53,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) { base.CopyFrom(from); TransactionFlowElement source = (TransactionFlowElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.TransactionProtocol = source.TransactionProtocol; } diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TransactionProtocolConverter.cs b/System.ServiceModel/System/ServiceModel/Configuration/TransactionProtocolConverter.cs index 12c1308b5..9bba5ca4c 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TransactionProtocolConverter.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TransactionProtocolConverter.cs @@ -32,7 +32,7 @@ public override bool CanConvertTo(ITypeDescriptorContext context, Type destinati public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) { string protocol = value as string; -#pragma warning suppress 56507 // Microsoft, Really checking for null (meaning value was not a string) versus String.Empty +#pragma warning suppress 56507 // [....], Really checking for null (meaning value was not a string) versus String.Empty if (protocol != null) { switch (protocol) diff --git a/System.ServiceModel/System/ServiceModel/Configuration/TransportElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/TransportElement.cs index 18d9aea87..c45992719 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/TransportElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/TransportElement.cs @@ -27,7 +27,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); TransportElement source = (TransportElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ManualAddressing = source.ManualAddressing; this.MaxBufferPoolSize = source.MaxBufferPoolSize; this.MaxReceivedMessageSize = source.MaxReceivedMessageSize; diff --git a/System.ServiceModel/System/ServiceModel/Configuration/WindowsStreamSecurityElement.cs b/System.ServiceModel/System/ServiceModel/Configuration/WindowsStreamSecurityElement.cs index e31633cd8..f82b3f7c2 100644 --- a/System.ServiceModel/System/ServiceModel/Configuration/WindowsStreamSecurityElement.cs +++ b/System.ServiceModel/System/ServiceModel/Configuration/WindowsStreamSecurityElement.cs @@ -52,7 +52,7 @@ public override void CopyFrom(ServiceModelExtensionElement from) base.CopyFrom(from); WindowsStreamSecurityElement source = (WindowsStreamSecurityElement)from; -#pragma warning suppress 56506 // Microsoft, base.CopyFrom() validates the argument +#pragma warning suppress 56506 // [....], base.CopyFrom() validates the argument this.ProtectionLevel = source.ProtectionLevel; } diff --git a/System.ServiceModel/System/ServiceModel/Description/ClientClassGenerator.cs b/System.ServiceModel/System/ServiceModel/Description/ClientClassGenerator.cs index 5712afbf7..c7362683b 100644 --- a/System.ServiceModel/System/ServiceModel/Description/ClientClassGenerator.cs +++ b/System.ServiceModel/System/ServiceModel/Description/ClientClassGenerator.cs @@ -61,7 +61,7 @@ internal ClientClassGenerator(bool tryAddHelperMethod, bool generateEventAsyncMe static string getDefaultValueForInitializationMethodName = "GetDefaultValueForInitialization"; // IMPORTANT: this table tracks the set of .ctors in ClientBase and DuplexClientBase. - // This table must be kept in sync + // This table must be kept in [....] // for DuplexClientBase, the initial InstanceContext param is assumed; ctor overloads must match between ClientBase and DuplexClientBase static Type[][] ClientCtorParamTypes = new Type[][] { @@ -107,7 +107,7 @@ internal ClientClassGenerator(bool tryAddHelperMethod, bool generateEventAsyncMe #if DEBUG static BindingFlags ctorBindingFlags = BindingFlags.Instance | BindingFlags.NonPublic; - static string DebugCheckTable_errorString = "Client code generation table out of sync with ClientBase and DuplexClientBase ctors. Please investigate."; + static string DebugCheckTable_errorString = "Client code generation table out of [....] with ClientBase and DuplexClientBase ctors. Please investigate."; // check the table against what we would get from reflection static void DebugCheckTable() diff --git a/System.ServiceModel/System/ServiceModel/Description/ConfigWriter.cs b/System.ServiceModel/System/ServiceModel/Description/ConfigWriter.cs index c111c900c..2020a0444 100644 --- a/System.ServiceModel/System/ServiceModel/Description/ConfigWriter.cs +++ b/System.ServiceModel/System/ServiceModel/Description/ConfigWriter.cs @@ -40,7 +40,7 @@ internal ChannelEndpointElement WriteChannelDescription(ServiceEndpoint endpoint channelElement = new ChannelEndpointElement(endpoint.Address, typeName); - // Microsoft: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm + // [....]: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm // does not touch ASCII names, a name that looks like encoded name will not roundtrip(Example: "_x002C_" will turned into ",") channelElement.Name = NamingHelper.GetUniqueName(NamingHelper.CodeName(endpoint.Name), this.CheckIfChannelNameInUse, null); @@ -64,7 +64,7 @@ BindingDictionaryValue CreateBindingConfig(Binding binding) BindingDictionaryValue bindingDV; if (!bindingTable.TryGetValue(binding, out bindingDV)) { - // Microsoft: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm + // [....]: review: Use decoded form to preserve the user-given friendly name, however, beacuse our Encoding algorithm // does not touch ASCII names, a name that looks like encoded name will not roundtrip(Example: "_x002C_" will turned into ",") string bindingName = NamingHelper.GetUniqueName(NamingHelper.CodeName(binding.Name), this.CheckIfBindingNameInUse, null); string bindingSectionName; diff --git a/System.ServiceModel/System/ServiceModel/Description/ImportedPolicyConversionContext.cs b/System.ServiceModel/System/ServiceModel/Description/ImportedPolicyConversionContext.cs index 711970a2a..5d9a36665 100644 --- a/System.ServiceModel/System/ServiceModel/Description/ImportedPolicyConversionContext.cs +++ b/System.ServiceModel/System/ServiceModel/Description/ImportedPolicyConversionContext.cs @@ -13,7 +13,7 @@ namespace System.ServiceModel.Description public abstract partial class MetadataImporter { - //Consider, Microsoft: make this public + //Consider, [....]: make this public internal static IEnumerable GetPolicyConversionContextEnumerator(ServiceEndpoint endpoint, PolicyAlternatives policyAlternatives) { return ImportedPolicyConversionContext.GetPolicyConversionContextEnumerator(endpoint, policyAlternatives, MetadataImporterQuotas.Defaults); diff --git a/System.ServiceModel/System/ServiceModel/Description/MessageContractExporter.cs b/System.ServiceModel/System/ServiceModel/Description/MessageContractExporter.cs index 2b126c76a..dbef91c12 100644 --- a/System.ServiceModel/System/ServiceModel/Description/MessageContractExporter.cs +++ b/System.ServiceModel/System/ServiceModel/Description/MessageContractExporter.cs @@ -511,7 +511,7 @@ string GetMessageName(MessageDescription messageDescription) string operationName = contractContext.GetOperation(operation).Name; string callbackString = operation.IsServerInitiated() ? "Callback" : string.Empty; - // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' + // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' if (messageDescription.Direction == MessageDirection.Input) messageNameBase = string.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_Input{2}Message", portTypeName, operationName, callbackString); @@ -539,7 +539,7 @@ protected string GetFaultMessageName(string faultName) { string portTypeName = contractContext.WsdlPortType.Name; string operationName = contractContext.GetOperation(operation).Name; - // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' + // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' string faultNameBase = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}_FaultMessage", portTypeName, operationName, faultName); WsdlNS.ServiceDescription wsdl = contractContext.WsdlPortType.ServiceDescription; diff --git a/System.ServiceModel/System/ServiceModel/Description/MetadataSection.cs b/System.ServiceModel/System/ServiceModel/Description/MetadataSection.cs index 8c33e75db..87e7f37da 100644 --- a/System.ServiceModel/System/ServiceModel/Description/MetadataSection.cs +++ b/System.ServiceModel/System/ServiceModel/Description/MetadataSection.cs @@ -92,7 +92,7 @@ public static MetadataSection CreateFromPolicy(XmlElement policy, string identif if (!IsPolicyElement(policy)) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("policy", -#pragma warning suppress 56506 // Microsoft, policy cannot be null at this point since it has been validated above. +#pragma warning suppress 56506 // [....], policy cannot be null at this point since it has been validated above. SR.GetString(SR.SFxBadMetadataMustBePolicy, MetadataStrings.WSPolicy.NamespaceUri, MetadataStrings.WSPolicy.Elements.Policy, policy.NamespaceURI, policy.LocalName)); } diff --git a/System.ServiceModel/System/ServiceModel/Description/PolicyReader.cs b/System.ServiceModel/System/ServiceModel/Description/PolicyReader.cs index 9b60b7643..469c6d6be 100644 --- a/System.ServiceModel/System/ServiceModel/Description/PolicyReader.cs +++ b/System.ServiceModel/System/ServiceModel/Description/PolicyReader.cs @@ -21,7 +21,7 @@ public abstract partial class MetadataImporter internal delegate void PolicyWarningHandler(XmlElement contextAssertion, string warningMessage); - // Consider, Microsoft, make this public? + // Consider, [....], make this public? internal event PolicyWarningHandler PolicyWarningOccured; internal IEnumerable> NormalizePolicy(IEnumerable policyAssertions) @@ -92,7 +92,7 @@ IEnumerable> ReadNode(XmlNode node, XmlElement contextAs string warningMsg = SR.GetString(SR.UnrecognizedPolicyElementInNamespace, node.Name, node.NamespaceURI); metadataImporter.PolicyWarningOccured.Invoke(contextAssertion, warningMsg); break; - //consider Microsoft, add more error handling here. default? + //consider [....], add more error handling here. default? } return nodes; } @@ -365,7 +365,7 @@ public T Current { get { -#pragma warning suppress 56503 // Microsoft, IEnumerator guidelines, Current throws exception before calling MoveNext +#pragma warning suppress 56503 // [....], IEnumerator guidelines, Current throws exception before calling MoveNext throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.NoValue0))); } } diff --git a/System.ServiceModel/System/ServiceModel/Description/ServiceEndpoint.cs b/System.ServiceModel/System/ServiceModel/Description/ServiceEndpoint.cs index d8c3dca4e..cd369d242 100644 --- a/System.ServiceModel/System/ServiceModel/Description/ServiceEndpoint.cs +++ b/System.ServiceModel/System/ServiceModel/Description/ServiceEndpoint.cs @@ -105,7 +105,7 @@ public string Name } else if (binding != null) { - // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' + // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' return String.Format(CultureInfo.InvariantCulture, "{0}_{1}", new XmlName(Binding.Name).EncodedName, Contract.Name); } else diff --git a/System.ServiceModel/System/ServiceModel/Description/SoapHelper.cs b/System.ServiceModel/System/ServiceModel/Description/SoapHelper.cs index d18c4927e..61868f6c8 100644 --- a/System.ServiceModel/System/ServiceModel/Description/SoapHelper.cs +++ b/System.ServiceModel/System/ServiceModel/Description/SoapHelper.cs @@ -186,7 +186,7 @@ private static EnvelopeVersion GetSoapVersionState(WsdlNS.Binding wsdlBinding, W static class SoapConverter { - // Microsoft, this could be simplified if we used generics. + // [....], this could be simplified if we used generics. internal static void ConvertExtensions(WsdlNS.ServiceDescriptionFormatExtensionCollection extensions, EnvelopeVersion version, ConvertExtension conversionMethod) { bool foundOne = false; diff --git a/System.ServiceModel/System/ServiceModel/Description/TaskOperationDescriptionValidator.cs b/System.ServiceModel/System/ServiceModel/Description/TaskOperationDescriptionValidator.cs index 2d1827ef8..70f610065 100644 --- a/System.ServiceModel/System/ServiceModel/Description/TaskOperationDescriptionValidator.cs +++ b/System.ServiceModel/System/ServiceModel/Description/TaskOperationDescriptionValidator.cs @@ -15,7 +15,7 @@ internal static void Validate(OperationDescription operationDescription, bool is { if (isForService) { - // no other method (sync, async) is allowed to co-exist with a task-based method on the server-side. + // no other method ([....], async) is allowed to co-exist with a task-based method on the server-side. EnsureNoSyncMethod(operationDescription); EnsureNoBeginEndMethod(operationDescription); } diff --git a/System.ServiceModel/System/ServiceModel/Description/TypeLoader.cs b/System.ServiceModel/System/ServiceModel/Description/TypeLoader.cs index 45d56cc05..105821f4e 100644 --- a/System.ServiceModel/System/ServiceModel/Description/TypeLoader.cs +++ b/System.ServiceModel/System/ServiceModel/Description/TypeLoader.cs @@ -771,13 +771,13 @@ internal static Attribute GetFormattingAttribute(ICustomAttributeProvider attrPr return defaultFormatAttribute; } - //Sync and Async should follow the rules: + //[....] and Async should follow the rules: // 1. Parameter match // 2. Async cannot have behaviors (verification happens later in ProcessOpMethod - behaviors haven't yet been loaded here) // 3. Async cannot have known types // 4. Async cannot have known faults - // 5. Sync and Async have to match on OneWay status - // 6. Sync and Async have to match Action and ReplyAction + // 5. [....] and Async have to match on OneWay status + // 6. [....] and Async have to match Action and ReplyAction void VerifyConsistency(OperationConsistencyVerifier verifier) { verifier.VerifyParameterLength(); @@ -860,7 +860,7 @@ OperationDescription CreateOperationDescription(ContractDescription contractDesc existingOp.TaskTResult = newOp.TaskTResult; if (existingOp.SyncMethod != null) { - // Task vs. Sync + // Task vs. [....] VerifyConsistency(new SyncTaskOperationConsistencyVerifier(existingOp, newOp)); } else @@ -876,7 +876,7 @@ OperationDescription CreateOperationDescription(ContractDescription contractDesc existingOp.EndMethod = newOp.EndMethod; if (existingOp.SyncMethod != null) { - // Async vs. Sync + // Async vs. [....] VerifyConsistency(new SyncAsyncOperationConsistencyVerifier(existingOp, newOp)); } else @@ -894,12 +894,12 @@ OperationDescription CreateOperationDescription(ContractDescription contractDesc newOp.TaskTResult = existingOp.TaskTResult; if (existingOp.TaskMethod != null) { - // Sync vs. Task + // [....] vs. Task VerifyConsistency(new SyncTaskOperationConsistencyVerifier(newOp, existingOp)); } else { - // Sync vs. Async + // [....] vs. Async VerifyConsistency(new SyncAsyncOperationConsistencyVerifier(newOp, existingOp)); } return newOp; diff --git a/System.ServiceModel/System/ServiceModel/Description/WsdlExporter.cs b/System.ServiceModel/System/ServiceModel/Description/WsdlExporter.cs index bb0dc9be8..656fc85a7 100644 --- a/System.ServiceModel/System/ServiceModel/Description/WsdlExporter.cs +++ b/System.ServiceModel/System/ServiceModel/Description/WsdlExporter.cs @@ -991,7 +991,7 @@ internal static string FindOrCreatePrefix(string prefixBase, string ns, params W int i = 0; prefix = prefixBase + i.ToString(CultureInfo.InvariantCulture); - //Microsoft, consider do we need to check at higher scopes as well? + //[....], consider do we need to check at higher scopes as well? while (PrefixExists(scopes[0].Namespaces.ToArray(), prefix)) prefix = prefixBase + (++i).ToString(CultureInfo.InvariantCulture); } diff --git a/System.ServiceModel/System/ServiceModel/Description/WsdlImporter.cs b/System.ServiceModel/System/ServiceModel/Description/WsdlImporter.cs index 026247d85..cf5abf7fb 100644 --- a/System.ServiceModel/System/ServiceModel/Description/WsdlImporter.cs +++ b/System.ServiceModel/System/ServiceModel/Description/WsdlImporter.cs @@ -922,7 +922,7 @@ internal static MatchResult Match(WsdlNS.OperationBinding wsdlOperationBinding, // This method checks if there is a match based on Names, between the specified OperationBinding and Operation. // When searching for the Operation associated with an OperationBinding, we need to return an exact match if possible, // or a partial match otherwise (when some of the Names are null). - // + // Bug 16833 @ CSDMain requires that partial matches are allowed, while the TFS bug 477838 requires that exact matches are done (when possible). if (wsdlOperationBinding.Name != wsdlOperation.Name) { return MatchResult.None; @@ -1189,7 +1189,7 @@ internal static XmlQualifiedName GetBindingName(WsdlNS.Binding wsdlBinding) internal static XmlQualifiedName GetBindingName(WsdlNS.Port wsdlPort) { - // Microsoft: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' + // [....]: composing names have potential problem of generating name that looks like an encoded name, consider avoiding '_' XmlName xmlName = new XmlName(string.Format(CultureInfo.InvariantCulture, "{0}_{1}", wsdlPort.Service.Name, wsdlPort.Name), true /*isEncoded*/); return new XmlQualifiedName(xmlName.EncodedName, wsdlPort.Service.ServiceDescription.TargetNamespace); } @@ -1233,7 +1233,7 @@ internal static XmlName GetOperationMessageName(WsdlNS.OperationMessage wsdlOper } else { - // Microsoft: why this is an Assert, and not an exception? + // [....]: why this is an Assert, and not an exception? Fx.Assert("Unsupported WSDL OM (More than 2 OperationMessages encountered in an Operation or WsdlOM is invalid)"); } // names the come from service description documents have to be valid NCNames; XmlName.ctor will validate. @@ -1920,7 +1920,7 @@ Exception CreateAlreadyFaultedException(WsdlNS.NamedItem item) static Exception CreateExtensionException(IWsdlImportExtension importer, Exception e) { string errorMessage = SR.GetString(SR.WsdlExtensionImportError, importer.GetType().FullName, e.Message); - //consider Microsoft, allow internal exceptions to throw WsdlImportException and handle it in some special way? + //consider [....], allow internal exceptions to throw WsdlImportException and handle it in some special way? return new InvalidOperationException(errorMessage, e); } diff --git a/System.ServiceModel/System/ServiceModel/Diagnostics/MessageLogger.cs b/System.ServiceModel/System/ServiceModel/Diagnostics/MessageLogger.cs index 3b84da0fe..10237200c 100644 --- a/System.ServiceModel/System/ServiceModel/Diagnostics/MessageLogger.cs +++ b/System.ServiceModel/System/ServiceModel/Diagnostics/MessageLogger.cs @@ -489,7 +489,7 @@ static void LogInternal(MessageLoggingSource source, object data) { if ((source & MessageLoggingSource.Malformed) != 0) { - if (!TD.MessageLogWarning(data.ToString())) + if (TD.MessageLogWarningIsEnabled() && !TD.MessageLogWarning(data.ToString())) { if (TD.MessageLogEventSizeExceededIsEnabled()) { @@ -499,7 +499,7 @@ static void LogInternal(MessageLoggingSource source, object data) } else { - if (!TD.MessageLogInfo(data.ToString())) + if (TD.MessageLogInfoIsEnabled() && !TD.MessageLogInfo(data.ToString())) { if (TD.MessageLogEventSizeExceededIsEnabled()) { diff --git a/System.ServiceModel/System/ServiceModel/Diagnostics/PerformanceCountersBase.cs b/System.ServiceModel/System/ServiceModel/Diagnostics/PerformanceCountersBase.cs index bfe5aa067..3043e5afe 100644 --- a/System.ServiceModel/System/ServiceModel/Diagnostics/PerformanceCountersBase.cs +++ b/System.ServiceModel/System/ServiceModel/Diagnostics/PerformanceCountersBase.cs @@ -115,9 +115,9 @@ protected virtual void Dispose(bool disposing) // A CounterSetInstance is not disposed immediately when a service, endpoint or operation perf counter is disposed. Because messages // can be processed while a ServiceHost is being closed, and such messages can try to update perf counters data, resulting in AVs or - // corruptions (see - - + // corruptions (see bug 249132 @ CSDMain). So instead of disposing a CounterSetInstance, we hold a WeakReference to it, until either + // GC reclaims it or a new service/endpoint/operation perf counter is started with the same name (and re-uses the CounterSetInstance). + // The CounterSetInstance finalizer will free up the perf counters memory, so we don't have a leak. protected class CounterSetInstanceCache { // instance name -> WeakReference of CounterSetInstance diff --git a/System.ServiceModel/System/ServiceModel/Diagnostics/TraceUtility.cs b/System.ServiceModel/System/ServiceModel/Diagnostics/TraceUtility.cs index 2ade49929..ef7c00c40 100644 --- a/System.ServiceModel/System/ServiceModel/Diagnostics/TraceUtility.cs +++ b/System.ServiceModel/System/ServiceModel/Diagnostics/TraceUtility.cs @@ -554,6 +554,24 @@ internal static ServiceModelActivity ExtractActivity(Message message) return retval; } + + internal static ServiceModelActivity ExtractActivity(RequestContext request) + { + try + { + return TraceUtility.ExtractActivity(request.RequestMessage); + } + catch (Exception e) + { + if (Fx.IsFatal(e)) + { + throw; + } + } + + return null; + } + internal static Guid ExtractActivityId(Message message) { if (TraceUtility.MessageFlowTracingOnly) diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ActionMessageFilterTable.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ActionMessageFilterTable.cs index 9f4d8c9c0..089152443 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ActionMessageFilterTable.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ActionMessageFilterTable.cs @@ -111,7 +111,7 @@ public void Add(ActionMessageFilter filter, TFilterData data) this.filters.Add(filter, data); List filters; -#pragma warning suppress 56506 // Microsoft, Actions will never be null +#pragma warning suppress 56506 // [....], Actions will never be null if (filter.Actions.Count == 0) { this.always.Add(filter); @@ -426,7 +426,7 @@ public bool Remove(ActionMessageFilter filter) if (this.filters.Remove(filter)) { -#pragma warning suppress 56506 // Microsoft, ActionMessageFilter.Actions can never be null +#pragma warning suppress 56506 // [....], ActionMessageFilter.Actions can never be null if (filter.Actions.Count == 0) { this.always.Remove(filter); @@ -436,9 +436,9 @@ public bool Remove(ActionMessageFilter filter) List filters; for (int i = 0; i < filter.Actions.Count; ++i) { -#pragma warning suppress 56506 // Microsoft, PreSharp generates a false error here +#pragma warning suppress 56506 // [....], PreSharp generates a false error here filters = this.actions[filter.Actions[i]]; -#pragma warning suppress 56506 // Microsoft, filters can never be null +#pragma warning suppress 56506 // [....], filters can never be null if (filters.Count == 1) { this.actions.Remove(filter.Actions[i]); diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ChannelHandler.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ChannelHandler.cs index 317a6f9a5..d4c7285a8 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ChannelHandler.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ChannelHandler.cs @@ -5,6 +5,7 @@ namespace System.ServiceModel.Dispatcher { using System; + using System.Diagnostics; using System.Globalization; using System.Runtime; using System.Runtime.CompilerServices; @@ -769,7 +770,7 @@ internal bool HandleError(Exception e) bool HandleError(Exception e, ref ErrorHandlerFaultInfo faultInfo) { - if (!(e != null)) + if (e == null) { Fx.Assert(SR.GetString(SR.GetString(SR.SFxNonExceptionThrown))); throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.GetString(SR.SFxNonExceptionThrown)))); @@ -944,7 +945,8 @@ bool HandleRequest(RequestContext request, OperationContext currentOperationCont return false; } - ServiceModelActivity activity = DiagnosticUtility.ShouldUseActivity ? TraceUtility.ExtractActivity(request.RequestMessage) : null; + ServiceModelActivity activity = DiagnosticUtility.ShouldUseActivity ? TraceUtility.ExtractActivity(request) : null; + using (ServiceModelActivity.BoundOperation(activity)) { if (this.HandleRequestAsReply(request)) @@ -1440,7 +1442,7 @@ void ReleasePump() { if (this.isConcurrent) { - this.isPumpAcquired = 0; + Interlocked.Exchange(ref this.isPumpAcquired, 0); } } @@ -1793,8 +1795,6 @@ internal void ThrottleAcquiredForCall() } this.requestInfo.ChannelHandlerOwnsInstanceContextThrottle = (this.requestInfo.ExistingInstanceContext == null); - - if (this.DispatchAndReleasePump(request, false, null)) { this.EnsurePump(); @@ -1802,9 +1802,42 @@ internal void ThrottleAcquiredForCall() } } + bool TryRetrievingInstanceContext(RequestContext request) + { + try + { + return TryRetrievingInstanceContextCore(request); + } + catch (Exception ex) + { + if (Fx.IsFatal(ex)) + { + throw; + } + + DiagnosticUtility.TraceHandledException(ex, TraceEventType.Error); + + try + { + request.Close(); + } + catch (Exception e) + { + if (Fx.IsFatal(e)) + { + throw; + } + + request.Abort(); + } + + return false; + } + } + //Return: False denotes failure, Caller should discard the request. // : True denotes operation is sucessful. - bool TryRetrievingInstanceContext(RequestContext request) + bool TryRetrievingInstanceContextCore(RequestContext request) { bool releasePump = true; try @@ -1870,6 +1903,7 @@ bool TryRetrievingInstanceContext(RequestContext request) } this.HandleError(e, request, channel); + return false; } finally @@ -1949,10 +1983,7 @@ bool TryAcquirePump() { if (this.isConcurrent) { - if (this.isPumpAcquired != 0 || Interlocked.CompareExchange(ref this.isPumpAcquired, 1, 0) != 0) - { - return false; - } + return Interlocked.CompareExchange(ref this.isPumpAcquired, 1, 0) == 0; } return true; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs index bad9a746f..8a9955bd5 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/DuplexChannelBinder.cs @@ -537,7 +537,7 @@ public Message Request(Message message, TimeSpan timeout) } } - // ASSUMPTION: (Microsoft) caller holds lock (this.mutex) + // ASSUMPTION: ([....]) caller holds lock (this.mutex) void RequestStarting(Message message, IDuplexRequest request) { if (request != null) @@ -552,7 +552,7 @@ void RequestStarting(Message message, IDuplexRequest request) } - // ASSUMPTION: (Microsoft) caller holds lock (this.mutex) + // ASSUMPTION: ([....]) caller holds lock (this.mutex) void RequestCompleting(IDuplexRequest request) { this.pending--; @@ -1473,7 +1473,7 @@ public IAsyncResult BeginClose(TimeSpan timeout, AsyncCallback callback, object public void EndClose(IAsyncResult result) { - // don't need to lock here since BeginClose is the sync-point + // don't need to lock here since BeginClose is the [....]-point if (this.closeState.TryUserClose()) { this.innerChannel.EndClose(result); diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilter.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilter.cs index 049a1b784..c61e56fb9 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilter.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilter.cs @@ -92,7 +92,7 @@ public override bool Match(Message message) } // To -#pragma warning suppress 56506 // Microsoft, Message.Headers can never be null +#pragma warning suppress 56506 // [....], Message.Headers can never be null Uri to = message.Headers.To; Uri actingAs = this.address.Uri; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilterTable.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilterTable.cs index 7f5e509b8..b3d707904 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilterTable.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/EndpointAddressMessageFilterTable.cs @@ -153,7 +153,7 @@ public virtual void Add(EndpointAddressMessageFilter filter, TFilterData data) this.candidates.Add(filter, can); CandidateSet cset; -#pragma warning suppress 56506 // Microsoft, EndpointAddressMessageFilter.Address can never be null +#pragma warning suppress 56506 // [....], EndpointAddressMessageFilter.Address can never be null Uri soapToAddress = filter.Address.Uri; if (filter.IncludeHostNameInComparison) { @@ -181,7 +181,7 @@ protected void IncrementQNameCount(CandidateSet cset, EndpointAddress address) // Update the QName ref count QName qname; int cnt; -#pragma warning suppress 56506 // Microsoft, EndpointAddressMessageFilter.Address can never be null +#pragma warning suppress 56506 // [....], EndpointAddressMessageFilter.Address can never be null for (int i = 0; i < address.Headers.Count; ++i) { AddressHeader parameter = address.Headers[i]; @@ -719,7 +719,7 @@ public virtual bool Remove(EndpointAddressMessageFilter filter) } Candidate can = this.candidates[filter]; -#pragma warning suppress 56506 // Microsoft, EndpointAddressMessageFilter.Address can never be null +#pragma warning suppress 56506 // [....], EndpointAddressMessageFilter.Address can never be null Uri soapToAddress = filter.Address.Uri; CandidateSet cset = null; @@ -761,7 +761,7 @@ protected void DecrementQNameCount(CandidateSet cset, EndpointAddress address) { // Adjust QName counts QName qname; -#pragma warning suppress 56506 // Microsoft, EndpointAddress.Headers can never be null +#pragma warning suppress 56506 // [....], EndpointAddress.Headers can never be null for (int i = 0; i < address.Headers.Count; ++i) { AddressHeader parameter = address.Headers[i]; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ErrorHandlingAcceptor.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ErrorHandlingAcceptor.cs index 853a5f738..87f9088a8 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ErrorHandlingAcceptor.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ErrorHandlingAcceptor.cs @@ -56,9 +56,9 @@ void HandleErrorOrAbort(Exception e) { if ((this.dispatcher == null) || !this.dispatcher.HandleError(e)) { - // We only stop if the listener faults. It is a - - + // We only stop if the listener faults. It is a bug + // if the listener is in an invalid state and does not + // fault. So there are no cases today where this aborts. } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ImmutableDispatchRuntime.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ImmutableDispatchRuntime.cs index 60d24111d..caf32a627 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ImmutableDispatchRuntime.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ImmutableDispatchRuntime.cs @@ -1144,7 +1144,7 @@ void ProcessMessage5(ref MessageRpc rpc) { if (!rpc.Operation.IsSynchronous) { - // If async call completes in sync, it tells us through the gate below + // If async call completes in [....], it tells us through the gate below rpc.PrepareInvokeContinueGate(); } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/InputChannelBinder.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/InputChannelBinder.cs index b27cc867c..9a7e2012f 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/InputChannelBinder.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/InputChannelBinder.cs @@ -50,7 +50,7 @@ public EndpointAddress RemoteAddress { get { -#pragma warning suppress 56503 // Microsoft, the property is really not implemented, cannot lie, API not public +#pragma warning suppress 56503 // [....], the property is really not implemented, cannot lie, API not public throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotImplementedException()); } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/MessageFilterTable.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/MessageFilterTable.cs index ebe6801b6..3f1dd3be1 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/MessageFilterTable.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/MessageFilterTable.cs @@ -153,7 +153,7 @@ public void Add(MessageFilter filter, TFilterData data, int priority) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument("filter", SR.GetString(SR.FilterExists)); } -#pragma warning suppress 56506 // Microsoft, PreSharp generates a false warning here +#pragma warning suppress 56506 // [....], PreSharp generates a false warning here Type filterType = filter.GetType(); Type tableType = null; IMessageFilterTable table = null; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/OperationInvokerBehavior.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/OperationInvokerBehavior.cs index 2bcb3ceae..2bfeafdac 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/OperationInvokerBehavior.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/OperationInvokerBehavior.cs @@ -41,7 +41,7 @@ void IOperationBehavior.ApplyDispatchBehavior(OperationDescription description, { if (description.BeginMethod != null) { - // both sync and async methods are present on the contract, check the preference + // both [....] and async methods are present on the contract, check the preference OperationBehaviorAttribute operationBehaviorAttribue = description.Behaviors.Find(); if ((operationBehaviorAttribue != null) && operationBehaviorAttribue.PreferAsyncInvocation) { @@ -54,7 +54,7 @@ void IOperationBehavior.ApplyDispatchBehavior(OperationDescription description, } else { - // only sync method is present on the contract + // only [....] method is present on the contract dispatch.Invoker = new SyncMethodInvoker(description.SyncMethod); } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/OutputChannelBinder.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/OutputChannelBinder.cs index e4a25a96a..4c94fe775 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/OutputChannelBinder.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/OutputChannelBinder.cs @@ -43,7 +43,7 @@ public EndpointAddress LocalAddress { get { -#pragma warning suppress 56503 // Microsoft, the property is really not implemented, cannot lie, API not public +#pragma warning suppress 56503 // [....], the property is really not implemented, cannot lie, API not public throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotImplementedException()); } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilter.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilter.cs index 91f21729a..53855e359 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilter.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilter.cs @@ -85,7 +85,7 @@ public override bool Match(Message message) } // To -#pragma warning suppress 56506 // Microsoft, Message.Headers can never be null +#pragma warning suppress 56506 // [....], Message.Headers can never be null Uri to = message.Headers.To; object o; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilterTable.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilterTable.cs index 5b8d787e7..d360c4ba4 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilterTable.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/PrefixEndpointAddressMessageFilterTable.cs @@ -59,7 +59,7 @@ public void Add(PrefixEndpointAddressMessageFilter filter, TFilterData data) Candidate can = new Candidate(filter, data, mask, filter.HeaderLookup); this.candidates.Add(filter, can); -#pragma warning suppress 56506 // Microsoft, PrefixEndpointAddressMessageFilter.Address can never be null +#pragma warning suppress 56506 // [....], PrefixEndpointAddressMessageFilter.Address can never be null Uri soapToAddress = filter.Address.Uri; CandidateSet cset; @@ -134,7 +134,7 @@ public bool Remove(PrefixEndpointAddressMessageFilter filter) } Candidate can = this.candidates[filter]; -#pragma warning suppress 56506 // Microsoft, PrefixEndpointAddressMessageFilter.Address can never be null +#pragma warning suppress 56506 // [....], PrefixEndpointAddressMessageFilter.Address can never be null Uri soapToAddress = filter.Address.Uri; CandidateSet cset = null; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/PrimitiveOperationFormatter.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/PrimitiveOperationFormatter.cs index beddbbcfc..738725817 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/PrimitiveOperationFormatter.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/PrimitiveOperationFormatter.cs @@ -46,7 +46,7 @@ public PrimitiveOperationFormatter(OperationDescription description, bool isRpc) OperationFormatter.Validate(description, isRpc, false/*isEncoded*/); this.operation = description; -#pragma warning suppress 56506 // Microsoft, OperationDescription.Messages never be null +#pragma warning suppress 56506 // [....], OperationDescription.Messages never be null this.requestMessage = description.Messages[0]; if (description.Messages.Count == 2) this.responseMessage = description.Messages[1]; @@ -290,7 +290,7 @@ public static bool IsContractSupported(OperationDescription description) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("description"); OperationDescription operation = description; -#pragma warning suppress 56506 // Microsoft, OperationDescription.Messages never be null +#pragma warning suppress 56506 // [....], OperationDescription.Messages never be null MessageDescription requestMessage = description.Messages[0]; MessageDescription responseMessage = null; if (description.Messages.Count == 2) diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryFunctions.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryFunctions.cs index 046eea89a..e3335d236 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryFunctions.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryFunctions.cs @@ -55,7 +55,7 @@ internal class XsltFunctionCallOpcode : Opcode List iterList; - // REFACTOR, Microsoft, make this a function on QueryValueModel + // REFACTOR, [....], make this a function on QueryValueModel internal XsltFunctionCallOpcode(XsltContext context, IXsltContextFunction function, int argCount) : base(OpcodeID.XsltFunction) { @@ -138,7 +138,7 @@ internal override Opcode Eval(ProcessingContext context) } else { - // PERF, Microsoft, see if we can cache these arrays to avoid allocations + // PERF, [....], see if we can cache these arrays to avoid allocations object[] xsltArgs = new object[this.argCount]; int iterationCount = context.TopArg.Count; for (int iteration = 0; iteration < iterationCount; ++iteration) @@ -1210,7 +1210,7 @@ internal static void Translate(ProcessingContext context) StackFrame argKeys = context.SecondArg; StackFrame argValues = context[2]; - // PERF, Microsoft, this is really slow. + // PERF, [....], this is really slow. StringBuilder builder = new StringBuilder(); while (argSource.basePtr <= argSource.endPtr) { diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryMatcher.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryMatcher.cs index 6fec13b5c..d34430b87 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryMatcher.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryMatcher.cs @@ -337,8 +337,8 @@ internal static OpcodeBlock CompileForExternalEngine(string expression, XmlNames // Fx will bind prefixes and functions here. if (namespaces != null) { - // There's a - + // There's a bug in System.Xml.XPath. If we pass an XsltContext to SetContext it won't throw if there's + // an undefined prefix. if (namespaces is XsltContext) { // Lex the xpath to find all prefixes used diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryNode.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryNode.cs index f56c2737a..0ee7900aa 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryNode.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryNode.cs @@ -140,7 +140,7 @@ internal enum NodeSequenceItemFlags : byte NodesetLast = 0x01, } - // PERF, Microsoft, Remove when generic sort works + // PERF, [....], Remove when generic sort works // Used to sort in document order #if NO internal class NodeSequenceItemObjectComparer : IComparer @@ -908,7 +908,7 @@ internal void SortNodes() { this.Merge(false); - // PERF, Microsoft, make this work + // PERF, [....], make this work //Array.Sort(this.items, 0, this.count, NodeSequence.Comparer); Array.Sort(this.items, 0, this.count, NodeSequence.ObjectComparer); @@ -974,7 +974,7 @@ internal NodeSequence Union(ProcessingContext context, NodeSequence otherSeq) return seq; /* - // PERF, Microsoft, I think we can do the merge ourselves and avoid the sort. + // PERF, [....], I think we can do the merge ourselves and avoid the sort. // Need to verify that the sequences are always in document order. for(int i = 0; i < this.count; ++i) { @@ -1055,13 +1055,13 @@ public override XPathNavigator Current { if (this.index == 0) { -#pragma warning suppress 56503 // Microsoft, postponing the public change +#pragma warning suppress 56503 // [....], postponing the public change throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new QueryProcessingException(QueryProcessingError.Unexpected, SR.GetString(SR.QueryContextNotSupportedInSequences))); } if (this.index > this.data.seq.Count) { -#pragma warning suppress 56503 // Microsoft, postponing the public change +#pragma warning suppress 56503 // [....], postponing the public change throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.QueryAfterNodes))); } // @@ -1156,13 +1156,13 @@ public object Current { if (this.iter.CurrentPosition == 0) { -#pragma warning suppress 56503 // Microsoft, postponing the public change +#pragma warning suppress 56503 // [....], postponing the public change throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.QueryBeforeNodes))); } if (this.iter.CurrentPosition > this.iter.Count) { -#pragma warning suppress 56503 // Microsoft, postponing the public change +#pragma warning suppress 56503 // [....], postponing the public change throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.QueryAfterNodes))); } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryProcessor.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryProcessor.cs index 6df5f8ce1..54818a997 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryProcessor.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryProcessor.cs @@ -457,7 +457,7 @@ internal QueryProcessor(QueryMatcher matcher) this.matcher = matcher; this.flags = QueryProcessingFlags.Match; - // PERF, Microsoft, see if we can just let these to their default init + // PERF, [....], see if we can just let these to their default init this.messageAction = null; //this.messageAddress = null; //this.messageVia = null; @@ -510,7 +510,7 @@ internal SeekableXPathNavigator ContextNode } else { -#pragma warning suppress 56503 // Microsoft, property is more readable for this +#pragma warning suppress 56503 // [....], property is more readable for this throw DiagnosticUtility.ExceptionUtility.ThrowHelperCritical(new QueryProcessingException(QueryProcessingError.Unexpected)); } this.counter = this.contextNode as INodeCounter; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySelectOp.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySelectOp.cs index 133eb048b..e835c3651 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySelectOp.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySelectOp.cs @@ -44,7 +44,7 @@ internal bool IsCompressable { get { - // PERF, Microsoft, weaken guard? + // PERF, [....], weaken guard? return QueryAxisType.Self == this.axis.Type || QueryAxisType.Child == this.axis.Type; //return ((QueryAxisType.Self == this.axis.Type) || ((this.axis.Type != QueryAxisType.DescendantOrSelf || this.axis.Type != QueryAxisType.Descendant)&& 0 != ((QueryNodeType.Element | QueryNodeType.Root) & this.type))); } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySubExprEliminator.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySubExprEliminator.cs index 40a6970b4..790a61eb0 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySubExprEliminator.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QuerySubExprEliminator.cs @@ -278,8 +278,8 @@ internal void Write(TextWriter outStream) internal class SubExprHeader : SubExpr { - // WS, Microsoft, Can probably combine these - // WS, Microsoft, Make this data structure less ugly (if possible) + // WS, [....], Can probably combine these + // WS, [....], Make this data structure less ugly (if possible) Dictionary>> nameLookup; Dictionary indexLookup; @@ -329,7 +329,7 @@ internal override void EvalSpecial(ProcessingContext context) context.SaveVariable(this.var, context.Processor.ElapsedCount(marker)); } - // WS, Microsoft, see if we can put this array in the processor to save + // WS, [....], see if we can put this array in the processor to save // an allocation. Perhaps we can use the variables slot we're going to fill NodeSequence[] childSequences = new NodeSequence[this.children.Count]; NodeSequence seq = context.Sequences[context.TopSequenceArg.basePtr].Sequence; diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryUtil.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryUtil.cs index 6327b5d0d..6efce98ed 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/QueryUtil.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/QueryUtil.cs @@ -657,7 +657,7 @@ internal void Exchange(T old, T replace) } else { - // PERF, Microsoft, can this be made more efficient? Does it need to be? + // PERF, [....], can this be made more efficient? Does it need to be? Remove(old); Insert(replace); } @@ -704,7 +704,7 @@ void InsertAt(int index, T item) } else if (this.buffer.Length == this.size) { - // PERF, Microsoft, how should we choose a new size? + // PERF, [....], how should we choose a new size? T[] tmp = new T[this.size + 1]; if (index == 0) diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ReplyChannelBinder.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ReplyChannelBinder.cs index 3c15855a7..fc2e8ea3f 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ReplyChannelBinder.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ReplyChannelBinder.cs @@ -50,7 +50,7 @@ public EndpointAddress RemoteAddress { get { -#pragma warning suppress 56503 // Microsoft, the property is really not implemented, cannot lie, API not public +#pragma warning suppress 56503 // [....], the property is really not implemented, cannot lie, API not public throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new NotImplementedException()); } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityImpersonationBehavior.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityImpersonationBehavior.cs index 7832a4aa3..d25cc1457 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityImpersonationBehavior.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityImpersonationBehavior.cs @@ -486,7 +486,7 @@ class WindowsAnonymousIdentity { public IDisposable Impersonate() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The LastWin32Error can be ignored here. IntPtr threadHandle = SafeNativeMethods.GetCurrentThread(); SafeCloseHandle tokenHandle; @@ -527,12 +527,12 @@ public ImpersonationContext(IntPtr threadHandle, SafeCloseHandle tokenHandle) void Undo() { - // PreSharp + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. #pragma warning suppress 56523 // The LastWin32Error can be ignored here. Fx.Assert(this.threadHandle == SafeNativeMethods.GetCurrentThread(), ""); // We are in the Dispose method. If a failure occurs we just have to ignore it. - // PreSharp - + // PreSharp Bug: Call 'Marshal.GetLastWin32Error' or 'Marshal.GetHRForLastWin32Error' before any other interop call. + // #pragma warning suppress 56523 // The LastWin32Error can be ignored here. if (!SafeNativeMethods.SetCurrentThreadToken(IntPtr.Zero, this.tokenHandle)) { int error = Marshal.GetLastWin32Error(); diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityValidationBehavior.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityValidationBehavior.cs index 82a56eaf5..0d0cb0f2c 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityValidationBehavior.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/SecurityValidationBehavior.cs @@ -235,7 +235,7 @@ static public void ValidateSecurityBinding(SecurityBindingElement sbe, Binding b if (sbe is SymmetricSecurityBindingElement || sbe is AsymmetricSecurityBindingElement) { // check to see if we are streaming - // (Microsoft 53690): need to have a general way get the transfer Mode from the binding + // ([....] 53690): need to have a general way get the transfer Mode from the binding // TransferMode transferMode = binding.GetProperty(new BindingParameterCollection()); if (GetTransferMode(binding) != TransferMode.Buffered) { diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/SeekableMessageNavigator.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/SeekableMessageNavigator.cs index 7e37baf4e..9066da02b 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/SeekableMessageNavigator.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/SeekableMessageNavigator.cs @@ -138,7 +138,7 @@ internal SeekableMessageNavigator(Message msg, int countMax, XmlSpace space, boo // The base uri of the element // This is usually associated with the URI of the original data's location - // WS, Microsoft, look into what readers from messages surface. If it's always null, we can save + // WS, [....], look into what readers from messages surface. If it's always null, we can save // some memory public override string BaseURI { @@ -183,7 +183,7 @@ public override long CurrentPosition while (n != p.elem) { - // PERF, Microsoft, we might be able to get rid of this check by tweaking the position + // PERF, [....], we might be able to get rid of this check by tweaking the position // validator if (n == NullIndex) { @@ -779,7 +779,7 @@ public override bool MoveToFirstAttribute() // Move the navigator to the first child of the current node. public override bool MoveToFirstChild() { - // PERF, Microsoft, do we need this check? The null check may be enough + // PERF, [....], do we need this check? The null check may be enough // Only valid for the root or an element node if (this.location == RootIndex || this.dom.nodes[this.location].type == XPathNodeType.Element) { @@ -894,7 +894,7 @@ public override bool MoveToNamespace(string name) n = this.dom.nodes[n].nextSibling; } - // PERF, Microsoft, can we just clear? + // PERF, [....], can we just clear? // We didn't find it, so restore the namespace stack for (int i = 0; i < nsCount; ++i) { @@ -1483,7 +1483,7 @@ Position DecodePosition(long pos) // Get the index of the next namespace that matches the scope // This function populates the namespace stack too - // PERF, Microsoft, see if we can have this function set the current location too + // PERF, [....], see if we can have this function set the current location too int FindNamespace(int parent, int ns, XPathNamespaceScope scope) { bool done = false; @@ -1932,7 +1932,7 @@ int ReadChildNodes(XmlReader reader, int parent, int parentNS) int n = NullIndex; do { - // PERF, Microsoft, reorder cases so more common ones are earlier + // PERF, [....], reorder cases so more common ones are earlier switch (reader.NodeType) { case XmlNodeType.Element: @@ -2118,7 +2118,7 @@ void Increase() } } - // PERF, Microsoft, find a better way to implement and have internal + // PERF, [....], find a better way to implement and have internal void INodeCounter.Increase() { Increase(); diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/ServiceThrottle.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/ServiceThrottle.cs index b7fa15126..1712f11c3 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/ServiceThrottle.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/ServiceThrottle.cs @@ -50,16 +50,23 @@ FlowThrottle Calls { get { - lock (this.ThisLock) + if (this.calls == null) { - if (this.calls == null) + lock (this.ThisLock) { - this.calls = new FlowThrottle(this.GotCall, ServiceThrottle.DefaultMaxConcurrentCallsCpuCount, - ServiceThrottle.MaxConcurrentCallsPropertyName, ServiceThrottle.MaxConcurrentCallsConfigName); - this.calls.SetRatio(this.RatioCallsToken); + if (this.calls == null) + { + FlowThrottle callsFt = new FlowThrottle(this.GotCall, ServiceThrottle.DefaultMaxConcurrentCallsCpuCount, + ServiceThrottle.MaxConcurrentCallsPropertyName, ServiceThrottle.MaxConcurrentCallsConfigName); + + callsFt.SetRatio(this.RatioCallsToken); + + this.calls = callsFt; + } } - return this.calls; } + + return this.calls; } } @@ -67,16 +74,23 @@ FlowThrottle Sessions { get { - lock (this.ThisLock) + if (this.sessions == null) { - if (this.sessions == null) + lock (this.ThisLock) { - this.sessions = new FlowThrottle(this.GotSession, ServiceThrottle.DefaultMaxConcurrentSessionsCpuCount, - ServiceThrottle.MaxConcurrentSessionsPropertyName, ServiceThrottle.MaxConcurrentSessionsConfigName); - this.sessions.SetRatio(this.RatioSessionsToken); + if (this.sessions == null) + { + FlowThrottle sessionsFt = new FlowThrottle(this.GotSession, ServiceThrottle.DefaultMaxConcurrentSessionsCpuCount, + ServiceThrottle.MaxConcurrentSessionsPropertyName, ServiceThrottle.MaxConcurrentSessionsConfigName); + + sessionsFt.SetRatio(this.RatioSessionsToken); + + this.sessions = sessionsFt; + } } - return this.sessions; } + + return this.sessions; } } @@ -84,16 +98,22 @@ QuotaThrottle Dynamic { get { - lock (this.ThisLock) + if (this.dynamic == null) { - if (this.dynamic == null) + lock (this.ThisLock) { - this.dynamic = new QuotaThrottle(this.GotDynamic, new object()); - this.dynamic.Owner = "ServiceHost"; + if (this.dynamic == null) + { + QuotaThrottle dynamicQt = new QuotaThrottle(this.GotDynamic, new object()); + dynamicQt.Owner = "ServiceHost"; + + this.dynamic = dynamicQt; + } } - this.UpdateIsActive(); - return this.dynamic; } + + this.UpdateIsActive(); + return this.dynamic; } } @@ -158,20 +178,27 @@ FlowThrottle InstanceContexts { get { - lock (this.ThisLock) + if (this.instanceContexts == null) { - if (this.instanceContexts == null) + lock (this.ThisLock) { - this.instanceContexts = new FlowThrottle(this.GotInstanceContext, Int32.MaxValue, - ServiceThrottle.MaxConcurrentInstancesPropertyName, ServiceThrottle.MaxConcurrentInstancesConfigName); - this.instanceContexts.SetRatio(this.RatioInstancesToken); - if (this.servicePerformanceCounters != null) + if (this.instanceContexts == null) { - InitializeInstancePerfCounterSettings(); + FlowThrottle instanceContextsFt = new FlowThrottle(this.GotInstanceContext, Int32.MaxValue, + ServiceThrottle.MaxConcurrentInstancesPropertyName, ServiceThrottle.MaxConcurrentInstancesConfigName); + instanceContextsFt.SetRatio(this.RatioInstancesToken); + + if (this.servicePerformanceCounters != null) + { + InitializeInstancePerfCounterSettings(instanceContextsFt); + } + + this.instanceContexts = instanceContextsFt; } } - return this.instanceContexts; } + + return this.instanceContexts; } } @@ -191,7 +218,7 @@ internal void SetServicePerformanceCounters(ServicePerformanceCountersBase count //instance throttle is created through the behavior, set the perf counter callbacks if initialized if (this.instanceContexts != null) { - InitializeInstancePerfCounterSettings(); + InitializeInstancePerfCounterSettings(this.instanceContexts); } //this.calls and this.sessions throttles are created by the constructor. Set the perf counter callbacks @@ -199,14 +226,14 @@ internal void SetServicePerformanceCounters(ServicePerformanceCountersBase count InitializeSessionsPerfCounterSettings(); } - void InitializeInstancePerfCounterSettings() + void InitializeInstancePerfCounterSettings(FlowThrottle instanceContextsFt) { - Fx.Assert(this.instanceContexts != null, "Expect instanceContext to be initialized"); + Fx.Assert(instanceContextsFt != null, "Expect instanceContext to be initialized"); Fx.Assert(this.servicePerformanceCounters != null, "expect servicePerformanceCounters to be set"); - this.instanceContexts.SetAcquired(this.AcquiredInstancesToken); - this.instanceContexts.SetReleased(this.ReleasedInstancesToken); - this.instanceContexts.SetRatio(this.RatioInstancesToken); - this.servicePerformanceCounters.SetThrottleBase((int)ServicePerformanceCounters.PerfCounters.InstancesPercentMaxInstancesBase, this.instanceContexts.Capacity); + instanceContextsFt.SetAcquired(this.AcquiredInstancesToken); + instanceContextsFt.SetReleased(this.ReleasedInstancesToken); + instanceContextsFt.SetRatio(this.RatioInstancesToken); + this.servicePerformanceCounters.SetThrottleBase((int)ServicePerformanceCounters.PerfCounters.InstancesPercentMaxInstancesBase, instanceContextsFt.Capacity); } void InitializeCallsPerfCounterSettings() diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/StreamFormatter.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/StreamFormatter.cs index 37c3276d2..a11a8f82e 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/StreamFormatter.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/StreamFormatter.cs @@ -332,7 +332,7 @@ public override long Length { get { -#pragma warning suppress 56503 // Microsoft, not a seekable stream, it is ok to throw NotSupported in this case +#pragma warning suppress 56503 // [....], not a seekable stream, it is ok to throw NotSupported in this case throw TraceUtility.ThrowHelperError(new NotSupportedException(), this.message); } } diff --git a/System.ServiceModel/System/ServiceModel/Dispatcher/XPathMessageContext.cs b/System.ServiceModel/System/ServiceModel/Dispatcher/XPathMessageContext.cs index 9a9aee04f..1222eb30b 100644 --- a/System.ServiceModel/System/ServiceModel/Dispatcher/XPathMessageContext.cs +++ b/System.ServiceModel/System/ServiceModel/Dispatcher/XPathMessageContext.cs @@ -162,7 +162,7 @@ public override IXsltContextFunction ResolveFunction(string prefix, string name, if (argTypes == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("argTypes"); - // PERF, Microsoft, factor ns if all same + // PERF, [....], factor ns if all same string ns = LookupNamespace(prefix); for (int i = 0; i < functions.Length; ++i) { @@ -1254,7 +1254,7 @@ internal override void InvokeInternal(ProcessingContext context, int argCount) { do { - // PERF, Microsoft, this will be faster if I cache the envelope namespace to do the + // PERF, [....], this will be faster if I cache the envelope namespace to do the // actor lookup by hand long pos = nav.CurrentPosition; string navActor = XPathMessageFunctionActor.ExtractFromNavigator(nav); @@ -1283,9 +1283,9 @@ public override object Invoke(XsltContext xsltContext, object[] args, XPathNavig return docContext.Evaluate(expr); #if NO - // PERF, Microsoft, I drafted this implementation before we found out that a - - + // PERF, [....], I drafted this implementation before we found out that a bug in the Fx implementation would + // prevent us from constructing an XPathNodeIterator that they would accept. I'm keeping it + // around in the hope that I will be able to use it by M5.4. If not, it will be deleted. XPathNavigator basicNav = docContext.Clone(); SeekableXPathNavigator nav = basicNav as SeekableXPathNavigator; diff --git a/System.ServiceModel/System/ServiceModel/DnsEndpointIdentity.cs b/System.ServiceModel/System/ServiceModel/DnsEndpointIdentity.cs index 4ce51214c..2b2991a14 100644 --- a/System.ServiceModel/System/ServiceModel/DnsEndpointIdentity.cs +++ b/System.ServiceModel/System/ServiceModel/DnsEndpointIdentity.cs @@ -25,7 +25,7 @@ public DnsEndpointIdentity(Claim identity) if (identity == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("identity"); - // PreSharp + // PreSharp Bug: Parameter 'identity.ResourceType' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // Claim.ClaimType will never return null if (!identity.ClaimType.Equals(ClaimTypes.Dns)) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(SR.GetString(SR.UnrecognizedClaimTypeForIdentity, identity.ClaimType, ClaimTypes.Dns)); diff --git a/System.ServiceModel/System/ServiceModel/EndpointAddress.cs b/System.ServiceModel/System/ServiceModel/EndpointAddress.cs index dd22acb14..26583d152 100644 --- a/System.ServiceModel/System/ServiceModel/EndpointAddress.cs +++ b/System.ServiceModel/System/ServiceModel/EndpointAddress.cs @@ -342,7 +342,7 @@ public void ApplyTo(Message message) // NOTE: UserInfo, Query, and Fragment are ignored when comparing Uris as addresses // this is the WCF logic for comparing Uris that represent addresses - // this method must be kept in sync with UriGetHashCode + // this method must be kept in [....] with UriGetHashCode internal static bool UriEquals(Uri u1, Uri u2, bool ignoreCase, bool includeHostInComparison) { return UriEquals(u1, u2, ignoreCase, includeHostInComparison, true); @@ -393,7 +393,7 @@ internal static bool UriEquals(Uri u1, Uri u2, bool ignoreCase, bool includeHost return string.Compare(u1Path, 0, u2Path, 0, u1Len, ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal) == 0; } - // this method must be kept in sync with UriEquals + // this method must be kept in [....] with UriEquals internal static int UriGetHashCode(Uri uri, bool includeHostInComparison) { return UriGetHashCode(uri, includeHostInComparison, true); diff --git a/System.ServiceModel/System/ServiceModel/EndpointIdentity.cs b/System.ServiceModel/System/ServiceModel/EndpointIdentity.cs index c8f69446d..59cbd6c25 100644 --- a/System.ServiceModel/System/ServiceModel/EndpointIdentity.cs +++ b/System.ServiceModel/System/ServiceModel/EndpointIdentity.cs @@ -69,7 +69,7 @@ public static EndpointIdentity CreateIdentity(Claim identity) if (identity == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("identity"); - // PreSharp + // PreSharp Bug: Parameter 'identity.ClaimType' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // Claim.ClaimType will never return null if (identity.ClaimType.Equals(ClaimTypes.Dns)) { diff --git a/System.ServiceModel/System/ServiceModel/FaultReason.cs b/System.ServiceModel/System/ServiceModel/FaultReason.cs index 409b9c824..cbac59f62 100644 --- a/System.ServiceModel/System/ServiceModel/FaultReason.cs +++ b/System.ServiceModel/System/ServiceModel/FaultReason.cs @@ -72,7 +72,7 @@ public FaultReasonText GetMatchingTranslation() return GetMatchingTranslation(CultureInfo.CurrentCulture); } - // Microsoft, This function should always return a translation so that a fault can be surfaced. + // [....], This function should always return a translation so that a fault can be surfaced. public FaultReasonText GetMatchingTranslation(CultureInfo cultureInfo) { if (cultureInfo == null) diff --git a/System.ServiceModel/System/ServiceModel/LocalAppContextSwitches.cs b/System.ServiceModel/System/ServiceModel/LocalAppContextSwitches.cs index 76196d799..616b1fedd 100644 --- a/System.ServiceModel/System/ServiceModel/LocalAppContextSwitches.cs +++ b/System.ServiceModel/System/ServiceModel/LocalAppContextSwitches.cs @@ -13,7 +13,10 @@ namespace System.ServiceModel internal static class LocalAppContextSwitches { private const string DisableExplicitConnectionCloseHeaderString = "Switch.System.ServiceModel.DisableExplicitConnectionCloseHeader"; + private const string AllowUnsignedToHeaderString = "Switch.System.ServiceModel.AllowUnsignedToHeader"; + private static int disableExplicitConnectionCloseHeader; + private static int allowUnsignedToHeader; public static bool DisableExplicitConnectionCloseHeader { @@ -24,6 +27,15 @@ public static bool DisableExplicitConnectionCloseHeader } } + public static bool AllowUnsignedToHeader + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + return LocalAppContext.GetCachedSwitchValue(AllowUnsignedToHeaderString, ref allowUnsignedToHeader); + } + } + public static void SetDefaultsLessOrEqual_452() { // Define the switches that should be true for 4.5.2 or less, false for 4.6+. diff --git a/System.ServiceModel/System/ServiceModel/RsaEndpointIdentity.cs b/System.ServiceModel/System/ServiceModel/RsaEndpointIdentity.cs index d1e3619be..b0c64e3ce 100644 --- a/System.ServiceModel/System/ServiceModel/RsaEndpointIdentity.cs +++ b/System.ServiceModel/System/ServiceModel/RsaEndpointIdentity.cs @@ -41,7 +41,7 @@ public RsaEndpointIdentity(Claim identity) if (identity == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("identity"); - // PreSharp + // PreSharp Bug: Parameter 'identity.ClaimType' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // Claim.ClaimType will never return null if (!identity.ClaimType.Equals(ClaimTypes.Rsa)) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(SR.GetString(SR.UnrecognizedClaimTypeForIdentity, identity.ClaimType, ClaimTypes.Rsa)); diff --git a/System.ServiceModel/System/ServiceModel/Security/CryptoHelper.cs b/System.ServiceModel/System/ServiceModel/Security/CryptoHelper.cs index 415a96411..ff0d508ec 100644 --- a/System.ServiceModel/System/ServiceModel/Security/CryptoHelper.cs +++ b/System.ServiceModel/System/ServiceModel/Security/CryptoHelper.cs @@ -178,7 +178,7 @@ static CryptoAlgorithmType GetAlgorithmType(string algorithm) catch (InvalidOperationException) { algorithmObject = null; - // We swallow the exception and continue. + // We ---- the exception and continue. } if (algorithmObject != null) { @@ -281,7 +281,7 @@ internal static bool IsSymmetricSupportedAlgorithm(string algorithm, int keySize catch (InvalidOperationException) { algorithmObject = null; - // We swallow the exception and continue. + // We ---- the exception and continue. } if (algorithmObject != null) { diff --git a/System.ServiceModel/System/ServiceModel/Security/FederatedSecurityTokenManager.cs b/System.ServiceModel/System/ServiceModel/Security/FederatedSecurityTokenManager.cs index 4cd988b21..734d4d219 100644 --- a/System.ServiceModel/System/ServiceModel/Security/FederatedSecurityTokenManager.cs +++ b/System.ServiceModel/System/ServiceModel/Security/FederatedSecurityTokenManager.cs @@ -439,9 +439,9 @@ SecurityTokenResolver GetDefaultOutOfBandTokenResolver() return _defaultTokenResolver; } /// - /// There is a - - + /// There is a bug in WCF where the version obtained from the public SecurityTokenVersion strings is wrong. + /// The internal MessageSecurityTokenVersion has the right version. + /// internal static SecurityVersion GetSecurityVersion( SecurityTokenVersion tokenVersion ) { if ( tokenVersion == null ) @@ -450,11 +450,11 @@ internal static SecurityVersion GetSecurityVersion( SecurityTokenVersion tokenVe } // - // Workaround for WCF - - - - + // Workaround for WCF bug. + // In .NET 3.5 WCF returns the wrong Token Specification. We need to reflect on the + // internal code so we can access the SecurityVersion directly instead of depending + // on the security specification. + // if ( tokenVersion is MessageSecurityTokenVersion ) { SecurityVersion sv = ( tokenVersion as MessageSecurityTokenVersion ).SecurityVersion; diff --git a/System.ServiceModel/System/ServiceModel/Security/RequestSecurityToken.cs b/System.ServiceModel/System/ServiceModel/Security/RequestSecurityToken.cs index a4a35f7d8..846bfee75 100644 --- a/System.ServiceModel/System/ServiceModel/Security/RequestSecurityToken.cs +++ b/System.ServiceModel/System/ServiceModel/Security/RequestSecurityToken.cs @@ -254,7 +254,7 @@ public IEnumerable RequestProperties { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "RequestProperties"))); } @@ -334,7 +334,7 @@ public XmlElement RequestSecurityTokenXml { if (!this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemAvailableInDeserializedRSTOnly, "RequestSecurityTokenXml"))); } @@ -374,7 +374,7 @@ internal object AppliesTo { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesTo"))); } @@ -388,7 +388,7 @@ internal DataContractSerializer AppliesToSerializer { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesToSerializer"))); } @@ -402,7 +402,7 @@ internal Type AppliesToType { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesToType"))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/RequestSecurityTokenResponse.cs b/System.ServiceModel/System/ServiceModel/Security/RequestSecurityTokenResponse.cs index 0cfa08302..c84607d94 100644 --- a/System.ServiceModel/System/ServiceModel/Security/RequestSecurityTokenResponse.cs +++ b/System.ServiceModel/System/ServiceModel/Security/RequestSecurityTokenResponse.cs @@ -334,7 +334,7 @@ public SecurityToken EntropyToken { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRSTR, "EntropyToken"))); } @@ -348,7 +348,7 @@ public SecurityToken RequestedSecurityToken { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRSTR, "IssuedToken"))); } @@ -368,7 +368,7 @@ public SecurityToken RequestedProofToken { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRSTR, "ProofToken"))); } @@ -388,7 +388,7 @@ public XmlElement RequestSecurityTokenResponseXml { if (!this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemAvailableInDeserializedRSTROnly, "RequestSecurityTokenXml"))); } @@ -402,7 +402,7 @@ internal object AppliesTo { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesTo"))); } @@ -416,7 +416,7 @@ internal XmlObjectSerializer AppliesToSerializer { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesToSerializer"))); } @@ -430,7 +430,7 @@ internal Type AppliesToType { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRST, "AppliesToType"))); } @@ -444,7 +444,7 @@ internal bool IsLifetimeSet { if (this.isReceiver) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ItemNotAvailableInDeserializedRSTR, "IsLifetimeSet"))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/SctClaimSerializer.cs b/System.ServiceModel/System/ServiceModel/Security/SctClaimSerializer.cs index d957ab822..1ab82412c 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SctClaimSerializer.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SctClaimSerializer.cs @@ -428,7 +428,7 @@ static void SerializePrimaryIdentity(IIdentity identity, SctClaimDictionary dict writer.WriteStartElement(dictionary.WindowsSidIdentity, dictionary.EmptyString); WriteSidAttribute(wid.User, dictionary, writer); - // This is to work around WOW64 + // This is to work around WOW64 bug Windows OS 1491447 string authenticationType = null; using (WindowsIdentity self = WindowsIdentity.GetCurrent()) { diff --git a/System.ServiceModel/System/ServiceModel/Security/SecureConversationDriver.cs b/System.ServiceModel/System/ServiceModel/Security/SecureConversationDriver.cs index 68a726952..a3145e57e 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SecureConversationDriver.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SecureConversationDriver.cs @@ -21,7 +21,7 @@ public virtual XmlDictionaryString CloseAction { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SecureConversationDriverVersionDoesNotSupportSession))); } @@ -31,7 +31,7 @@ public virtual XmlDictionaryString CloseResponseAction { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SecureConversationDriverVersionDoesNotSupportSession))); } @@ -53,7 +53,7 @@ public virtual XmlDictionaryString RenewAction { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SecureConversationDriverVersionDoesNotSupportSession))); } @@ -63,7 +63,7 @@ public virtual XmlDictionaryString RenewResponseAction { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.SecureConversationDriverVersionDoesNotSupportSession))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/SecuritySessionClientSettings.cs b/System.ServiceModel/System/ServiceModel/Security/SecuritySessionClientSettings.cs index 946bb4022..e74c94855 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SecuritySessionClientSettings.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SecuritySessionClientSettings.cs @@ -2758,7 +2758,7 @@ public string Id { if (this.sessionId == null) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.ChannelMustBeOpenedToGetSessionId))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/SecuritySessionSecurityTokenProvider.cs b/System.ServiceModel/System/ServiceModel/Security/SecuritySessionSecurityTokenProvider.cs index 4f2357a44..175f07c58 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SecuritySessionSecurityTokenProvider.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SecuritySessionSecurityTokenProvider.cs @@ -865,9 +865,9 @@ public SessionOperationAsyncResult(SecuritySessionSecurityTokenProvider requesto /* * Session issuance/renewal consists of the following steps (some may be async): - * 1. Create a channel (sync) + * 1. Create a channel ([....]) * 2. Open the channel (async) - * 3. Create the request to send to server (sync) + * 3. Create the request to send to server ([....]) * 4. Send the message and get reply (async) * 5. Process the reply to get the token * 6. Close the channel (async) and complete the async result diff --git a/System.ServiceModel/System/ServiceModel/Security/SecurityUtils.cs b/System.ServiceModel/System/ServiceModel/Security/SecurityUtils.cs index 7047365f9..913840d03 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SecurityUtils.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SecurityUtils.cs @@ -284,7 +284,7 @@ static class SecurityUtils volatile static bool isSslValidationRequirementDetermined = false; static readonly int MinimumSslCipherStrength = 128; - // these are kept in sync with IIS70 + // these are kept in [....] with IIS70 public const string AuthTypeNTLM = "NTLM"; public const string AuthTypeNegotiate = "Negotiate"; public const string AuthTypeKerberos = "Kerberos"; @@ -1401,7 +1401,7 @@ internal static void ErasePasswordInUsernameTokenIfPresent(SecurityMessageProper } } - // work-around to Windows SE + // work-around to Windows SE Bug 141614 [Fx.Tag.SecurityNote(Critical = "Uses unsafe critical method UnsafeGetPassword to access the credential password without a Demand.", Safe = "Only uses the password to construct a cloned NetworkCredential instance, does not leak password value.")] [SecuritySafeCritical] @@ -1435,7 +1435,7 @@ internal static void FixNetworkCredential(ref NetworkCredential credential) } } - // WORKAROUND, Microsoft, VSWhidbey 561276: The first NetworkCredential must be created in a lock. + // WORKAROUND, [....], VSWhidbey 561276: The first NetworkCredential must be created in a lock. internal static void PrepareNetworkCredential() { if (dummyNetworkCredential == null) @@ -1655,7 +1655,7 @@ static void OnOpen(IAsyncResult result) { thisPtr.communicationObject.EndOpen(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -1730,7 +1730,7 @@ static void OnClose(IAsyncResult result) { thisPtr.communicationObject.EndClose(result); } -#pragma warning suppress 56500 // Microsoft, transferring exception to another thread +#pragma warning suppress 56500 // [....], transferring exception to another thread catch (Exception e) { if (Fx.IsFatal(e)) @@ -2179,7 +2179,7 @@ public static bool TryCreateKeyFromIntrinsicKeyClause(SecurityKeyIdentifierClaus if (keyIdentifierClause is EncryptedKeyIdentifierClause) { EncryptedKeyIdentifierClause keyClause = (EncryptedKeyIdentifierClause)keyIdentifierClause; - // PreSharp + // PreSharp Bug: Parameter 'keyClause' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // keyClause will not be null due to the if condition above. for (int i = 0; i < keyClause.EncryptingKeyIdentifier.Count; i++) { diff --git a/System.ServiceModel/System/ServiceModel/Security/SecurityVerifiedMessage.cs b/System.ServiceModel/System/ServiceModel/Security/SecurityVerifiedMessage.cs index b8af32e48..99658e3d2 100644 --- a/System.ServiceModel/System/ServiceModel/Security/SecurityVerifiedMessage.cs +++ b/System.ServiceModel/System/ServiceModel/Security/SecurityVerifiedMessage.cs @@ -70,7 +70,7 @@ public override bool IsEmpty { if (this.IsDisposed) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); } @@ -91,7 +91,7 @@ public override bool IsFault { if (this.IsDisposed) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw TraceUtility.ThrowHelperError(CreateMessageDisposedException(), this); } diff --git a/System.ServiceModel/System/ServiceModel/Security/TlsSspiNegotiation.cs b/System.ServiceModel/System/ServiceModel/Security/TlsSspiNegotiation.cs index 77a3dde3f..0032edc9e 100644 --- a/System.ServiceModel/System/ServiceModel/Security/TlsSspiNegotiation.cs +++ b/System.ServiceModel/System/ServiceModel/Security/TlsSspiNegotiation.cs @@ -210,7 +210,7 @@ public X509Certificate2 RemoteCertificate ThrowIfDisposed(); if (!IsValidContext) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new Win32Exception((int)SecurityStatus.InvalidHandle)); } @@ -229,7 +229,7 @@ public X509Certificate2Collection RemoteCertificateChain ThrowIfDisposed(); if (!IsValidContext) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new Win32Exception((int)SecurityStatus.InvalidHandle)); } @@ -269,7 +269,7 @@ internal SslConnectionInfo ConnectionInfo ThrowIfDisposed(); if (!IsValidContext) { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new Win32Exception((int)SecurityStatus.InvalidHandle)); } diff --git a/System.ServiceModel/System/ServiceModel/Security/TrustDriver.cs b/System.ServiceModel/System/ServiceModel/Security/TrustDriver.cs index 7088b26b8..e052b20da 100644 --- a/System.ServiceModel/System/ServiceModel/Security/TrustDriver.cs +++ b/System.ServiceModel/System/ServiceModel/Security/TrustDriver.cs @@ -38,7 +38,7 @@ public virtual string IssuedTokensHeaderName { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.TrustDriverVersionDoesNotSupportIssuedTokens))); } @@ -49,7 +49,7 @@ public virtual string IssuedTokensHeaderNamespace { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.TrustDriverVersionDoesNotSupportIssuedTokens))); } @@ -75,7 +75,7 @@ public virtual string RequestTypeClose { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.TrustDriverVersionDoesNotSupportSession))); } @@ -88,7 +88,7 @@ public virtual string RequestTypeRenew { get { - // PreSharp + // PreSharp Bug: Property get methods should not throw exceptions. #pragma warning suppress 56503 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new InvalidOperationException(SR.GetString(SR.TrustDriverVersionDoesNotSupportSession))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/WSSecurityOneDotZeroReceiveSecurityHeader.cs b/System.ServiceModel/System/ServiceModel/Security/WSSecurityOneDotZeroReceiveSecurityHeader.cs index ee27b7d35..fdf3f0ce6 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSSecurityOneDotZeroReceiveSecurityHeader.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSSecurityOneDotZeroReceiveSecurityHeader.cs @@ -222,7 +222,7 @@ protected override void ExecuteMessageProtectionPass(bool hasAtLeastOneSupportin } if (!isHeaderEncrypted && reader.IsStartElement(SecurityXXX2005Strings.EncryptedHeader, SecurityXXX2005Strings.Namespace)) - { + { XmlDictionaryReader localreader = headers.GetReaderAtHeader(i); localreader.ReadStartElement(SecurityXXX2005Strings.EncryptedHeader, SecurityXXX2005Strings.Namespace); @@ -234,7 +234,7 @@ protected override void ExecuteMessageProtectionPass(bool hasAtLeastOneSupportin { isHeaderEncrypted = true; } - } + } } this.ElementManager.VerifyUniquenessAndSetHeaderId(id, i); @@ -611,9 +611,27 @@ protected override SecurityToken VerifySignature(SignedXml signedXml, bool isPri throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new MessageSecurityException(SR.GetString(SR.TransportSecuredMessageMissingToHeader))); XmlDictionaryReader toHeaderReader = this.Message.Headers.GetReaderAtHeader(headerIndex); id = toHeaderReader.GetAttribute(XD.UtilityDictionary.IdAttribute, XD.UtilityDictionary.Namespace); - if (id == null) - throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new MessageSecurityException(SR.GetString(SR.UnsignedToHeaderInTransportSecuredMessage))); - signedXml.EnsureDigestValidity(id, toHeaderReader); + + // DevDiv:938534 - We added a flag that allow unsigned headers. If this is set, we do not throw an Exception but move on to CompleteSignatureVerification() + if (LocalAppContextSwitches.AllowUnsignedToHeader) + { + // The lack of an id indicates that the sender did not wish to sign the header. We can safely assume that null indicates this header is not signed. + // If id is not null, then we need to validate the Digest and ensure signature is valid. The exception is thrown deeper in the System.IdentityModel stack. + if (id != null) + { + signedXml.EnsureDigestValidityIfIdMatches(id, toHeaderReader); + } + } + else + { + // default behavior for all platforms + if (id == null) + { + // + throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new MessageSecurityException(SR.GetString(SR.UnsignedToHeaderInTransportSecuredMessage))); + } + signedXml.EnsureDigestValidity(id, toHeaderReader); + } } signedXml.CompleteSignatureVerification(); return token; @@ -692,7 +710,7 @@ void ValidateDigestsOfTargetsInSecurityHeader(StandardSignedInfo signedInfo, Sec } } - // This check makes sure that if RequireSignedPrimaryToken is true (ProtectTokens is enabled on sbe) then the incoming message + // This check makes sure that if RequireSignedPrimaryToken is true (ProtectTokens is enabled on sbe) then the incoming message // should have the primary signature over the primary(signing)token. if (isPrimarySignature && this.RequireSignedPrimaryToken && !this.ElementManager.IsPrimaryTokenSigned) { diff --git a/System.ServiceModel/System/ServiceModel/Security/WSSecurityPolicy.cs b/System.ServiceModel/System/ServiceModel/Security/WSSecurityPolicy.cs index 8b17d6e54..e3d7cf18c 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSSecurityPolicy.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSSecurityPolicy.cs @@ -2923,7 +2923,7 @@ public void ResolveTokenIssuerPolicy(MetadataImporter importer, PolicyConversion return; } WsdlImporter wsdlImporter; - // NOTE: Microsoft, Policy import/export is seperate from WSDL however, this policy importer + // NOTE: [....], Policy import/export is seperate from WSDL however, this policy importer // invokes the WsdlImporter. In the event that the current MetadataImporter is a WsdlImporter, // we should use it's collection of extensions for the import process. Other wise WsdlImporter currentWsdlImporter = importer as WsdlImporter; diff --git a/System.ServiceModel/System/ServiceModel/Security/WSSecurityTokenSerializer.cs b/System.ServiceModel/System/ServiceModel/Security/WSSecurityTokenSerializer.cs index c4cd224b3..85bed0f99 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSSecurityTokenSerializer.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSSecurityTokenSerializer.cs @@ -472,7 +472,7 @@ public virtual SecurityKeyIdentifierClause CreateKeyIdentifierClauseFromTokenXml } } - // PreSharp + // PreSharp Bug: Parameter 'element' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 throw DiagnosticUtility.ExceptionUtility.ThrowHelperError(new XmlException(SR.GetString(SR.CannotReadToken, element.LocalName, element.NamespaceURI, element.GetAttribute(SecurityJan2004Strings.ValueType, null)))); } diff --git a/System.ServiceModel/System/ServiceModel/Security/WSTrust.cs b/System.ServiceModel/System/ServiceModel/Security/WSTrust.cs index 5c6b6d26f..2795cd2b3 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSTrust.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSTrust.cs @@ -1524,7 +1524,7 @@ public override bool TryParseRequiredClaimsElement(XmlElement element, out Syste foreach (XmlNode node in element.ChildNodes) if (node is XmlElement) { - // PreSharp + // PreSharp Bug: Parameter 'requiredClaims' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 requiredClaims.Add((XmlElement)node); } diff --git a/System.ServiceModel/System/ServiceModel/Security/WSTrustFeb2005.cs b/System.ServiceModel/System/ServiceModel/Security/WSTrustFeb2005.cs index e0d19660f..e098f79e1 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSTrustFeb2005.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSTrustFeb2005.cs @@ -282,7 +282,7 @@ public void ApplyDispatchBehavior(ServiceEndpoint serviceEndpoint, EndpointDispa public void ApplyClientBehavior(ServiceEndpoint serviceEndpoint, ClientRuntime behavior) { // it is very unlikely that InteractiveChannelInitializers will be null, this is defensive in case ClientRuntime every has a - // + // bug. I am OK with this as ApplyingClientBehavior is a one-time channel setup. if (behavior != null && behavior.InteractiveChannelInitializers != null) { // clear away any interactive initializer diff --git a/System.ServiceModel/System/ServiceModel/Security/WSTrustServiceContract.cs b/System.ServiceModel/System/ServiceModel/Security/WSTrustServiceContract.cs index 5561ded58..81df58a30 100644 --- a/System.ServiceModel/System/ServiceModel/Security/WSTrustServiceContract.cs +++ b/System.ServiceModel/System/ServiceModel/Security/WSTrustServiceContract.cs @@ -1351,7 +1351,7 @@ public Message EndTrustFeb2005ValidateResponse(IAsyncResult ar) internal class ProcessCoreAsyncResult : AsyncResult { // - // Encapsulate the local variables in the sync version of ProcessCore as fields. + // Encapsulate the local variables in the [....] version of ProcessCore as fields. // WSTrustServiceContract _trustServiceContract; DispatchContext _dispatchContext; diff --git a/System.ServiceModel/System/ServiceModel/SpnEndpointIdentity.cs b/System.ServiceModel/System/ServiceModel/SpnEndpointIdentity.cs index 2e20f2954..12a1e0289 100644 --- a/System.ServiceModel/System/ServiceModel/SpnEndpointIdentity.cs +++ b/System.ServiceModel/System/ServiceModel/SpnEndpointIdentity.cs @@ -60,7 +60,7 @@ public SpnEndpointIdentity(Claim identity) if (identity == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("identity"); - // PreSharp + // PreSharp Bug: Parameter 'identity.ResourceType' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // Claim.ClaimType will never return null if (!identity.ClaimType.Equals(ClaimTypes.Spn)) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(SR.GetString(SR.UnrecognizedClaimTypeForIdentity, identity.ClaimType, ClaimTypes.Spn)); diff --git a/System.ServiceModel/System/ServiceModel/Syndication/Rss20FeedFormatter.cs b/System.ServiceModel/System/ServiceModel/Syndication/Rss20FeedFormatter.cs index a7bfdc2a4..a417e2b9d 100644 --- a/System.ServiceModel/System/ServiceModel/Syndication/Rss20FeedFormatter.cs +++ b/System.ServiceModel/System/ServiceModel/Syndication/Rss20FeedFormatter.cs @@ -1124,7 +1124,7 @@ void WriteFeed(XmlWriter writer) // if there's a single author with an email address, then serialize as the managingEditor // else serialize the authors as Atom extensions -#pragma warning disable 56506 // Microsoft: this.Feed.Authors is never null +#pragma warning disable 56506 // [....]: this.Feed.Authors is never null if ((this.Feed.Authors.Count == 1) && (this.Feed.Authors[0].Email != null)) #pragma warning restore 56506 { @@ -1149,7 +1149,7 @@ void WriteFeed(XmlWriter writer) writer.WriteEndElement(); } -#pragma warning disable 56506 // Microsoft: this.Feed.Categories is never null +#pragma warning disable 56506 // [....]: this.Feed.Categories is never null for (int i = 0; i < this.Feed.Categories.Count; ++i) #pragma warning restore 56506 { @@ -1161,7 +1161,7 @@ void WriteFeed(XmlWriter writer) writer.WriteElementString(Rss20Constants.GeneratorTag, this.Feed.Generator); } -#pragma warning disable 56506 // Microsoft: this.Feed.Contributors is never null +#pragma warning disable 56506 // [....]: this.Feed.Contributors is never null if (this.Feed.Contributors.Count > 0) #pragma warning restore 56506 { @@ -1263,7 +1263,7 @@ void WriteItemContents(XmlWriter writer, SyndicationItem item, Uri feedBaseUri) WriteAlternateLink(writer, firstAlternateLink, (item.BaseUri != null ? item.BaseUri : feedBaseUri)); } -#pragma warning disable 56506 // Microsoft, item.Authors is never null +#pragma warning disable 56506 // [....], item.Authors is never null if (item.Authors.Count == 1 && !string.IsNullOrEmpty(item.Authors[0].Email)) #pragma warning restore 56506 { @@ -1281,7 +1281,7 @@ void WriteItemContents(XmlWriter writer, SyndicationItem item, Uri feedBaseUri) } } -#pragma warning disable 56506 // Microsoft, item.Categories is never null +#pragma warning disable 56506 // [....], item.Categories is never null for (int i = 0; i < item.Categories.Count; ++i) #pragma warning restore 56506 { @@ -1409,7 +1409,7 @@ void WriteItemContents(XmlWriter writer, SyndicationItem item, Uri feedBaseUri) } } -#pragma warning disable 56506 // Microsoft, item.COntributors is never null +#pragma warning disable 56506 // [....], item.COntributors is never null if (item.Contributors.Count > 0) #pragma warning restore 56506 { diff --git a/System.ServiceModel/System/ServiceModel/Transactions/WsatTransactionFormatter.cs b/System.ServiceModel/System/ServiceModel/Transactions/WsatTransactionFormatter.cs index a70a32467..737d71575 100644 --- a/System.ServiceModel/System/ServiceModel/Transactions/WsatTransactionFormatter.cs +++ b/System.ServiceModel/System/ServiceModel/Transactions/WsatTransactionFormatter.cs @@ -71,10 +71,10 @@ public override void WriteTransaction(Transaction transaction, Message message) void ForcePromotion(Transaction transaction) { // Force promotion. This may throw TransactionException. - // We used to check the DistributedIdentifier property first, but VSWhidbey - - - + // We used to check the DistributedIdentifier property first, but VSWhidbey bug 547901 + // prevents us from doing so reliably in multi-threaded scenarios (there is a ---- + // in the System.Transactions code that can cause a NullReferenceException if we ask + // for the identifier while the transaction is being promoted) TransactionInterop.GetTransmitterPropagationToken(transaction); } diff --git a/System.ServiceModel/System/ServiceModel/UpnEndpointIdentity.cs b/System.ServiceModel/System/ServiceModel/UpnEndpointIdentity.cs index 5ea26cb17..ee6af2c46 100644 --- a/System.ServiceModel/System/ServiceModel/UpnEndpointIdentity.cs +++ b/System.ServiceModel/System/ServiceModel/UpnEndpointIdentity.cs @@ -38,7 +38,7 @@ public UpnEndpointIdentity(Claim identity) if (identity == null) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgumentNull("identity"); - // PreSharp + // PreSharp Bug: Parameter 'identity.ResourceType' to this public method must be validated: A null-dereference can occur here. #pragma warning suppress 56506 // Claim.ResourceType will never return null if (!identity.ClaimType.Equals(ClaimTypes.Upn)) throw DiagnosticUtility.ExceptionUtility.ThrowHelperArgument(SR.GetString(SR.UnrecognizedClaimTypeForIdentity, identity.ClaimType, ClaimTypes.Upn)); @@ -80,7 +80,11 @@ string GetUpnFromWindowsIdentity(WindowsIdentity windowsIdentity) try { downlevelName = windowsIdentity.Name; - upnName = GetUpnFromDownlevelName(downlevelName); + + if (this.IsMachineJoinedToDomain()) + { + upnName = GetUpnFromDownlevelName(downlevelName); + } } #pragma warning suppress 56500 // covered by FxCOP catch (Exception e) @@ -89,13 +93,34 @@ string GetUpnFromWindowsIdentity(WindowsIdentity windowsIdentity) { throw; } + DiagnosticUtility.TraceHandledException(e, TraceEventType.Warning); } + // if the AD cannot be queried for the fully qualified domain name, // fall back to the downlevel UPN name return upnName ?? downlevelName; } + bool IsMachineJoinedToDomain() + { + IntPtr pDomainControllerInfo = IntPtr.Zero; + + try + { + int result = SafeNativeMethods.DsGetDcName(null, null, IntPtr.Zero, null, (uint)DSFlags.DS_DIRECTORY_SERVICE_REQUIRED, out pDomainControllerInfo); + + return result != (int)Win32Error.ERROR_NO_SUCH_DOMAIN; + } + finally + { + if (pDomainControllerInfo != IntPtr.Zero) + { + SafeNativeMethods.NetApiBufferFree(pDomainControllerInfo); + } + } + } + // Duplicate code from SecurityImpersonationBehavior string GetUpnFromDownlevelName(string downlevelName) { @@ -108,6 +133,7 @@ string GetUpnFromDownlevelName(string downlevelName) { throw DiagnosticUtility.ExceptionUtility.ThrowHelperWarning(new InvalidOperationException(SR.GetString(SR.DownlevelNameCannotMapToUpn, downlevelName))); } + string shortDomainName = downlevelName.Substring(0, delimiterPos + 1); string userName = downlevelName.Substring(delimiterPos + 1); string fullDomainName; diff --git a/System.Web.DynamicData/DynamicData/DynamicDataExtensions.cs b/System.Web.DynamicData/DynamicData/DynamicDataExtensions.cs index 765abf1c5..d7311de02 100644 --- a/System.Web.DynamicData/DynamicData/DynamicDataExtensions.cs +++ b/System.Web.DynamicData/DynamicData/DynamicDataExtensions.cs @@ -228,7 +228,7 @@ public static Control FindFieldTemplate(this Control control, string columnName) } /// - /// Make the SelectedIndex sync up with the PersistedSelection. Concretely, what it means is that + /// Make the SelectedIndex [....] up with the PersistedSelection. Concretely, what it means is that /// if you select a row and then page away (or sort), the selection remains on that row /// even if it's not currently visible. /// diff --git a/System.Web.DynamicData/DynamicData/DynamicDataManager.cs b/System.Web.DynamicData/DynamicData/DynamicDataManager.cs index 2fcbbceb8..f54d6521c 100644 --- a/System.Web.DynamicData/DynamicData/DynamicDataManager.cs +++ b/System.Web.DynamicData/DynamicData/DynamicDataManager.cs @@ -189,7 +189,7 @@ public void RegisterControl(Control control, bool setSelectionFromUrl) { internal static void EnablePersistedSelection(BaseDataBoundControl baseDataBoundControl, IMetaTable table) { Debug.Assert(baseDataBoundControl != null, "NULL!"); - // Make the persisted selection sync up with the selected index if possible + // Make the persisted selection [....] up with the selected index if possible if (!table.IsReadOnly) { DynamicDataExtensions.EnablePersistedSelectionInternal(baseDataBoundControl); } diff --git a/System.Web.DynamicData/DynamicData/FieldTemplateUserControl.cs b/System.Web.DynamicData/DynamicData/FieldTemplateUserControl.cs index e0f4e82db..33381499e 100644 --- a/System.Web.DynamicData/DynamicData/FieldTemplateUserControl.cs +++ b/System.Web.DynamicData/DynamicData/FieldTemplateUserControl.cs @@ -421,11 +421,11 @@ private void SetUpDynamicValidator(DynamicValidator validator, MetaColumn column private void SetUpRequiredFieldValidator(RequiredFieldValidator validator, MetaColumn column) { var requiredAttribute = column.Metadata.RequiredAttribute; if (requiredAttribute!= null && requiredAttribute.AllowEmptyStrings) { - // Dev10 - - - - + // Dev10 Bug 749744 + // If somone explicitly set AllowEmptyStrings = true then we assume that they want to + // allow empty strings to go into a database even if the column is marked as required. + // Since ASP.NET validators always get an empty string, this essential turns of + // required field validation. IgnoreModelValidationAttribute(typeof(RequiredAttribute)); } else if (column.IsRequired) { validator.Enabled = true; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityConnectionStringBuilderItem.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityConnectionStringBuilderItem.cs index ba73d0268..5598b5c60 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityConnectionStringBuilderItem.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityConnectionStringBuilderItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.EntityClient; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContext.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContext.cs index 24c9e3f49..ceeca3367 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContext.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContext.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Manages the properties that can be set on the first page of the wizard //------------------------------------------------------------------------------ diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.cs index ba12b6454..fae30157a 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.designer.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.designer.cs index d0af6f070..8b78d5d19 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.designer.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceConfigureObjectContextPanel.designer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Windows.Forms; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameConverter.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameConverter.cs index dddf08b8a..b92970d9e 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameConverter.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameConverter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameItem.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameItem.cs index 1a470ab01..561dbabb7 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameItem.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceContainerNameItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Metadata.Edm; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelection.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelection.cs index 95c941121..68ca2a963 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelection.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Manages the properties that can be set on the second page of the wizard //------------------------------------------------------------------------------ diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.cs index 9deff40bb..a2d586e55 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.designer.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.designer.cs index b5854bbb0..e5f044744 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.designer.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDataSelectionPanel.designer.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Windows.Forms; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesigner.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesigner.cs index babe193dc..b630b7594 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesigner.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesigner.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.ComponentModel; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesignerHelper.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesignerHelper.cs index c9369bc43..652acc587 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesignerHelper.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceDesignerHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; @@ -1131,12 +1131,12 @@ private DataTable GetCurrentSchema(bool preferSilent) // the right metadata from the design-time environment EntityDataSource entityDataSource = new EntityDataSource(_entityConnection); - // This is workaround for a - - - - - + // This is workaround for a bug in the SQL CE provider services. SQL CE uses two providers - one is supposed to be used at design time + // while the other one is supposed to be used at runtime. When the Entiy Designer is used in a way that requires to talk to the database + // SQL CE starts returning design time provider. However they don't reset an internal flag and continue to return design time provider even if + // the Entity Designer is not used anymore. Calling GetProviderManifestToken() method will reset the flag according to the provider in the + // connection. This fixes the problem for SQL CE provider without having to special case SQL CE because it will be a no-op for other providers. + // For more details see bug 35675 in DevDiv database http://vstfdevdiv:8080/web/wi.aspx?pcguid=22f9acc9-569a-41ff-b6ac-fac1b6370209&id=35675 DbProviderServices.GetProviderServices(_entityConnection.StoreConnection).GetProviderManifestToken(_entityConnection.StoreConnection); // Copy only the properties that can affect the schema diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameConverter.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameConverter.cs index 59ab452a5..fef0dc95f 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameConverter.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameConverter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameItem.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameItem.cs index e1fcec202..4f522e7e5 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameItem.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntitySetNameItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Metadata.Edm; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterConverter.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterConverter.cs index 9b5f5ed2d..f814d7516 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterConverter.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterConverter.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterItem.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterItem.cs index 271ff0562..d5029c506 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterItem.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceEntityTypeFilterItem.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Data.Metadata.Edm; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceState.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceState.cs index 189826753..d0ab4f9f6 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceState.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceState.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Temporary storage for properties set via the wizard //------------------------------------------------------------------------------ diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditor.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditor.cs index 4d135b889..da4ed87c9 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditor.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.ComponentModel; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditorForm.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditorForm.cs index fd48f29e0..85f30115b 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditorForm.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceStatementEditorForm.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Enables a user to edit CommandText, OrderBy, Select, and // Where properties and parameters diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceWizardForm.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceWizardForm.cs index 83cd536ab..4ae944032 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceWizardForm.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDataSourceWizardForm.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Containing form for the wizard panels //------------------------------------------------------------------------------ diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDesignerDataSourceView.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDesignerDataSourceView.cs index 4e664aa32..2206efbf8 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDesignerDataSourceView.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/EntityDesignerDataSourceView.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System.Collections; using System.Data; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/DesignerForm.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/DesignerForm.cs index 3467d4621..fea3d8fac 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/DesignerForm.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/DesignerForm.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/RTLAwareMessageBox.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/RTLAwareMessageBox.cs index fcd3e820f..25d42e050 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/RTLAwareMessageBox.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/RTLAwareMessageBox.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/ResourceDescriptionAttribute.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/ResourceDescriptionAttribute.cs index f7a25c7ab..d61fc0f3a 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/ResourceDescriptionAttribute.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/ResourceDescriptionAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/TaskFormBase.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/TaskFormBase.cs index 0ca68d843..fbd461cd8 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/TaskFormBase.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/TaskFormBase.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/UIHelper.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/UIHelper.cs index ca925042f..a21300b69 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/UIHelper.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/UIHelper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] // // Helper methods for UI functionality like displaying dialogs //------------------------------------------------------------------------------ diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardForm.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardForm.cs index 371f73057..c8dadbce8 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardForm.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardForm.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanel.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanel.cs index 6aecc439a..4374823c0 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanel.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanel.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanelChangingEventArgs.cs b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanelChangingEventArgs.cs index 4e30056bf..a77f7e065 100644 --- a/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanelChangingEventArgs.cs +++ b/System.Web.Entity.Design/System/Data/WebControls/Design/Util/WizardPanelChangingEventArgs.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSource.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSource.cs index 3114cbef7..f0971e34d 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSource.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSource.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Collections; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangedEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangedEventArgs.cs index b56607912..c3ff8c1e1 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangedEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangedEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangingEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangingEventArgs.cs index c0fbdfb66..c19dbcb82 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangingEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceChangingEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceColumn.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceColumn.cs index 09edc5e62..c89ec893d 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceColumn.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceColumn.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatedEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatedEventArgs.cs index f92ab5ee5..2e639d2c1 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatedEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatedEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatingEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatingEventArgs.cs index d0a9eb119..a39034e81 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatingEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextCreatingEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextDisposingEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextDisposingEventArgs.cs index 913b15800..e53faa0c2 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextDisposingEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceContextDisposingEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceMemberPath.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceMemberPath.cs index c02df2400..a1f0cbc1e 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceMemberPath.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceMemberPath.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceQueryBuilder.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceQueryBuilder.cs index ebca39ae4..21cecb804 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceQueryBuilder.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceQueryBuilder.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Web.UI.WebControls diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceReferenceGroup.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceReferenceGroup.cs index 90033972d..065d0f803 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceReferenceGroup.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceReferenceGroup.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectedEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectedEventArgs.cs index 132dc52f0..1b1f06ab3 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectedEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectedEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectingEventArgs.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectingEventArgs.cs index 781a35ec0..2e5c16561 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectingEventArgs.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceSelectingEventArgs.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- using System; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceUtil.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceUtil.cs index 315148ec4..2560d5e2e 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceUtil.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceUtil.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Collections.Generic; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceValidationException.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceValidationException.cs index f8108d339..6b285402c 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceValidationException.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceValidationException.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceView.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceView.cs index a6f45854e..88460b1e6 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceView.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceView.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System.Collections; using System.Collections.Generic; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceViewSchema.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceViewSchema.cs index dfb3b2515..497db7302 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceViewSchema.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceViewSchema.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- namespace System.Web.UI.WebControls diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapper.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapper.cs index 00219e431..0660a995a 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapper.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapper.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperCollection.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperCollection.cs index 97ac55104..1d8a270c4 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperCollection.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperCollection.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data; diff --git a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperPropertyDescriptor.cs b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperPropertyDescriptor.cs index e66c99544..8cc49ef33 100644 --- a/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperPropertyDescriptor.cs +++ b/System.Web.Entity/System/Data/WebControls/EntityDataSourceWrapperPropertyDescriptor.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //--------------------------------------------------------------------- using System; using System.Data; diff --git a/System.Web.Entity/System/Data/WebControls/ResourceDescriptionAttribute.cs b/System.Web.Entity/System/Data/WebControls/ResourceDescriptionAttribute.cs index 218f1da60..94b2b327e 100644 --- a/System.Web.Entity/System/Data/WebControls/ResourceDescriptionAttribute.cs +++ b/System.Web.Entity/System/Data/WebControls/ResourceDescriptionAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Web.Entity/System/Data/WebControls/ResourceDisplayNameAttribute.cs b/System.Web.Entity/System/Data/WebControls/ResourceDisplayNameAttribute.cs index ece6b3f21..529367d04 100644 --- a/System.Web.Entity/System/Data/WebControls/ResourceDisplayNameAttribute.cs +++ b/System.Web.Entity/System/Data/WebControls/ResourceDisplayNameAttribute.cs @@ -3,8 +3,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft -// @backupOwner Microsoft +// @owner [....] +// @backupOwner [....] //------------------------------------------------------------------------------ using System; using System.ComponentModel; diff --git a/System.Web.Entity/System/Data/WebControls/WebControlParameterProxy.cs b/System.Web.Entity/System/Data/WebControls/WebControlParameterProxy.cs index cd03f842f..1df13685d 100644 --- a/System.Web.Entity/System/Data/WebControls/WebControlParameterProxy.cs +++ b/System.Web.Entity/System/Data/WebControls/WebControlParameterProxy.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// @owner Microsoft +// @owner [....] // @backupOwner objsdev //--------------------------------------------------------------------- using System; diff --git a/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs b/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs index 0cedd02d5..45b862eda 100644 --- a/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs +++ b/System.Web.Extensions/Compilation/WCFModel/VSWCFServiceContractGenerator.cs @@ -441,9 +441,9 @@ public static VSWCFServiceContractGenerator GenerateCodeAndConfiguration(SvcMapF } catch (Exception ex) { - // fatal error... (workaround for - - + // fatal error... (workaround for bug #135242) + // We want to convert fatal error exception to a normal code generator error message, + // so the user could find information from pervious errors to find KB topic. proxyGenerationErrors.Add(new ProxyGenerationError( ProxyGenerationError.GeneratorState.GenerateCode, String.Empty, @@ -1252,7 +1252,7 @@ protected static WsdlImporter CreateWsdlImporter(SvcMapFile svcMapFile, if (serializerType == ClientOptions.ProxySerializerType.Auto && ContainsHttpBindings(metadataSections)) { // NOTE: HTTP Get/Post binding indicates an old web service. We use XmlSerializer to prevent generating dup classes. - // Please check devdiv + // Please check devdiv bug 94078 serializerType = ClientOptions.ProxySerializerType.XmlSerializer; } diff --git a/System.Web.Extensions/Handlers/ScriptResourceHandler.cs b/System.Web.Extensions/Handlers/ScriptResourceHandler.cs index c70ccff69..93deb03db 100644 --- a/System.Web.Extensions/Handlers/ScriptResourceHandler.cs +++ b/System.Web.Extensions/Handlers/ScriptResourceHandler.cs @@ -526,8 +526,8 @@ out contentType } } else { - // - + // Bug DevDiv #175061, we don't want to force any encoding here and let the default + // encoding apply no matter what the incoming scripts might have been encoded with. response.Write(script.ToString()); } } diff --git a/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs b/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs index 28d28964e..97d499384 100644 --- a/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs +++ b/System.Web.Extensions/Script/Services/PageClientProxyGenerator.cs @@ -13,13 +13,13 @@ internal class PageClientProxyGenerator : ClientProxyGenerator { internal PageClientProxyGenerator(IPage page, bool debug) : this(VirtualPathUtility.MakeRelative(page.Request.Path, page.Request.FilePath), debug) { - // Dev10 - - - - - - + // Dev10 Bug 597146: Use VirtualPathUtility to build a relative path from the path to the file. + // Previously just Page.Request.FilePath was used, which was for example, /app/foo/page.aspx, + // but this breaks with cookieless sessions since the url is /app/foo/(sessionid)/page.aspx. + // We need to make a relative path from page.Request.Path (e.g. /app/foo) to page.Request.FilePath + // (e.g. /app/foo/page.aspx) rather than just strip off 'page.aspx' with Path.GetFileName, because + // the url may include PathInfo, such as "/app/foo/page.aspx/pathinfo1/pathinfo2", and in that case + // we need the path to be ../../page.aspx } internal PageClientProxyGenerator(string path, bool debug) { diff --git a/System.Web.Extensions/Script/Services/RestHandler.cs b/System.Web.Extensions/Script/Services/RestHandler.cs index 29d3f6088..eee0e1f07 100644 --- a/System.Web.Extensions/Script/Services/RestHandler.cs +++ b/System.Web.Extensions/Script/Services/RestHandler.cs @@ -224,9 +224,9 @@ internal static void WriteExceptionJsonString(HttpContext context, Exception ex, context.Response.AddHeader("jsonerror", "true"); // Maintain the Charset from before. (DevDiv Bugs 158401) context.Response.Charset = charset; - //Devdiv - - + //Devdiv Bug: 118619:When accessed remotely, an Ajax web service that throws an error doesn't return the error string in the proper format on IIS7 + //For IIS 7.0 integrated mode we need to set TrySkipIisCustomErrors to override IIS custom error handling. This has no functional/perf impact on + //IIS 7.0 classic mode or earlier versions. context.Response.TrySkipIisCustomErrors = true; using (StreamWriter writer = new StreamWriter(context.Response.OutputStream, new UTF8Encoding(false))) { if (ex is TargetInvocationException) { diff --git a/System.Web.Extensions/ui/AssemblyCache.cs b/System.Web.Extensions/ui/AssemblyCache.cs index 15ef44924..5c4032bac 100644 --- a/System.Web.Extensions/ui/AssemblyCache.cs +++ b/System.Web.Extensions/ui/AssemblyCache.cs @@ -95,7 +95,7 @@ internal static AjaxFrameworkAssemblyAttribute SafeGetAjaxFrameworkAssemblyAttri } } catch { - // + // Bug 34311: If we are unable to load the attribute, don't throw. } return null; } diff --git a/System.Web.Extensions/ui/ProfileServiceManager.cs b/System.Web.Extensions/ui/ProfileServiceManager.cs index 4dc972c40..bd0283344 100644 --- a/System.Web.Extensions/ui/ProfileServiceManager.cs +++ b/System.Web.Extensions/ui/ProfileServiceManager.cs @@ -97,9 +97,9 @@ private static void GenerateInitializationScript(ref StringBuilder sb, HttpConte } if (!String.IsNullOrEmpty(serviceUrl)) { - // DevDiv - - + // DevDiv Bug 72257:When custom path is set and loadProperties=True, we shouldn't use the default path + // loadProperties script always retrieves the properties from default profile provider, which is not correct if ProfileService + // points to non default path. Hence throw when non default path and loadProperties both are specified. if (defaultServicePath == null){ defaultServicePath = scriptManager.ResolveClientUrl("~/" + System.Web.Script.Services.WebServiceData._profileServiceFileName); } diff --git a/System.Web.Extensions/ui/RoleServiceManager.cs b/System.Web.Extensions/ui/RoleServiceManager.cs index 5533fd3dc..d86c29fd1 100644 --- a/System.Web.Extensions/ui/RoleServiceManager.cs +++ b/System.Web.Extensions/ui/RoleServiceManager.cs @@ -84,9 +84,9 @@ private static void GenerateInitializationScript(ref StringBuilder sb, HttpConte bool pathSpecified = !String.IsNullOrEmpty(serviceUrl); if (pathSpecified) { - // DevDiv - - + // DevDiv Bug 71954:When loadRoles="true" and the path is set, we should not load the roles from the default path + // loadRoles script always retrieves the roles from default role provider, which is not correct if RolesService + // points to non default path. Hence throw when non default path and loadRoles both are specified. if (defaultServicePath == null){ defaultServicePath = scriptManager.ResolveClientUrl("~/" + System.Web.Script.Services.WebServiceData._roleServiceFileName); } diff --git a/System.Web.Extensions/ui/ScriptManager.cs b/System.Web.Extensions/ui/ScriptManager.cs index 8ab1f58f3..049a5452c 100644 --- a/System.Web.Extensions/ui/ScriptManager.cs +++ b/System.Web.Extensions/ui/ScriptManager.cs @@ -1060,8 +1060,8 @@ internal void AddScriptCollections(List scripts, IEnumerabl // PERF: Use field directly to avoid creating List if not already created if (_scripts != null) { foreach (ScriptReference scriptReference in _scripts) { - // Fix for Dev11 - + // Fix for Dev11 Bug # 406984 : When user explicitly adds the MicrosoftAjax.[debug].js OR MicrosoftAjaxCore.[debug].js, we want to mark them as defining Sys so that + // we can register the FrameworkLoadedCheck scripts after them. if (scriptReference.IsAjaxFrameworkScript(this) && (scriptReference.Name.StartsWith("MicrosoftAjax.", StringComparison.OrdinalIgnoreCase) || scriptReference.Name.StartsWith("MicrosoftAjaxCore.", StringComparison.OrdinalIgnoreCase))) { scriptReference.IsDefiningSys = true; _scriptPathsDefiningSys.Add(scriptReference.EffectivePath); diff --git a/System.Web.Mobile/Mobile/UrlPath.cs b/System.Web.Mobile/Mobile/UrlPath.cs index 408bf4392..01a24eb4b 100644 --- a/System.Web.Mobile/Mobile/UrlPath.cs +++ b/System.Web.Mobile/Mobile/UrlPath.cs @@ -85,7 +85,7 @@ internal static String Combine(String basepath, String relative) { String path; - // Make sure the relative path is not a physical path ( + // Make sure the relative path is not a physical path (bug 73641) FailIfPhysicalPath(relative); if (IsRooted(relative)) @@ -99,7 +99,7 @@ internal static String Combine(String basepath, String relative) else { // If the relative path starts with "~/" or "~\", treat it as app root - // relative ( + // relative (bug 68628) if (relative.Length >=3 && relative[0] == appRelativeCharacter && (relative[1] == '/' || relative[1] == '\\')) { String appPath = HttpRuntime.AppDomainAppVirtualPath; diff --git a/System.Web.Mobile/UI/MobileControls/Adapters/XhtmlAdapters/XhtmlBasicObjectListAdapter.cs b/System.Web.Mobile/UI/MobileControls/Adapters/XhtmlAdapters/XhtmlBasicObjectListAdapter.cs index 51781d641..0da129257 100644 --- a/System.Web.Mobile/UI/MobileControls/Adapters/XhtmlAdapters/XhtmlBasicObjectListAdapter.cs +++ b/System.Web.Mobile/UI/MobileControls/Adapters/XhtmlAdapters/XhtmlBasicObjectListAdapter.cs @@ -409,7 +409,7 @@ protected virtual void RenderItemsList(XhtmlMobileTextWriter writer) { Style labelStyle = Control.LabelStyle; Color foreColor = (Color)style[Style.ForeColorKey, true]; - // Note: table width is not supported in DTD (the text of the rec says it's supported; a + // Note: table width is not supported in DTD (the text of the rec says it's supported; a bug in the rec). ClearPendingBreakIfDeviceBreaksOnBlockLevel(writer); // we are writing a block level element in all cases. ConditionalEnterLayout(writer, Style); RenderOpeningListTag(writer, "table"); diff --git a/System.Web.Mobile/UI/MobileControls/Design/AppliedDeviceFiltersDialog.cs b/System.Web.Mobile/UI/MobileControls/Design/AppliedDeviceFiltersDialog.cs index 36cd8f563..7ef342bd4 100644 --- a/System.Web.Mobile/UI/MobileControls/Design/AppliedDeviceFiltersDialog.cs +++ b/System.Web.Mobile/UI/MobileControls/Design/AppliedDeviceFiltersDialog.cs @@ -1115,7 +1115,7 @@ internal DeviceSpecificChoice RuntimeChoice Debug.Assert( (_choicePropertyFilter == null) || (_runtimeChoice == _choicePropertyFilter.RuntimeChoice), - "Local runtime choice object out of sync." + "Local runtime choice object out of [....]." ); return _runtimeChoice; } diff --git a/System.Web.Mobile/UI/MobileControls/Design/ListComponentEditorPage.cs b/System.Web.Mobile/UI/MobileControls/Design/ListComponentEditorPage.cs index b4d35c7c1..7c5228de4 100644 --- a/System.Web.Mobile/UI/MobileControls/Design/ListComponentEditorPage.cs +++ b/System.Web.Mobile/UI/MobileControls/Design/ListComponentEditorPage.cs @@ -150,7 +150,7 @@ protected virtual void OnAfterLabelEdit(Object source, NodeLabelEditEventArgs e) Debug.Assert(e.CancelEdit == false); // this happens when the label is unchanged after entering and exiting - // label editing mode - bizarre behavior. this may be a + // label editing mode - bizarre behavior. this may be a bug in treeview if (null == e.Label) { return; diff --git a/System.Web.Mobile/UI/MobileControls/Design/StylesEditorDialog.cs b/System.Web.Mobile/UI/MobileControls/Design/StylesEditorDialog.cs index da99d706b..5eb1668d1 100644 --- a/System.Web.Mobile/UI/MobileControls/Design/StylesEditorDialog.cs +++ b/System.Web.Mobile/UI/MobileControls/Design/StylesEditorDialog.cs @@ -674,7 +674,7 @@ private void OnAfterLabelEdit(Object source, NodeLabelEditEventArgs e) Debug.Assert(e.CancelEdit == false); // this happens when the label is unchanged after entering and exiting - // label editing mode - bizarre behavior. this may be a + // label editing mode - bizarre behavior. this may be a bug in treeview if (null == e.Label) { return; diff --git a/System.Web.Mobile/UI/MobileControls/Design/Util/GenericUI.cs b/System.Web.Mobile/UI/MobileControls/Design/Util/GenericUI.cs index ca56237cd..86ee1f1ab 100644 --- a/System.Web.Mobile/UI/MobileControls/Design/Util/GenericUI.cs +++ b/System.Web.Mobile/UI/MobileControls/Design/Util/GenericUI.cs @@ -168,7 +168,7 @@ internal static bool ConfirmYesNo(String title, String message) } } - // Copied from ndp\fx\src\Designer\Microsoft\System\Microsoft\Design\RTLAwareMessageBox.cs + // Copied from ndp\fx\src\Designer\[....]\System\[....]\Design\RTLAwareMessageBox.cs [Obsolete("The System.Web.Mobile.dll assembly has been deprecated and should no longer be used. For information about how to develop ASP.NET mobile applications, see http://go.microsoft.com/fwlink/?LinkId=157231.")] internal sealed class RTLAwareMessageBox { diff --git a/System.Web.Mobile/UI/MobileControls/Design/Util/MSHTMLHost.cs b/System.Web.Mobile/UI/MobileControls/Design/Util/MSHTMLHost.cs index c44549c4d..f8d091ccb 100644 --- a/System.Web.Mobile/UI/MobileControls/Design/Util/MSHTMLHost.cs +++ b/System.Web.Mobile/UI/MobileControls/Design/Util/MSHTMLHost.cs @@ -6,7 +6,7 @@ // MSHTMLHost.cs // -// 12/17/98: Created: Microsoft +// 12/17/98: Created: [....] // namespace System.Web.UI.Design.MobileControls.Util { @@ -210,7 +210,7 @@ public virtual int Scroll(NativeMethods.tagSIZE scrollExtant) { } public virtual void OnUIDeactivate(int fUndoable) { - // NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK + // NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK // fixes trident hosting in Win2000. } @@ -245,7 +245,7 @@ public virtual void SetBorderSpace(NativeMethods.COMRECT pborderwidths) { } public virtual void SetActiveObject(NativeMethods.IOleInPlaceActiveObject pActiveObject, string pszObjName) { - // NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK + // NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK // fixes trident hosting in Win2000. // throw new COMException(String.Empty, NativeMethods.E_NOTIMPL); } diff --git a/System.Web.Mobile/UI/MobileControls/MobilePage.cs b/System.Web.Mobile/UI/MobileControls/MobilePage.cs index 26d2ff6dd..afa31dc95 100644 --- a/System.Web.Mobile/UI/MobileControls/MobilePage.cs +++ b/System.Web.Mobile/UI/MobileControls/MobilePage.cs @@ -1290,7 +1290,7 @@ protected override void SavePageStateToPersistenceMedium(Object view) } } - // NOTE: Make sure this stays in sync with Page.PageRegisteredControlsThatRequirePostBackKey + // NOTE: Make sure this stays in [....] with Page.PageRegisteredControlsThatRequirePostBackKey private const string PageRegisteredControlsThatRequirePostBackKey = "__ControlsRequirePostBackKey__"; private bool CheckEmptyViewState(Object viewState) { @@ -1441,7 +1441,7 @@ protected override void RemovedControl(Control control) private byte[] GetMacKeyModifier() { - //NOTE: duplicate of the version in objectstateformatter.cs, keep in sync + //NOTE: duplicate of the version in objectstateformatter.cs, keep in [....] // Use the page's directory and class name as part of the key (ASURT 64044) // We need to make sure that the hash is case insensitive, since the file system diff --git a/System.Web.Mobile/UI/MobileControls/ObjectList.cs b/System.Web.Mobile/UI/MobileControls/ObjectList.cs index d0fae603e..656537ad4 100644 --- a/System.Web.Mobile/UI/MobileControls/ObjectList.cs +++ b/System.Web.Mobile/UI/MobileControls/ObjectList.cs @@ -948,7 +948,7 @@ internal void OnFieldChanged(bool fieldAddedOrRemoved) if (IsTrackingViewState) { _items = null; - // avoid view state being out of sync with fields. + // avoid view state being out of [....] with fields. _ignoreFieldsItemsViewModeViewState = true; if (fieldAddedOrRemoved) { diff --git a/System.Web.Mobile/UI/MobileControls/SessionViewState.cs b/System.Web.Mobile/UI/MobileControls/SessionViewState.cs index da3b9fbc6..faba8d309 100644 --- a/System.Web.Mobile/UI/MobileControls/SessionViewState.cs +++ b/System.Web.Mobile/UI/MobileControls/SessionViewState.cs @@ -27,7 +27,7 @@ namespace System.Web.UI.MobileControls * arise. The core issue behind most of these is how to handle the user * clicking the Back button. When the user does this, there is no corresponding * notification to the server, and the client and server session state are thrown - * out of sync. + * out of [....]. * * This class attempts to alleviate this by storing a small history of view states * in session data. diff --git a/System.Web.Services/System/Web/Services/Description/SoapProtocolImporter.cs b/System.Web.Services/System/Web/Services/Description/SoapProtocolImporter.cs index 5ae945018..687a920cf 100644 --- a/System.Web.Services/System/Web/Services/Description/SoapProtocolImporter.cs +++ b/System.Web.Services/System/Web/Services/Description/SoapProtocolImporter.cs @@ -374,7 +374,7 @@ protected override void EndNamespace() { foreach (XmlMembersMapping member in soapMembers) soapExporter.ExportMembersMapping(member); - // NOTE, Microsoft, we are sharing the SoapInclude and XmlInclude attributes of the + // NOTE, [....], we are sharing the SoapInclude and XmlInclude attributes of the // class among ALL classes generated, This is probably OK, since doing to per // class would probably result in the same set of includes if the user // has object as a return value (meaning 'all' types are OK). @@ -1076,7 +1076,7 @@ bool CheckMessageStyles(string messageName, MessagePart[] parts, SoapBodyBinding return true; } else if (soapBindingStyle == SoapBindingStyle.Document) { - // NOTE, Microsoft. WSDL doesn't really let us figure out whether a document is + // NOTE, [....]. WSDL doesn't really let us figure out whether a document is // in fact a struct containing parameters, so we apply a little heuristic here // in order to produce the appropriate programming model. hasWrapper = (parts.Length == 1 && string.Compare(parts[0].Name, "parameters", StringComparison.Ordinal) == 0); diff --git a/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocument.cs b/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocument.cs index 30527d5c5..48bfca053 100644 --- a/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocument.cs +++ b/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocument.cs @@ -36,7 +36,7 @@ public sealed class DiscoveryDocument { public DiscoveryDocument() { } - // NOTE, Microsoft: This property is not really ignored by the xml serializer. Instead, + // NOTE, [....]: This property is not really ignored by the xml serializer. Instead, // the attributes that would go here are configured in WebServicesConfiguration's // DiscoveryDocumentSerializer property. /// diff --git a/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocumentReference.cs b/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocumentReference.cs index 097e21337..f97304c06 100644 --- a/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocumentReference.cs +++ b/System.Web.Services/System/Web/Services/Discovery/DiscoveryDocumentReference.cs @@ -66,7 +66,7 @@ public string Ref { public override string DefaultFilename { get { string filename = FilenameFromUrl(Url); - return Path.ChangeExtension(filename, ".disco"); // [Microsoft] change default extension + return Path.ChangeExtension(filename, ".disco"); // [[....]] change default extension } } diff --git a/System.Web.Services/System/Web/Services/Discovery/DynamicVirtualDiscoSearcher.cs b/System.Web.Services/System/Web/Services/Discovery/DynamicVirtualDiscoSearcher.cs index 863998aaf..17f470547 100644 --- a/System.Web.Services/System/Web/Services/Discovery/DynamicVirtualDiscoSearcher.cs +++ b/System.Web.Services/System/Web/Services/Discovery/DynamicVirtualDiscoSearcher.cs @@ -140,7 +140,7 @@ protected override DirectoryInfo GetPhysicalDir(string dir ) { // ------------------------------------------------------------------------------- - // Calculate root ADSI virtual directory name (func by 'Microsoft'). + // Calculate root ADSI virtual directory name (func by '[....]'). private string GetWebServerForUrl(string url) { Uri uri = new Uri(url); DirectoryEntry w3Service = new DirectoryEntry("IIS://" + uri.Host + "/W3SVC"); diff --git a/System.Web.Services/System/Web/Services/Protocols/ClientProtocol.cs b/System.Web.Services/System/Web/Services/Protocols/ClientProtocol.cs index 278b35813..2734fa0cb 100644 --- a/System.Web.Services/System/Web/Services/Protocols/ClientProtocol.cs +++ b/System.Web.Services/System/Web/Services/Protocols/ClientProtocol.cs @@ -88,7 +88,7 @@ static WebClientProtocol() { /// [To be supplied.] /// protected WebClientProtocol() { - this.timeout = 100000; // should be kept in sync with HttpWebRequest.Timeout default (see private WebRequest.DefaultTimeout) + this.timeout = 100000; // should be kept in [....] with HttpWebRequest.Timeout default (see private WebRequest.DefaultTimeout) } internal WebClientProtocol(WebClientProtocol protocol) { diff --git a/System.Web.Services/System/Web/Services/Protocols/LogicalMethodInfo.cs b/System.Web.Services/System/Web/Services/Protocols/LogicalMethodInfo.cs index 1e3cb1b68..1b21ea69d 100644 --- a/System.Web.Services/System/Web/Services/Protocols/LogicalMethodInfo.cs +++ b/System.Web.Services/System/Web/Services/Protocols/LogicalMethodInfo.cs @@ -20,7 +20,7 @@ namespace System.Web.Services.Protocols { /// [To be supplied.] /// public enum LogicalMethodTypes { - /// + /// /// /// [To be supplied.] /// @@ -362,7 +362,7 @@ internal WebMethodAttribute MethodAttribute { /// [To be supplied.] /// public ICustomAttributeProvider CustomAttributeProvider { - // Custom attributes are always on the XXX (sync) or BeginXXX (async) method. + // Custom attributes are always on the XXX ([....]) or BeginXXX (async) method. get { return methodInfo; } } diff --git a/System.Web.Services/System/Web/Services/Protocols/Scalars.cs b/System.Web.Services/System/Web/Services/Protocols/Scalars.cs index 0d388dd5e..846bd630e 100644 --- a/System.Web.Services/System/Web/Services/Protocols/Scalars.cs +++ b/System.Web.Services/System/Web/Services/Protocols/Scalars.cs @@ -107,7 +107,7 @@ private static string EscapeStringInternal(string s, Encoding e, bool escapeUriS } /* - // Microsoft: adapted from UrlEscapeStringUnicode below + // [....]: adapted from UrlEscapeStringUnicode below internal static string EscapeStringUnicode(string s) { int l = s.Length; StringBuilder sb = new StringBuilder(l); @@ -126,7 +126,7 @@ internal static string EscapeStringUnicode(string s) { } */ - // Microsoft: copied from System.Web.HttpUtility + // [....]: copied from System.Web.HttpUtility internal static string UrlEscapeStringUnicode(string s) { int l = s.Length; StringBuilder sb = new StringBuilder(l); diff --git a/System.Web.Services/System/Web/Services/Protocols/SoapException.cs b/System.Web.Services/System/Web/Services/Protocols/SoapException.cs index f3c23b935..1e77558f9 100644 --- a/System.Web.Services/System/Web/Services/Protocols/SoapException.cs +++ b/System.Web.Services/System/Web/Services/Protocols/SoapException.cs @@ -59,7 +59,7 @@ public class SoapException : SystemException { /// /// [To be supplied.] /// - // NOTE, Microsoft: The SOAP 1.1 is unclear on whether the detail element can or should be qualified. + // NOTE, [....]: The SOAP 1.1 is unclear on whether the detail element can or should be qualified. // Based on consensus about the intent, we will not qualify it. public static readonly XmlQualifiedName DetailElementName = new XmlQualifiedName(Soap.Element.FaultDetail, ""); @@ -191,9 +191,9 @@ protected SoapException(SerializationInfo info, StreamingContext context) : base actor = (string)list["actor"]; role = (string)list["role"]; - // - - + // Bug: 323493: XmlNode is not serializable, and I don't think we want to really want to create + // an XmlDocument just to read a XmlNode from string to get the deserialized instance back. + // detail = (XmlNode)list["detail"]; subCode = (SoapFaultSubCode)list["subCode"]; lang = (string)list["lang"]; @@ -280,9 +280,9 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont list["actor"] = Actor; list["role"] = Role; - // - - + // Bug: 323493: XmlNode is not serializable, and I don't think we want to really want to create + // an XmlDocument just to read a XmlNode from string to get the deserialized instance back. + // list["detail"] = Detail; list["subCode"] = SubCode; list["lang"] = Lang; diff --git a/System.Web/AspNetEventSource.cs b/System.Web/AspNetEventSource.cs index 8a2756ec6..47ceee67b 100644 --- a/System.Web/AspNetEventSource.cs +++ b/System.Web/AspNetEventSource.cs @@ -91,7 +91,7 @@ private unsafe void RequestEnteredAspNetPipelineImpl(Guid iisActivityId, Guid as // Overload used only for deducing ETW parameters; use the public entry point instead. // // !! WARNING !! - // The logic in RequestEnteredAspNetPipelineImpl must be kept in sync with these parameters, otherwise + // The logic in RequestEnteredAspNetPipelineImpl must be kept in [....] with these parameters, otherwise // type safety violations could occur. [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "ETW looks at this method using reflection.")] [Event((int)Events.RequestEnteredAspNetPipeline, Level = EventLevel.Informational, Task = (EventTask)Tasks.Request, Opcode = EventOpcode.Send, Version = 1)] @@ -118,7 +118,7 @@ private unsafe void RequestStartedImpl(IIS7WorkerRequest wr) { fixed (char* pHttpVerb = httpVerb) { // !! WARNING !! - // This logic must be kept in sync with the ETW-deduced parameters in RequestStarted, + // This logic must be kept in [....] with the ETW-deduced parameters in RequestStarted, // otherwise type safety violations could occur. const int EVENTDATA_COUNT = 3; EventData* pEventData = stackalloc EventData[EVENTDATA_COUNT]; @@ -141,7 +141,7 @@ private unsafe void RequestStartedImpl(IIS7WorkerRequest wr) { // Overload used only for deducing ETW parameters; use the public entry point instead. // // !! WARNING !! - // The logic in RequestStartedImpl must be kept in sync with these parameters, otherwise + // The logic in RequestStartedImpl must be kept in [....] with these parameters, otherwise // type safety violations could occur. [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "ETW looks at this method using reflection.")] [Event((int)Events.RequestStarted, Level = EventLevel.Informational, Task = (EventTask)Tasks.Request, Opcode = EventOpcode.Start, Version = 1)] diff --git a/System.Web/AspNetSynchronizationContext.cs b/System.Web/AspNetSynchronizationContext.cs index f402d77d8..50d1538c9 100644 --- a/System.Web/AspNetSynchronizationContext.cs +++ b/System.Web/AspNetSynchronizationContext.cs @@ -117,11 +117,11 @@ public override void OperationStarted() { Interlocked.Increment(ref _state.VoidAsyncOutstandingOperationCount); } - // Dev11 - - - - + // Dev11 Bug 70908: Race condition involving SynchronizationContext allows ASP.NET requests to be abandoned in the pipeline + // + // When the last completion occurs, the _pendingCount is decremented and then the _lastCompletionCallbackLock is acquired to get + // the _lastCompletionCallback. If the _lastCompletionCallback is non-null, then the last completion will invoke the callback; + // otherwise, the caller of PendingCompletion will handle the completion. internal override bool PendingCompletion(WaitCallback callback) { return _state.Helper.TrySetCompletionContinuation(() => callback(null)); } diff --git a/System.Web/Cache/SqlCacheDependency.cs b/System.Web/Cache/SqlCacheDependency.cs index a0e40fb64..32b120a22 100644 --- a/System.Web/Cache/SqlCacheDependency.cs +++ b/System.Web/Cache/SqlCacheDependency.cs @@ -111,7 +111,7 @@ public SqlCacheDependency(SqlCommand sqlCmd) { // Prevent a conflict between using SQL9 outputcache and an explicit // SQL9 SqlCacheDependency at the same time. See VSWhidey 396429 and - // the attached email in the + // the attached email in the bug. if (context != null && context.SqlDependencyCookie != null && // That means We have already setup SQL9 dependency for output cache sqlCmd.NotificationAutoEnlist) { // This command will auto-enlist in that output cache dependency throw new HttpException(SR.GetString(SR.SqlCacheDependency_OutputCache_Conflict)); @@ -868,7 +868,7 @@ internal static void PollDatabaseForChanges(DatabaseNotifState dbState, bool fro if (obj == null) { Debug.Assert(!dbState._tables.ContainsKey(tableName), - "DatabaseNotifStae._tables and internal cache keys should be in-sync"); + "DatabaseNotifStae._tables and internal cache keys should be in-[....]"); Debug.Trace("SqlCacheDependencyManagerPolling", "Add Database=" + dbState._database+ "; tableName=" + tableName + "; changeId=" + changeId); @@ -881,7 +881,7 @@ internal static void PollDatabaseForChanges(DatabaseNotifState dbState, bool fro } else if (changeId != (int)obj) { Debug.Assert(dbState._tables.ContainsKey(tableName), - "DatabaseNotifStae._tables and internal cache keys should be in-sync"); + "DatabaseNotifStae._tables and internal cache keys should be in-[....]"); Debug.Trace("SqlCacheDependencyManagerPolling", "Change Database=" + dbState._database+ "; tableName=" + tableName + "; old=" + (int)obj + "; new=" + changeId); diff --git a/System.Web/Compilation/BaseResourcesBuildProvider.cs b/System.Web/Compilation/BaseResourcesBuildProvider.cs index 845412d74..0b92b722d 100644 --- a/System.Web/Compilation/BaseResourcesBuildProvider.cs +++ b/System.Web/Compilation/BaseResourcesBuildProvider.cs @@ -115,7 +115,7 @@ private void GenerateResourceFile(AssemblyBuilder assemblyBuilder, IResourceRead } finally { // Put the assignment in a finally block to avoid a ThreadAbortException from - // causing the created stream to not get assigned and become leaked (Dev10 + // causing the created stream to not get assigned and become leaked (Dev10 bug 844463) outputStream = assemblyBuilder.CreateEmbeddedResource(this, resourceFileName); } } @@ -141,7 +141,7 @@ private void GenerateResourceFile(AssemblyBuilder assemblyBuilder, IResourceRead } finally { // Always close the stream to avoid a ThreadAbortException from causing the stream - // to be leaked (Dev10 + // to be leaked (Dev10 bug 844463) if (outputStream != null) { outputStream.Close(); } diff --git a/System.Web/Compilation/BaseTemplateCodeDomTreeGenerator.cs b/System.Web/Compilation/BaseTemplateCodeDomTreeGenerator.cs index d416cb1d0..edd1461f5 100644 --- a/System.Web/Compilation/BaseTemplateCodeDomTreeGenerator.cs +++ b/System.Web/Compilation/BaseTemplateCodeDomTreeGenerator.cs @@ -510,12 +510,12 @@ private void BuildBuildMethodInternal(ControlBuilder builder, Type ctrlType, boo // if ((this.__Template_TestTemplate != null)) { // // For 2.0: // this.__Template_TestTemplate.InstantiateIn(__ctrl); - // // For 4.0, use a new method. This is for fixing Dev10 - - - - - + // // For 4.0, use a new method. This is for fixing Dev10 bug 776195. + // this.InstantiateInContentPlaceHolder(__ctrl, this.__Template_TestTemplate); + // } + // else { + // // normal sub control building code + // } if (MultiTargetingUtil.IsTargetFramework40OrAbove) { instantiateTemplateExpr = new CodeMethodInvokeExpression(new CodeThisReferenceExpression(), "InstantiateInContentPlaceHolder"); instantiateTemplateExpr.Parameters.Add(ctrlRefExpr); @@ -1105,11 +1105,11 @@ private void BuildExtractStatementsRecursive(ArrayList subBuilders, CodeStatemen BuildExtractStatementsRecursive(controlBuilder.SubBuilders, statements, topLevelStatements, linePragma, tableVarName, containerVarName); } - // Dev10 - - - - + // Dev10 bug 525267 + // When a control defines a DefaultProperty in its ParseChildren attribute, its subBuilders are appended + // to the DefaultProperty's subbuilders, and the DefaultProperty itself is added + // as a ComplexProperty or a TemplateProperty (and not as a suBbuilder). Thus we + // also need to go through these properties as well. ArrayList list = new ArrayList(); AddEntryBuildersToList(controlBuilder.ComplexPropertyEntries, list); AddEntryBuildersToList(controlBuilder.TemplatePropertyEntries, list); diff --git a/System.Web/Compilation/BrowserCapabilitiesCompiler.cs b/System.Web/Compilation/BrowserCapabilitiesCompiler.cs index 6525a6bef..44dad1c5c 100644 --- a/System.Web/Compilation/BrowserCapabilitiesCompiler.cs +++ b/System.Web/Compilation/BrowserCapabilitiesCompiler.cs @@ -48,7 +48,7 @@ static BrowserCapabilitiesCompiler() { string version; // If we are targeting previous versions, try loading the 2.0 version of ASP.BrowserCapsFactory - // (Dev10 + // (Dev10 bug 795509) if (MultiTargetingUtil.IsTargetFramework40OrAbove) { version = ThisAssembly.Version; } else { @@ -389,7 +389,7 @@ internal void GenerateCode(AssemblyBuilder assemblyBuilder) { // If not, then we need to use the type BrowserCapabilitiesFactory35 that contains code // from the 2.0 version of BrowserCapabilitiesFactory. This is because "baseType" is the 4.0 type // that contains the new 4.0 definitions. - // (Dev10 + // (Dev10 bug 795509) if (MultiTargetingUtil.IsTargetFramework40OrAbove || baseType.Assembly == BrowserCapabilitiesCompiler.AspBrowserCapsFactoryAssembly) { _baseInstance = (BrowserCapabilitiesFactoryBase)Activator.CreateInstance(baseType); diff --git a/System.Web/Compilation/BuildManager.cs b/System.Web/Compilation/BuildManager.cs index fcd72276b..9f26b6ed4 100644 --- a/System.Web/Compilation/BuildManager.cs +++ b/System.Web/Compilation/BuildManager.cs @@ -779,7 +779,7 @@ internal static void ExecutePreAppStart() { } } - // this method requires global lock as the part of the fix of DevDiv + // this method requires global lock as the part of the fix of DevDiv bug 501777 private static ISet CallPreStartInitMethods(string preStartInitListPath, out bool isRefAssemblyLoaded) { Debug.Assert(PreStartInitStage == Compilation.PreStartInitStage.BeforePreStartInit); isRefAssemblyLoaded = false; @@ -793,8 +793,8 @@ private static ISet CallPreStartInitMethods(string preStartInitListPath, if (methods == null) { // In case of ctlr-f5 scenario, two processes (VS and IisExpress) will start compilation simultaneously. // GetPreStartInitMethodsFromReferencedAssemblies() will load all referenced assemblies - // If shallow copy is enabled, one process may fail due race condition in copying assemblies (DevDiv - + // If shallow copy is enabled, one process may fail due race condition in copying assemblies (DevDiv bug 501777) + // to fix it, put GetPreStartInitMethodsFromReferencedAssemblies() under the global lock bool gotLock = false; try { CompilationLock.GetLock(ref gotLock); @@ -832,7 +832,7 @@ internal static ISet GetPreStartInitAssembliesFromFile(string path) { return null; } - // this method requires global lock as the part of the fix of DevDiv + // this method requires global lock as the part of the fix of DevDiv bug 501777 internal static void SavePreStartInitAssembliesToFile(string path, ISet assemblies) { Debug.Assert(assemblies != null); Debug.Assert(!String.IsNullOrEmpty(path)); @@ -933,7 +933,7 @@ internal static ICollection GetPreStartInitMethodsFromAssemblyCollec } catch { // GetCustomAttributes invokes the constructors of the attributes, so it is possible that they might throw unexpected exceptions. - // (Dev10 + // (Dev10 bug 831981) } if (attributes == null || !attributes.Any()) { @@ -1844,7 +1844,7 @@ private void EnsureFirstTimeDirectoryInit(VirtualPath virtualDir) { _localResourcesAssemblies[virtualDir] = resourceAssembly; } - // VSWhidbey + // VSWhidbey Bug 560521 private void EnsureFirstTimeDirectoryInitForDependencies(ICollection dependencies) { foreach (String dependency in dependencies) { VirtualPath dependencyPath = VirtualPath.Create(dependency); @@ -2324,11 +2324,11 @@ private BuildResult GetBuildResultFromCacheInternal(string cacheKey, bool keyFro // There might be changes in local resources for dependencies, // so we need to make sure EnsureFirstTimeDirectoryInit gets called // for them even when we already have a cache result. - // VSWhidbey + // VSWhidbey Bug 560521 if (result != null) { // We should only process the local resources folder after the top level files have been compiled, - // so that any custom VPP can be registered first. (Dev10 + // so that any custom VPP can be registered first. (Dev10 bug 890796) if (_compilationStage == CompilationStage.AfterTopLevelFiles && result.VirtualPathDependencies != null) { EnsureFirstTimeDirectoryInitForDependencies(result.VirtualPathDependencies); } @@ -2942,8 +2942,8 @@ private void CopyCompiledAssembliesToDestinationBin(string fromDir, string toDir bool createdDirectory = false; foreach (FileData fileData in FileEnumerator.Create(fromDir)) { - // Windows OS - + // Windows OS Bug 1981578 + // Create a new directory only if there is something in the directory. if (!createdDirectory) Directory.CreateDirectory(toDir); createdDirectory = true; @@ -2966,7 +2966,7 @@ private void CopyCompiledAssembliesToDestinationBin(string fromDir, string toDir continue; // Do not copy the file to the target folder if it has been already - // marked for deletion - Dev10 + // marked for deletion - Dev10 bug 676794 if (DiskBuildResultCache.HasDotDeleteFile(fileData.FullName)) { continue; } diff --git a/System.Web/Compilation/BuildProvidersCompiler.cs b/System.Web/Compilation/BuildProvidersCompiler.cs index c1b0d99da..4de6d6954 100644 --- a/System.Web/Compilation/BuildProvidersCompiler.cs +++ b/System.Web/Compilation/BuildProvidersCompiler.cs @@ -765,10 +765,10 @@ private void CompileAssemblyBuilderParallel(ICollection assemblyBuilders) { } else { - // devdiv - - - + // devdiv bug 666936: ASP.NET compilation related deadlock in Antares scenario. + // The main (current) thread holds a global compilation lock. CacheAssemblyResults and CacheCompileErrors may + // also require the global compilation lock in case of removing old data and thus may lead to deadlock. + // Fix: using dictionaries to collect the build results from parallel threads and do caching in the main thread. ConcurrentDictionary buildResults = new ConcurrentDictionary(); ConcurrentDictionary buildErrors = new ConcurrentDictionary(); diff --git a/System.Web/Compilation/BuildResult.cs b/System.Web/Compilation/BuildResult.cs index a47485862..c3b929cb1 100644 --- a/System.Web/Compilation/BuildResult.cs +++ b/System.Web/Compilation/BuildResult.cs @@ -341,7 +341,7 @@ internal bool IsUpToDate(VirtualPath virtualPath, bool ensureIsUpToDate) { // Don't check more than every two seconds DateTime now = DateTime.Now; - // Due to + // Due to bug 214038, CBM can be called multiple times in a very short time. if (now < _nextUpToDateCheck && !BuildManagerHost.InClientBuildManager) { Debug.Trace("BuildResult", "IsUpToDate: true since called less than 2 seconds ago. " + _nextUpToDateCheck + "," + now); @@ -503,11 +503,11 @@ internal static Assembly GetPreservedAssembly(PreservationFileReader pfr) { } } - // DevDiv - - - - + // DevDiv Bug 98735 + // Go through the assembly and all references (including deeper levels) to make sure that + // each referenced assembly exists and does not have a dot delete. + // If any referenced assembly is removed or marked for deletion, + // we invalidate the base assembly by throwing an InvalidOperationException private static void CheckAssemblyIsValid(Assembly a, Hashtable checkedAssemblies) { // Keep track of which assemblies we already checked so we can skip them @@ -1036,9 +1036,9 @@ internal virtual void FrameworkInitialize(TemplateControl templateControl) { try { // Create the control tree - // DevDiv - - + // DevDiv Bug 59351 + // Lock during the first time we initialize the control builder with the object, + // to prevent concurrency issues. if (!_initialized) { lock (this) { _rootBuilder.InitObject(templateControl); diff --git a/System.Web/Compilation/BuildResultCache.cs b/System.Web/Compilation/BuildResultCache.cs index 8bf8c7a88..1e3bfd5a8 100644 --- a/System.Web/Compilation/BuildResultCache.cs +++ b/System.Web/Compilation/BuildResultCache.cs @@ -372,7 +372,7 @@ private static void RemoveAssembly(string path) { // run into a situation where the dependency has changed just // when the cache item is about to get inserted, resulting in // the callback deleting only the dll file and leaving behind the - // pdb file. (Dev10 + // pdb file. (Dev10 bug 846606) var pdbPath = Path.ChangeExtension(f.FullName, ".pdb"); if (File.Exists(pdbPath)) { DiskBuildResultCache.TryDeleteFile(new FileInfo(pdbPath)); diff --git a/System.Web/Compilation/CompilationLock.cs b/System.Web/Compilation/CompilationLock.cs index 6e271ae70..5872f0ea6 100644 --- a/System.Web/Compilation/CompilationLock.cs +++ b/System.Web/Compilation/CompilationLock.cs @@ -188,7 +188,7 @@ internal static void GetLock(ref bool gotLock) { // Always take the BuildManager lock *before* taking the mutex, to avoid possible // deadlock situations (VSWhidbey 530732) #pragma warning disable 0618 - //@TODO: This overload of Monitor.Enter is obsolete. Please change this to use Monitor.Enter(ref bool), and remove the pragmas -- Microsoft + //@TODO: This overload of Monitor.Enter is obsolete. Please change this to use Monitor.Enter(ref bool), and remove the pragmas -- [....] Monitor.Enter(BuildManager.TheBuildManager); #pragma warning restore 0618 _mutex.WaitOne(); diff --git a/System.Web/Compilation/CompilationUtil.cs b/System.Web/Compilation/CompilationUtil.cs index b36f63f94..a11707af7 100644 --- a/System.Web/Compilation/CompilationUtil.cs +++ b/System.Web/Compilation/CompilationUtil.cs @@ -333,7 +333,7 @@ internal static List GetFolderLevelBuildProviderTypes(CompilationSection c return buildProviders.GetBuildProviderTypes(appliesTo); } - // In partial trust, do not allow the CompilerDirectoryPath provider option in codedom settings (Dev10 + // In partial trust, do not allow the CompilerDirectoryPath provider option in codedom settings (Dev10 bug 462348) internal static void CheckCompilerDirectoryPathAllowed(IDictionary providerOptions) { if (providerOptions == null) { return; @@ -445,10 +445,10 @@ internal static Type LoadTypeWithChecks(string typeName, Type requiredBaseType, return t; } - // Devdiv - - - + // Devdiv Bug 57600 + // We need to use the constructor with ProviderOptions to get the v3.5/v4.0 compiler that was possibly set in config. + // We first check if there is any providerOptions and invoke the constructor if so. + // Otherwise, we fall back to the default constructor. internal static CodeDomProvider CreateCodeDomProvider(Type codeDomProviderType) { CodeDomProvider codeDomProvider = CreateCodeDomProviderWithPropertyOptions(codeDomProviderType); if (codeDomProvider != null) { @@ -493,7 +493,7 @@ private static CodeDomProvider CreateCodeDomProviderWithPropertyOptions(Type cod // We need to explicitly set to v3.5, as it is possible for the // user to only have specified it for one compiler but not // the other. - // Dev10 + // Dev10 bug 809212 providerOptions["CompilerVersion"] = "v3.5"; } else { @@ -523,7 +523,7 @@ private static CodeDomProvider CreateCodeDomProviderWithPropertyOptions(Type cod provider = CodeDomProvider.CreateProvider(language, providerOptions); } // Restore the provider options if we previously manually added the compilerDirectoryPath. - // Otherwise, we might incorrectly invalidate the compilerDirectoryPath in medium trust (Dev10 + // Otherwise, we might incorrectly invalidate the compilerDirectoryPath in medium trust (Dev10 bug 550299). if (addedCompilerDirectoryPath) { providerOptions.Remove(CompilerDirectoryPath); } diff --git a/System.Web/Compilation/MultiTargetingUtil.cs b/System.Web/Compilation/MultiTargetingUtil.cs index 09ca000d3..f60717c50 100644 --- a/System.Web/Compilation/MultiTargetingUtil.cs +++ b/System.Web/Compilation/MultiTargetingUtil.cs @@ -359,7 +359,7 @@ private static void InitializeTargetFrameworkNameFor40AndAbove(string targetFram private static void ValidateCompilerVersionFor40AndAbove() { // Since the root web.config already specifies 4.0, we need to make sure both compilerVersions // are actually greater than or equal to 4.0, in case the user only sets compilerVersion=3.5 - // for one language. (Dev10 + // for one language. (Dev10 bug 738202) ValidateCompilerVersionFor40AndAbove(GetCSharpCompilerVersion()); ValidateCompilerVersionFor40AndAbove(GetVisualBasicCompilerVersion()); } diff --git a/System.Web/Compilation/PreservationFileReader.cs b/System.Web/Compilation/PreservationFileReader.cs index 956ea7082..ebcce1503 100644 --- a/System.Web/Compilation/PreservationFileReader.cs +++ b/System.Web/Compilation/PreservationFileReader.cs @@ -145,7 +145,7 @@ private BuildResult ReadFileInternal(VirtualPath virtualPath, string preservatio // under the same lock so to avoid bad interleaving where one process // deletes the .compiled file that another process just created, orphaning // the files generated by the other process. - // (Dev10 + // (Dev10 bug 791299) CompilationLock.GetLock(ref gotLock); // Give the BuildResult a chance to do some cleanup diff --git a/System.Web/Compilation/XsdBuildProvider.cs b/System.Web/Compilation/XsdBuildProvider.cs index 5d58d0f1c..7802a250b 100644 --- a/System.Web/Compilation/XsdBuildProvider.cs +++ b/System.Web/Compilation/XsdBuildProvider.cs @@ -49,8 +49,8 @@ public override void GenerateCode(AssemblyBuilder assemblyBuilder) { CodeNamespace codeNamespace = new CodeNamespace(ns); codeCompileUnit.Namespaces.Add(codeNamespace); - // Devdiv 18365, Dev10 - + // Devdiv 18365, Dev10 bug 444516 + // Call a different Generate method if compiler version is v3.5 or above bool isVer35OrAbove = CompilationUtil.IsCompilerVersion35OrAbove(assemblyBuilder.CodeDomProvider.GetType()); if (isVer35OrAbove) { @@ -72,8 +72,8 @@ public override void GenerateCode(AssemblyBuilder assemblyBuilder) { if (isVer35) { var aName = a.GetName(); if (aName.Name == "System.Data.DataSetExtensions") { - // Dev10 - + // Dev10 Bug 861688 - We need to specify v3.5 version so that the build system knows to use the v3.5 version + // because the loaded assembly here is always v4.0 aName.Version = new Version(3, 5, 0, 0); CompilationSection.RecordAssembly(aName.FullName, a); } diff --git a/System.Web/Configuration/BrowserCapabilitiesCodeGenerator.cs b/System.Web/Configuration/BrowserCapabilitiesCodeGenerator.cs index 1b1ce790a..5dd5d4b54 100644 --- a/System.Web/Configuration/BrowserCapabilitiesCodeGenerator.cs +++ b/System.Web/Configuration/BrowserCapabilitiesCodeGenerator.cs @@ -133,7 +133,7 @@ internal static string BrowserCapAssemblyPublicKeyToken { else { // If we are targeting pre-4.0, we should be using version 2.0 of the assembly // ASP.BrowserCapsFactory, so we need to read the token file from the 2.0 path. - // (Dev10 + // (Dev10 bug 795509) string subPath = @"config\browsers\" + _publicKeyTokenFileName; publicKeyTokenFile = ToolLocationHelper.GetPathToDotNetFrameworkFile(subPath, TargetDotNetFrameworkVersion.Version20); } diff --git a/System.Web/Configuration/HttpCapabilitiesBase.cs b/System.Web/Configuration/HttpCapabilitiesBase.cs index 7cd78d448..e2f95210c 100644 --- a/System.Web/Configuration/HttpCapabilitiesBase.cs +++ b/System.Web/Configuration/HttpCapabilitiesBase.cs @@ -404,7 +404,8 @@ public Version[] GetClrVersions() { return null; } - Regex regex = new Regex("\\.NET CLR (?'clrVersion'[0-9\\.]*)"); + // Adding timeout for Regex in case of malicious UA string causing DoS + Regex regex = RegexUtil.CreateRegex("\\.NET CLR (?'clrVersion'[0-9\\.]*)", RegexOptions.None); MatchCollection matches = regex.Matches(ua); if (matches.Count == 0) { diff --git a/System.Web/Configuration/MembershipSection.cs b/System.Web/Configuration/MembershipSection.cs index f3ea42245..a58f233ea 100644 --- a/System.Web/Configuration/MembershipSection.cs +++ b/System.Web/Configuration/MembershipSection.cs @@ -48,6 +48,7 @@ namespace System.Web.Configuration { minRequiredPasswordLength="int" The minimum number of characters required in a password minRequiredNonAlphanumericCharacters="int" The minimum number of non-alphanumeric characters that are required in a password passwordStrengthRegularExpression="string" The regular expression used to test the password strength + passwordStrengthRegexTimeout="int" The timeout in milliseconds for the regex we use to check password strength --> @@ -60,6 +61,7 @@ namespace System.Web.Configuration { minRequiredPasswordLength="7" minRequireNonAlphanumericCharacters="1" passwordStrengthRegularExpression="" + passwordStrengthRegexTimeout="2000" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true" diff --git a/System.Web/Configuration/MetabaseServerConfig.cs b/System.Web/Configuration/MetabaseServerConfig.cs index 2b1c78a28..d3727195d 100644 --- a/System.Web/Configuration/MetabaseServerConfig.cs +++ b/System.Web/Configuration/MetabaseServerConfig.cs @@ -233,7 +233,7 @@ private string MapPathCaching(string siteID, VirtualPath path) { cacheInfo = new MapPathCacheInfo(); // Add to the cache. // No need to have a lock here. UtcAdd will add the entry if it doesn't exist. - // If it does exist, the existing value will be returned (Dev10 + // If it does exist, the existing value will be returned (Dev10 Bug 755034). object existingEntry = HttpRuntime.CacheInternal.UtcAdd( cacheKey, cacheInfo, null, Cache.NoAbsoluteExpiration, slidingExpiration, CacheItemPriority.Default, null); if (existingEntry != null) { diff --git a/System.Web/Configuration/ProcessHostMapPath.cs b/System.Web/Configuration/ProcessHostMapPath.cs index b095d7c55..39dccac1a 100644 --- a/System.Web/Configuration/ProcessHostMapPath.cs +++ b/System.Web/Configuration/ProcessHostMapPath.cs @@ -231,7 +231,7 @@ private string MapPathCaching(string siteID, VirtualPath path) { cacheInfo = new MapPathCacheInfo(); // Add to the cache. // No need to have a lock here. UtcAdd will add the entry if it doesn't exist. - // If it does exist, the existing value will be returned (Dev10 + // If it does exist, the existing value will be returned (Dev10 Bug 755034). object existingEntry = HttpRuntime.CacheInternal.UtcAdd( cacheKey, cacheInfo, null, Cache.NoAbsoluteExpiration, slidingExpiration, CacheItemPriority.Default, null); if (existingEntry != null) { diff --git a/System.Web/Configuration/RegexWorker.cs b/System.Web/Configuration/RegexWorker.cs index 34d9ce4cd..2d1059b68 100644 --- a/System.Web/Configuration/RegexWorker.cs +++ b/System.Web/Configuration/RegexWorker.cs @@ -88,7 +88,8 @@ public bool ProcessRegex(string target, string regexExpression) { target = String.Empty; } - Regex regex = new Regex(regexExpression, RegexOptions.ExplicitCapture); + // Adding timeout for Regex in case of malicious string causing DoS + Regex regex = RegexUtil.CreateRegex(regexExpression, RegexOptions.ExplicitCapture); Match match = regex.Match(target); if(match.Success == false) { return false; diff --git a/System.Web/Configuration/SessionStateSection.cs b/System.Web/Configuration/SessionStateSection.cs index 03df79594..c09da8b62 100644 --- a/System.Web/Configuration/SessionStateSection.cs +++ b/System.Web/Configuration/SessionStateSection.cs @@ -392,7 +392,7 @@ public string LockAttributes { return (string)base[_propLockAttributes]; } set { - // base.LockedAttributes.SetFromList(value); // keep the internal list in sync + // base.LockedAttributes.SetFromList(value); // keep the internal list in [....] base[_propLockAttributes] = value; } } diff --git a/System.Web/Configuration/WebConfigurationHost.cs b/System.Web/Configuration/WebConfigurationHost.cs index 7c7f60599..143b9eca9 100644 --- a/System.Web/Configuration/WebConfigurationHost.cs +++ b/System.Web/Configuration/WebConfigurationHost.cs @@ -476,9 +476,9 @@ public override string GetStreamName(string configPath) { // with these characters. We fallback to the default GetStreamName failure behavior which is to // return null. - // Dev10 - - + // Dev10 Bug 835901: '?' (%3F), '*' (%2A), and ':' (%3A) are valid in a URL. We need to return null + // if the path contains one of these characters. Instead of explicitly checking for these characters, + // we will rely on Path.Combine and Path.GetFullPath to throw when the path is invalid. return CombineAndValidatePath(directory, baseName); } diff --git a/System.Web/FileChangesMonitor.cs b/System.Web/FileChangesMonitor.cs index 5691656cb..e4b03d475 100644 --- a/System.Web/FileChangesMonitor.cs +++ b/System.Web/FileChangesMonitor.cs @@ -149,7 +149,7 @@ static FileSecurity() { } [SuppressMessage("Microsoft.Interoperability", "CA1404:CallGetLastErrorImmediatelyAfterPInvoke", - Justification="Microsoft: Call to GetLastWin32Error() does follow P/Invoke call that is outside the if/else block.")] + Justification="[....]: Call to GetLastWin32Error() does follow P/Invoke call that is outside the if/else block.")] static internal byte[] GetDacl(string filename) { // DevDiv #322858 - allow skipping DACL step for perf gain if (HostingEnvironment.FcnSkipReadAndCacheDacls) { @@ -305,7 +305,7 @@ internal void AddTarget(FileChangeEventHandler callback, string alias, bool newA } else { #if DBG - // Needs the lock to sync with DebugDescription + // Needs the lock to [....] with DebugDescription lock (_targets) { #endif _targets.Add(callback.Target, new FileMonitorTarget(callback, alias)); @@ -330,7 +330,7 @@ internal int RemoveTarget(object callbackTarget) { #endif if (target != null && target.Release() == 0) { #if DBG - // Needs the lock to sync with DebugDescription + // Needs the lock to [....] with DebugDescription lock (_targets) { #endif _targets.Remove(callbackTarget); @@ -1574,7 +1574,7 @@ internal bool IsDirNameMonitored(string fullPath, string dirName) { } } } - // Dev10 + // Dev10 Bug 663511: Deletes, moves, and renames of the App_LocalResources folder may be ignored if (dirName.IndexOf(HttpRuntime.LocalResourcesDirectoryName, StringComparison.OrdinalIgnoreCase) > -1) { return true; } diff --git a/System.Web/Hosting/ApplicationManager.cs b/System.Web/Hosting/ApplicationManager.cs index 0ebbf12b5..e02ad7fb5 100644 --- a/System.Web/Hosting/ApplicationManager.cs +++ b/System.Web/Hosting/ApplicationManager.cs @@ -961,7 +961,7 @@ private HostingEnvironment CreateAppDomainWithHostingEnvironment( inClientBuildManager = true; // The default hosting policy in VS has changed (from MultiDomainHost to MultiDomain), // so we need to specify explicitly to allow generated assemblies - // to be unloaded subsequently. (Dev10 + // to be unloaded subsequently. (Dev10 bug) setup.LoaderOptimization = LoaderOptimization.MultiDomainHost; } } diff --git a/System.Web/Hosting/HostingEnvironment.cs b/System.Web/Hosting/HostingEnvironment.cs index 80c0e8c69..d5d2c15e3 100644 --- a/System.Web/Hosting/HostingEnvironment.cs +++ b/System.Web/Hosting/HostingEnvironment.cs @@ -590,7 +590,7 @@ internal void InitiateShutdownInternal() { HttpRuntime.SetShutdownReason(ApplicationShutdownReason.HostingEnvironment, "HostingEnvironment initiated shutdown"); - // Avoid calling Environment.StackTrace if we are in the ClientBuildManager (Dev10 + // Avoid calling Environment.StackTrace if we are in the ClientBuildManager (Dev10 bug 824659) if (!BuildManagerHost.InClientBuildManager) { new EnvironmentPermission(PermissionState.Unrestricted).Assert(); try { @@ -601,7 +601,7 @@ internal void InitiateShutdownInternal() { } } - // waitChangeNotification need not be honored in ClientBuildManager (Dev11 + // waitChangeNotification need not be honored in ClientBuildManager (Dev11 bug 264894) if (!BuildManagerHost.InClientBuildManager) { // this should only be called once, before the cache is disposed, and // the config records are released. diff --git a/System.Web/Hosting/IIS7WorkerRequest.cs b/System.Web/Hosting/IIS7WorkerRequest.cs index 2862566be..11db95173 100644 --- a/System.Web/Hosting/IIS7WorkerRequest.cs +++ b/System.Web/Hosting/IIS7WorkerRequest.cs @@ -1380,7 +1380,7 @@ private void FlushCachedResponse(bool isFinal) { } // send to unmanaged code - // sends are always sync now since they're buffered by IIS + // sends are always [....] now since they're buffered by IIS FlushCore(true, numFragments, fragments, @@ -2317,11 +2317,11 @@ internal bool IsUserInRole(String role) { return isInRole; } - // Windows OS - - - - + // Windows OS Bug 1726303 was "fixed" by changing SynchronizeVariables + // to only synchronize the IPrincipal/IHttpUser if Windows authentication + // was enabled. This is incorrect behavior; for example, suppose a forms + // authenticated request calls TransferRequest and passes the parent IPrincipal to a + // child request. private static bool IsAuthenticationEnabled { get { if (!s_AuthenticationChecked) { diff --git a/System.Web/Hosting/IISUnsafeMethods.cs b/System.Web/Hosting/IISUnsafeMethods.cs index 965dadb44..c1fd851c7 100644 --- a/System.Web/Hosting/IISUnsafeMethods.cs +++ b/System.Web/Hosting/IISUnsafeMethods.cs @@ -703,9 +703,9 @@ internal static extern int MgdPushPromise( internal static extern int MgdGetTlsTokenBindingIdentifiers( [In] IntPtr pHandler, [In, Out] ref IntPtr tokenBindingHandle, - [Out] out IntPtr providedTokenIdentifier, - [Out] out uint providedTokenIdentifierSize, - [Out] out IntPtr referredTokenIdentifier, - [Out] out uint referredTokenIdentifierSize); + [Out] out IntPtr providedToken, + [Out] out uint providedTokenSize, + [Out] out IntPtr referredToken, + [Out] out uint referredTokenSize); } } diff --git a/System.Web/Hosting/ISAPIWorkerRequest.cs b/System.Web/Hosting/ISAPIWorkerRequest.cs index c89ea82f2..ce3d178ea 100644 --- a/System.Web/Hosting/ISAPIWorkerRequest.cs +++ b/System.Web/Hosting/ISAPIWorkerRequest.cs @@ -1649,7 +1649,7 @@ internal class ISAPIWorkerRequestInProc : ISAPIWorkerRequest { protected const int NUM_BASIC_SERVER_VARIABLES = 12; // needed on every request protected const int NUM_ADDITIONAL_SERVER_VARIABLES = 23; // needed when HttpRequest.ServerVariables is populated - // These constants must be kept in sync with g_szServerVariables and g_szUnicodeServerVariables in ecbdirect.cxx + // These constants must be kept in [....] with g_szServerVariables and g_szUnicodeServerVariables in ecbdirect.cxx protected const int LOGON_USER = 0; protected const int AUTH_TYPE = 1; @@ -2407,7 +2407,7 @@ internal override void FlushCore(byte[] status, CallEndOfRequestCallbackOnceAfterAllIoComplete(); } else if (rc != 0 && async) { - // on async failure default to sync path + // on async failure default to [....] path async = false; if (!inAsyncFlush) { diff --git a/System.Web/HttpApplication.cs b/System.Web/HttpApplication.cs index 9bc91f54b..eff422558 100644 --- a/System.Web/HttpApplication.cs +++ b/System.Web/HttpApplication.cs @@ -179,7 +179,7 @@ public class HttpApplication : IComponent, IHttpAsyncHandler, IRequestCompletedN // this is the per instance list that contains the events for each module private PipelineModuleStepContainer[] _moduleContainers; - // Byte array to be used by HttpRequest.GetEntireRawContent. Windows OS + // Byte array to be used by HttpRequest.GetEntireRawContent. Windows OS Bug 1632921 private byte[] _entityBuffer; // Counts the number of code paths consuming this HttpApplication instance. When the counter hits zero, @@ -304,7 +304,7 @@ internal Exception LastError { } - // Used by HttpRequest.GetEntireRawContent. Windows OS + // Used by HttpRequest.GetEntireRawContent. Windows OS Bug 1632921 internal byte[] EntityBuffer { get @@ -769,7 +769,7 @@ private void RemoveSendResponseEventHookup(object key, Delegate handler) { } // - // Sync event hookup + // [....] event hookup // @@ -1707,7 +1707,7 @@ private void CreateEventExecutionSteps(Object eventIndex, ArrayList steps) { asyncHandler.CreateExecutionSteps(this, steps); } - // sync + // [....] EventHandler handler = (EventHandler)Events[eventIndex]; if (handler != null) { @@ -2398,7 +2398,7 @@ private void RegisterEventSubscriptionsWithIIS(IntPtr appContext, HttpContext co Debug.Trace("PipelineRuntime", "RegisterEventSubscriptionsWithIIS: name=" + CurrentModuleCollectionKey + ", type=" + httpModule.GetType().FullName + "\n"); - // make sure collections are in sync + // make sure collections are in [....] Debug.Assert(moduleInfo.Name == _currentModuleCollectionKey, "moduleInfo.Name == _currentModuleCollectionKey"); #endif @@ -2546,7 +2546,7 @@ private bool HasEventSubscription(Object eventIndex) { hasEvents = true; } - // sync + // [....] EventHandler handler = (EventHandler)Events[eventIndex]; if (handler != null) { @@ -4009,10 +4009,10 @@ internal override void ResumeSteps(Exception error) { // a SendResponse, at which point it blocks until the SendResponse notification completes. if (!isReEntry) { // currently we only re-enter for SendResponse - // DevDiv 482614 (Sharepoint - - - + // DevDiv 482614 (Sharepoint Bug 3137123) + // Async completion or SendResponse can happen on a background thread while the thread that called IndicateCompletion has not unwound yet + // Therefore (InIndicateCompletion == true) is not a sufficient evidence that we can use the ThreadContext stored in IndicateCompletionContext + // To avoid using other thread's ThreadContext we use IndicateCompletionContext only if ThreadInsideIndicateCompletion is indeed our thread if (context.InIndicateCompletion && context.ThreadInsideIndicateCompletion == Thread.CurrentThread) { // we already have a ThreadContext threadContext = context.IndicateCompletionContext; @@ -4087,7 +4087,7 @@ internal override void ResumeSteps(Exception error) { break; } - // sync case (we might be able to stay in managed code and execute another notification) + // [....] case (we might be able to stay in managed code and execute another notification) if (needToFinishRequest || UnsafeIISMethods.MgdGetNextNotification(wr.RequestContext, RequestNotificationStatus.Continue) != 1) { isSynchronousCompletion = true; needToComplete = true; @@ -4151,14 +4151,14 @@ internal override void ResumeSteps(Exception error) { if (threadContext != null) { if (context.InIndicateCompletion) { if (isSynchronousCompletion) { - // this is a sync completion on an IIS thread + // this is a [....] completion on an IIS thread threadContext.Synchronize(); // Note for DevDiv 482614 fix: // If this threadContext is from IndicateCompletionContext (e.g. this thread called IndicateCompletion) // then we continue reusing this thread and only undo impersonation before unwinding back to IIS. // // If this threadContext was created while another thread was and still is in IndicateCompletion call - // (e.g. sync or async flush on a background thread from native code, not managed since isReEnty==false) + // (e.g. [....] or async flush on a background thread from native code, not managed since isReEnty==false) // then we can not reuse this thread and this threadContext will be cleaned before we leave ResumeSteps // (because needToDisassociateThreadContext was set to true when we created this threadContext) @@ -4190,7 +4190,7 @@ internal override void ResumeSteps(Exception error) { } else if (isSynchronousCompletion) { Debug.Assert(needToDisassociateThreadContext == true, "needToDisassociateThreadContext MUST BE true"); - // this is a sync completion on an IIS thread + // this is a [....] completion on an IIS thread threadContext.Synchronize(); // get ready to call IndicateCompletion context.IndicateCompletionContext = threadContext; diff --git a/System.Web/HttpBufferlessInputStream.cs b/System.Web/HttpBufferlessInputStream.cs index dc3174c8f..ea274006e 100644 --- a/System.Web/HttpBufferlessInputStream.cs +++ b/System.Web/HttpBufferlessInputStream.cs @@ -164,7 +164,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, Asy } } else { - // perform a sync read + // perform a [....] read return base.BeginRead(buffer, offset, count, callback, state); } } diff --git a/System.Web/HttpCachePolicy.cs b/System.Web/HttpCachePolicy.cs index 2ec21dcb3..5cdde5d30 100644 --- a/System.Web/HttpCachePolicy.cs +++ b/System.Web/HttpCachePolicy.cs @@ -773,7 +773,7 @@ void UpdateCachedHeaders(HttpResponse response) { Debug.Assert((_utcTimestampCreated == DateTime.MinValue && _utcTimestampRequest == DateTime.MinValue) || (_utcTimestampCreated != DateTime.MinValue && _utcTimestampRequest != DateTime.MinValue), - "_utcTimestampCreated and _utcTimestampRequest are out of sync in UpdateCachedHeaders"); + "_utcTimestampCreated and _utcTimestampRequest are out of [....] in UpdateCachedHeaders"); if (_utcTimestampCreated == DateTime.MinValue) { _utcTimestampCreated = _utcTimestampRequest = response.Context.UtcTimestamp; @@ -946,8 +946,8 @@ void UpdateCachedHeaders(HttpResponse response) { } if (!omitVaryStar) { - // Dev10 - + // Dev10 Bug 425047 - OutputCache Location="ServerAndClient" (HttpCacheability.ServerAndPrivate) should + // not use "Vary: *" so the response can be cached on the client if (_varyByCustom != null || (_varyByParams.IsModified() && !_varyByParams.IgnoreParams)) { varyByHeaders = "*"; } @@ -1155,7 +1155,7 @@ internal bool HasExpirationPolicy() { internal bool IsKernelCacheable(HttpRequest request, bool enableKernelCacheForVaryByStar) { return _cacheability == HttpCacheability.Public - && !_hasUserProvidedDependencies // Consider (Microsoft): rework dependency model to support user-provided dependencies + && !_hasUserProvidedDependencies // Consider ([....]): rework dependency model to support user-provided dependencies && !_hasSetCookieHeader && !_noServerCaching && HasExpirationPolicy() diff --git a/System.Web/HttpContext.cs b/System.Web/HttpContext.cs index 5dff17270..4d02a0a8a 100644 --- a/System.Web/HttpContext.cs +++ b/System.Web/HttpContext.cs @@ -730,7 +730,7 @@ public AsyncPreloadModeFlags AsyncPreloadMode { // which doesn't fit our expected patterns and where that code likely has negative side effects. // // This flag is respected only by AspNetSynchronizationContext; it has no effect when the - // legacy sync context is in use. + // legacy [....] context is in use. [EditorBrowsable(EditorBrowsableState.Advanced)] public bool AllowAsyncDuringSyncStages { get { @@ -1313,7 +1313,7 @@ internal RootedObjects RootedObjects { return _rootedObjects; } set { - // Sync the Principal between the containers + // [....] the Principal between the containers SwitchPrincipalContainer(value); _rootedObjects = value; } diff --git a/System.Web/HttpCookieCollection.cs b/System.Web/HttpCookieCollection.cs index 646613154..8858577a9 100644 --- a/System.Web/HttpCookieCollection.cs +++ b/System.Web/HttpCookieCollection.cs @@ -53,7 +53,7 @@ public HttpCookieCollection(): base(StringComparer.OrdinalIgnoreCase) { } // This copy constructor is used by the granular request validation feature. The collections are mutable once - // created, but nobody should ever be mutating them, so it's ok for these to be out of sync. Additionally, + // created, but nobody should ever be mutating them, so it's ok for these to be out of [....]. Additionally, // we don't copy _response since this should only ever be called for the request cookies. internal HttpCookieCollection(HttpCookieCollection col) : base(StringComparer.OrdinalIgnoreCase) { diff --git a/System.Web/HttpRequest.cs b/System.Web/HttpRequest.cs index 4f13464fe..9ad5bc288 100644 --- a/System.Web/HttpRequest.cs +++ b/System.Web/HttpRequest.cs @@ -3026,8 +3026,8 @@ internal void InternalRewritePath(VirtualPath newPath, String newQueryString, bo _url = null; Unvalidated.InvalidateUrl(); - // DevDiv - + // DevDiv Bug 164390: calling the worker request's RawUrl method here + // to ensure we cache the original request Url in Url Mapping scenarios. string temp = RawUrl; // remember the new path @@ -3066,8 +3066,8 @@ internal void InternalRewritePath(VirtualPath newFilePath, VirtualPath newPathIn _url = null; Unvalidated.InvalidateUrl(); - // DevDiv - + // DevDiv Bug 164390: calling the worker request's RawUrl method here + // to ensure we cache the original request Url in Url Mapping scenarios. string temp = RawUrl; if (newPathInfo == null) { diff --git a/System.Web/HttpResponse.cs b/System.Web/HttpResponse.cs index 07a14440e..b92ce6252 100644 --- a/System.Web/HttpResponse.cs +++ b/System.Web/HttpResponse.cs @@ -726,7 +726,7 @@ public IAsyncResult BeginFlush(AsyncCallback callback, Object state) { return _wr.BeginFlush(callback, state); } - // perform a sync flush since async is not supported + // perform a [....] flush since async is not supported FlushAsyncResult ar = new FlushAsyncResult(callback, state); try { Flush(false); @@ -752,7 +752,7 @@ public void EndFlush(IAsyncResult asyncResult) { return; } - // finish sync flush since async is not supported + // finish [....] flush since async is not supported if (asyncResult == null) throw new ArgumentNullException("asyncResult"); FlushAsyncResult ar = asyncResult as FlushAsyncResult; @@ -1368,7 +1368,7 @@ internal void ReportRuntimeError(Exception e, bool canThrow, bool localExecute) // the element to control this behavior. if (customErrorsSetting.AllowNestedErrors) { - // The user has set the compat switch to use the original (pre- + // The user has set the compat switch to use the original (pre-bug fix) behavior. goto case RedirectToErrorPageStatus.NotAttempted; } @@ -3284,10 +3284,10 @@ private String ConvertToFullyQualifiedRedirectUrlIfRequired(String url) { } private String UrlEncodeIDNSafe(String url) { - // - - - + // Bug 86594: Should not encode the domain part of the url. For example, + // http://Übersite/Überpage.aspx should only encode the 2nd Ü. + // To accomplish this we must separate the scheme+host+port portion of the url from the path portion, + // encode the path portion, then reconstruct the url. Debug.Assert(!url.Contains("?"), "Querystring should have been stripped off."); string schemeAndAuthority; diff --git a/System.Web/HttpRuntime.cs b/System.Web/HttpRuntime.cs index 031615615..23b97ec0e 100644 --- a/System.Web/HttpRuntime.cs +++ b/System.Web/HttpRuntime.cs @@ -402,11 +402,11 @@ private void HostingInit(HostingEnvironmentFlags hostingFlags, PolicyLevel polic // Monitor renames to directories we are watching, and notifications on the bin directory // // Note that this must be the first monitoring that we do of the application directory. - // There is a - - - - + // There is a bug in Windows 2000 Server where notifications on UNC shares do not + // happen correctly if: + // 1. the directory is monitored for regular notifications + // 2. the directory is then monitored for directory renames + // 3. the directory is monitored again for regular notifications StartMonitoringDirectoryRenamesAndBinDirectory(); // Initialize ObjectCacheHost before config is read, since config relies on the cache @@ -1744,7 +1744,7 @@ internal static void ReportAppOfflineErrorMessage(HttpResponse response, byte[] } /* - * Finish processing request, sync or async + * Finish processing request, [....] or async */ private void FinishRequest(HttpWorkerRequest wr, HttpContext context, Exception e) { HttpResponse response = context.Response; @@ -1899,7 +1899,7 @@ private void ReleaseResourcesAndUnloadAppDomain(Object state /*not used*/) { catch (Exception e) { Debug.Trace("AppDomainFactory", "AppDomain.Unload exception: " + e + "; Id=" + _appDomainAppId); if (!BuildManagerHost.InClientBuildManager) { - // Avoid calling Exception.ToString if we are in the ClientBuildManager (Dev10 + // Avoid calling Exception.ToString if we are in the ClientBuildManager (Dev10 bug 824659) AddAppDomainTraceMessage("Unload Exception: " + e); } throw; @@ -2270,7 +2270,7 @@ private static bool ShutdownAppDomain(string stackTrace) { + ", ShutdownMessage=" + _theRuntime._shutDownMessage); if (String.IsNullOrEmpty(stackTrace) && !BuildManagerHost.InClientBuildManager) { - // Avoid calling Environment.StackTrace if we are in the ClientBuildManager (Dev10 + // Avoid calling Environment.StackTrace if we are in the ClientBuildManager (Dev10 bug 824659) // Instrument to be able to see what's causing a shutdown new EnvironmentPermission(PermissionState.Unrestricted).Assert(); diff --git a/System.Web/HttpWriter.cs b/System.Web/HttpWriter.cs index f2e757fb6..9627b3231 100644 --- a/System.Web/HttpWriter.cs +++ b/System.Web/HttpWriter.cs @@ -717,7 +717,7 @@ public override void Write(byte[] buffer, int offset, int count) { return; } - // Dev10 + // Dev10 Bug 507392: Do as Stream does. if (buffer == null) throw new ArgumentNullException("buffer"); if (offset < 0) @@ -1433,7 +1433,7 @@ internal void Filter(bool finalFiltering) { _lastBuffer = null; // no content to filter - // Allow the filter to be closed (Dev10 + // Allow the filter to be closed (Dev10 Bug 550168). if (_buffers.Count == 0 && !finalFiltering) return; @@ -1621,7 +1621,7 @@ public override void Write(char[] buffer, int index, int count) { return; } - // Dev10 + // Dev10 Bug 507392: Do as TextWriter does. if (buffer == null) throw new ArgumentNullException("buffer"); if (index < 0) diff --git a/System.Web/InternalApis/NDP_Common/inc/StrongNameHelpers.cs b/System.Web/InternalApis/NDP_Common/inc/StrongNameHelpers.cs index eca286141..262070c90 100644 --- a/System.Web/InternalApis/NDP_Common/inc/StrongNameHelpers.cs +++ b/System.Web/InternalApis/NDP_Common/inc/StrongNameHelpers.cs @@ -20,7 +20,7 @@ internal static class StrongNameHelpers { [ThreadStatic] private static IClrStrongName s_StrongName; - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] private static IClrStrongName StrongName { [System.Security.SecurityCritical] get { @@ -33,7 +33,7 @@ private static IClrStrongName StrongName { } } - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] private static IClrStrongNameUsingIntPtr StrongNameUsingIntPtr { [System.Security.SecurityCritical] get { @@ -42,20 +42,20 @@ private static IClrStrongNameUsingIntPtr StrongNameUsingIntPtr { } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static int StrongNameErrorInfo() { return ts_LastStrongNameHR; } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "Microsoft.Runtime.Hosting.IClrStrongNameUsingIntPtr.StrongNameFreeBuffer(System.IntPtr)", Justification = "StrongNameFreeBuffer returns void but the new runtime wrappers return an HRESULT.")] public static void StrongNameFreeBuffer(IntPtr pbMemory) { StrongNameUsingIntPtr.StrongNameFreeBuffer(pbMemory); } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameGetPublicKey(string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob, out IntPtr ppbPublicKeyBlob, out int pcbPublicKeyBlob) { int hr = StrongNameUsingIntPtr.StrongNameGetPublicKey(pwzKeyContainer, pbKeyBlob, cbKeyBlob, out ppbPublicKeyBlob, out pcbPublicKeyBlob); if( hr < 0 ) @@ -70,7 +70,7 @@ public static bool StrongNameGetPublicKey(string pwzKeyContainer, IntPtr pbKeyBl [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyDelete(string pwzKeyContainer) { int hr = StrongName.StrongNameKeyDelete(pwzKeyContainer); if( hr < 0 ) @@ -82,7 +82,7 @@ public static bool StrongNameKeyDelete(string pwzKeyContainer) { } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyGen(string pwzKeyContainer, int dwFlags, out IntPtr ppbKeyBlob, out int pcbKeyBlob) { int hr = StrongName.StrongNameKeyGen(pwzKeyContainer, dwFlags, out ppbKeyBlob, out pcbKeyBlob); if( hr < 0 ) @@ -96,7 +96,7 @@ public static bool StrongNameKeyGen(string pwzKeyContainer, int dwFlags, out Int } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyInstall(string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob) { int hr = StrongNameUsingIntPtr.StrongNameKeyInstall(pwzKeyContainer, pbKeyBlob, cbKeyBlob); if( hr < 0 ) @@ -108,7 +108,7 @@ public static bool StrongNameKeyInstall(string pwzKeyContainer, IntPtr pbKeyBlob } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob) { IntPtr ppbSignatureBlob = IntPtr.Zero; int cbSignatureBlob = 0; @@ -117,7 +117,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob, ref IntPtr ppbSignatureBlob, out int pcbSignatureBlob) { int hr = StrongNameUsingIntPtr.StrongNameSignatureGeneration(pwzFilePath, pwzKeyContainer, pbKeyBlob, cbKeyBlob, ppbSignatureBlob, out pcbSignatureBlob); if( hr < 0 ) @@ -130,7 +130,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureSize(IntPtr pbPublicKeyBlob, int cbPublicKeyBlob, out int pcbSize) { int hr = StrongNameUsingIntPtr.StrongNameSignatureSize(pbPublicKeyBlob, cbPublicKeyBlob, out pcbSize); if( hr < 0 ) @@ -143,7 +143,7 @@ public static bool StrongNameSignatureSize(IntPtr pbPublicKeyBlob, int cbPublicK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureVerification(string pwzFilePath, int dwInFlags, out int pdwOutFlags) { int hr = StrongName.StrongNameSignatureVerification(pwzFilePath, dwInFlags, out pdwOutFlags); if( hr < 0 ) @@ -156,7 +156,7 @@ public static bool StrongNameSignatureVerification(string pwzFilePath, int dwInF } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureVerificationEx(string pwzFilePath, bool fForceVerification, out bool pfWasVerified) { int hr = StrongName.StrongNameSignatureVerificationEx(pwzFilePath, fForceVerification, out pfWasVerified); if( hr < 0 ) @@ -169,7 +169,7 @@ public static bool StrongNameSignatureVerificationEx(string pwzFilePath, bool fF } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameTokenFromPublicKey(IntPtr pbPublicKeyBlob, int cbPublicKeyBlob, out IntPtr ppbStrongNameToken, out int pcbStrongNameToken) { int hr = StrongNameUsingIntPtr.StrongNameTokenFromPublicKey(pbPublicKeyBlob, cbPublicKeyBlob, out ppbStrongNameToken, out pcbStrongNameToken); if( hr < 0 ) @@ -183,7 +183,7 @@ public static bool StrongNameTokenFromPublicKey(IntPtr pbPublicKeyBlob, int cbPu } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureSize(byte[] bPublicKeyBlob, int cbPublicKeyBlob, out int pcbSize) { int hr = StrongName.StrongNameSignatureSize(bPublicKeyBlob, cbPublicKeyBlob, out pcbSize); if( hr < 0 ) @@ -195,7 +195,7 @@ public static bool StrongNameSignatureSize(byte[] bPublicKeyBlob, int cbPublicKe return true; } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameTokenFromPublicKey(byte[] bPublicKeyBlob, int cbPublicKeyBlob, out IntPtr ppbStrongNameToken, out int pcbStrongNameToken) { int hr = StrongName.StrongNameTokenFromPublicKey(bPublicKeyBlob, cbPublicKeyBlob, out ppbStrongNameToken, out pcbStrongNameToken); if( hr < 0 ) @@ -209,7 +209,7 @@ public static bool StrongNameTokenFromPublicKey(byte[] bPublicKeyBlob, int cbPub } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameGetPublicKey(string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob, out IntPtr ppbPublicKeyBlob, out int pcbPublicKeyBlob) { int hr = StrongName.StrongNameGetPublicKey(pwzKeyContainer, bKeyBlob, cbKeyBlob, out ppbPublicKeyBlob, out pcbPublicKeyBlob); if( hr < 0 ) @@ -223,7 +223,7 @@ public static bool StrongNameGetPublicKey(string pwzKeyContainer, byte[] bKeyBlo } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyInstall(string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob) { int hr = StrongName.StrongNameKeyInstall(pwzKeyContainer, bKeyBlob, cbKeyBlob); if( hr < 0 ) @@ -235,7 +235,7 @@ public static bool StrongNameKeyInstall(string pwzKeyContainer, byte[] bKeyBlob, } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob) { IntPtr ppbSignatureBlob = IntPtr.Zero; int cbSignatureBlob = 0; @@ -243,7 +243,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob, ref IntPtr ppbSignatureBlob, out int pcbSignatureBlob) { int hr = StrongName.StrongNameSignatureGeneration(pwzFilePath, pwzKeyContainer, bKeyBlob, cbKeyBlob, ppbSignatureBlob, out pcbSignatureBlob); if( hr < 0 ) diff --git a/System.Web/LegacyAspNetSynchronizationContext.cs b/System.Web/LegacyAspNetSynchronizationContext.cs index 24affab61..2bbdf1b4f 100644 --- a/System.Web/LegacyAspNetSynchronizationContext.cs +++ b/System.Web/LegacyAspNetSynchronizationContext.cs @@ -43,7 +43,7 @@ private void CheckForRequestStateIfRequired() { private void CallCallback(SendOrPostCallback callback, Object state) { CheckForRequestStateIfRequired(); - // don't take app lock for sync caller to avoid deadlocks in case they poll for result + // don't take app lock for [....] caller to avoid deadlocks in case they poll for result if (_syncCaller) { CallCallbackPossiblyUnderLock(callback, state); } @@ -72,7 +72,7 @@ private void CallCallbackPossiblyUnderLock(SendOrPostCallback callback, Object s } } - // this property no-ops using the legacy sync context + // this property no-ops using the legacy [....] context internal override bool AllowAsyncDuringSyncStages { get; set; @@ -90,11 +90,11 @@ internal override void ClearError() { _error = null; } - // Dev11 - - - - + // Dev11 Bug 70908: Race condition involving SynchronizationContext allows ASP.NET requests to be abandoned in the pipeline + // + // When the last completion occurs, the _pendingCount is decremented and then the _lastCompletionCallbackLock is acquired to get + // the _lastCompletionCallback. If the _lastCompletionCallback is non-null, then the last completion will invoke the callback; + // otherwise, the caller of PendingCompletion will handle the completion. internal override bool PendingCompletion(WaitCallback callback) { Debug.Assert(_lastCompletionCallback == null); // only one at a time bool pending = false; diff --git a/System.Web/Management/WebEvents.cs b/System.Web/Management/WebEvents.cs index d0ca991ba..f7c17a349 100644 --- a/System.Web/Management/WebEvents.cs +++ b/System.Web/Management/WebEvents.cs @@ -1341,7 +1341,7 @@ override internal void FormatToString(WebEventFormatter formatter, bool includeA Exception ex = _exception; - // Please note we arbitrary pick a level limit per + // Please note we arbitrary pick a level limit per bug VSWhidbey 143859 for (int level = 0; ex != null && level <= 2; ex = ex.InnerException, level++) { @@ -1946,14 +1946,14 @@ internal WebRequestInformation() { _iprincipal = context.User; - // Dev11 #80084 - DTS - - - - - - - + // Dev11 #80084 - DTS Bug + // In integrated pipeline, we are very aggressive about disposing + // WindowsIdentity's. If this WebRequestInformation is being used + // post-request (eg, while formatting data for an email provider + // that is reporting batched events), then the User.Identity is + // likely to be disposed. So lets create a clone that will stick + // around. This condition should vaguely match that found in + // HttpContext.DisposePrincipal(). if (_iprincipal is WindowsPrincipal && _iprincipal != WindowsAuthenticationModule.AnonymousPrincipal && (context.WorkerRequest is IIS7WorkerRequest)) { diff --git a/System.Web/ModelBinding/ControlValueProvider.cs b/System.Web/ModelBinding/ControlValueProvider.cs index 76d3de52b..e342edd61 100644 --- a/System.Web/ModelBinding/ControlValueProvider.cs +++ b/System.Web/ModelBinding/ControlValueProvider.cs @@ -29,7 +29,7 @@ protected override object FetchValue(string controlId) { //Following code taken from ControlParameter - code duplicated because ControlPrameter throws exceptions whereas we do not. string propertyName = PropertyName; - // + //Bug Fix # 280051 : First try to find it on dataControl as DataBoundControlHelper.FindControl only walks up starting from dataControl's NamingContainer. Control foundControl = dataControl.FindControl(controlId) ?? DataBoundControlHelper.FindControl(dataControl, controlId); if (foundControl == null) { diff --git a/System.Web/ModelBinding/RangeAttributeAdapter.cs b/System.Web/ModelBinding/RangeAttributeAdapter.cs index 90966962f..2c5acf046 100644 --- a/System.Web/ModelBinding/RangeAttributeAdapter.cs +++ b/System.Web/ModelBinding/RangeAttributeAdapter.cs @@ -8,7 +8,7 @@ public RangeAttributeAdapter(ModelMetadata metadata, ModelBindingExecutionContex #if UNDEF public override IEnumerable GetClientValidationRules() { - string errorMessage = ErrorMessage; // Per Dev10 + string errorMessage = ErrorMessage; // Per Dev10 Bug #923283, need to make sure ErrorMessage is called before Minimum/Maximum return new[] { new ModelClientValidationRangeRule(errorMessage, Attribute.Minimum, Attribute.Maximum) }; } #endif diff --git a/System.Web/PipelineModuleStepContainer.cs b/System.Web/PipelineModuleStepContainer.cs index 0d2b49071..fb8effd3d 100644 --- a/System.Web/PipelineModuleStepContainer.cs +++ b/System.Web/PipelineModuleStepContainer.cs @@ -130,7 +130,7 @@ internal void RemoveEvent(RequestNotification notification, bool isPostEvent, De for (int i = 0; i < stepArray.Count; i++ ) { // we don't support removing async event handlers - // but the event syntax forces us to handle sync events + // but the event syntax forces us to handle [....] events syncStep = stepArray[i] as HttpApplication.SyncEventExecutionStep; if (null != syncStep) { if (syncStep.Handler == (EventHandler)handler) { diff --git a/System.Web/RootedObjects.cs b/System.Web/RootedObjects.cs index 519e1a7b9..8fbef1b66 100644 --- a/System.Web/RootedObjects.cs +++ b/System.Web/RootedObjects.cs @@ -164,9 +164,9 @@ public void ReleasePrincipal() { } } - // Fix - - + // Fix Bug 640366: Setting the Principal to null (irrespective of Identity) + // only if framework version is above .NetFramework 4.5 as this change is new and + // we want to keep the functionality same for previous versions. if (BinaryCompatibility.Current.TargetsAtLeastFramework45) { Principal = null; } diff --git a/System.Web/Routing/Route.cs b/System.Web/Routing/Route.cs index 04f33a9d6..4e78e8ee3 100644 --- a/System.Web/Routing/Route.cs +++ b/System.Web/Routing/Route.cs @@ -80,7 +80,7 @@ public string Url { } set { // The parser will throw for invalid routes. We don't have to worry - // about _parsedRoute getting out of sync with _url since the latter + // about _parsedRoute getting out of [....] with _url since the latter // won't get set unless we can parse the route. _parsedRoute = RouteParser.Parse(value); diff --git a/System.Web/Routing/RouteCollection.cs b/System.Web/Routing/RouteCollection.cs index 5ab39faca..dc8b1d354 100644 --- a/System.Web/Routing/RouteCollection.cs +++ b/System.Web/Routing/RouteCollection.cs @@ -162,9 +162,9 @@ public RouteData GetRouteData(HttpContextBase httpContext) { // a read lock when the collection is empty. Without this check, the UrlRoutingModule causes a 25%-50% // regression in HelloWorld RPS due to lock contention. The UrlRoutingModule is now in the root web.config, // so we need to ensure the module is performant, especially when you are not using routing. - // This check does introduce a slight - - + // This check does introduce a slight bug, in that if a writer clears the collection as part of a write + // transaction, a reader may see the collection when it's empty, which the read lock is supposed to prevent. + // We will investigate a better fix in Dev10 Beta2. The Beta1 bug is Dev10 652986. if (Count == 0) { return null; } diff --git a/System.Web/Security/ADMembershipProvider.cs b/System.Web/Security/ADMembershipProvider.cs index ff10d9a44..6fc96d5a4 100644 --- a/System.Web/Security/ADMembershipProvider.cs +++ b/System.Web/Security/ADMembershipProvider.cs @@ -29,7 +29,7 @@ namespace System.Web.Security using System.Reflection; using System.Configuration.Provider; using System.Web.Management; - + public enum ActiveDirectoryConnectionProtection { None = 0, @@ -78,6 +78,7 @@ public class ActiveDirectoryMembershipProvider : MembershipProvider private int minRequiredNonalphanumericCharacters; private string passwordStrengthRegularExpression; private MembershipPasswordCompatibilityMode _LegacyPasswordCompatibilityMode = MembershipPasswordCompatibilityMode.Framework20; + private int? passwordStrengthRegexTimeout; // // configuration parameters specific to the AD membership provider @@ -377,6 +378,7 @@ public override void Initialize(string name, NameValueCollection config) int clientSearchTimeout = SecUtility.GetIntValue(config, "clientSearchTimeout", -1, false, 0); int serverSearchTimeout = SecUtility.GetIntValue(config, "serverSearchTimeout", -1, false, 0); + passwordStrengthRegexTimeout = SecUtility.GetNullableIntValue(config, "passwordStrengthRegexTimeout"); enableSearchMethods = SecUtility.GetBooleanValue(config, "enableSearchMethods", false); requiresUniqueEmail = SecUtility.GetBooleanValue(config, "requiresUniqueEmail", false); @@ -384,7 +386,7 @@ public override void Initialize(string name, NameValueCollection config) requiresQuestionAndAnswer = SecUtility.GetBooleanValue(config, "requiresQuestionAndAnswer", false); minRequiredPasswordLength = SecUtility.GetIntValue( config, "minRequiredPasswordLength", 7, false, 128 ); minRequiredNonalphanumericCharacters = SecUtility.GetIntValue( config, "minRequiredNonalphanumericCharacters", 1, true, 128 ); - + passwordStrengthRegularExpression = config["passwordStrengthRegularExpression"]; if( passwordStrengthRegularExpression != null ) { @@ -618,6 +620,7 @@ public override void Initialize(string name, NameValueCollection config) config.Remove("minRequiredNonalphanumericCharacters"); config.Remove("passwordStrengthRegularExpression"); config.Remove("passwordCompatMode"); + config.Remove("passwordStrengthRegexTimeout"); if (config.Count > 0) { @@ -735,7 +738,7 @@ public override MembershipUser CreateUser(string username, if( PasswordStrengthRegularExpression.Length > 0 ) { - if( !Regex.IsMatch( password, PasswordStrengthRegularExpression ) ) + if( !RegexUtil.IsMatch( password, PasswordStrengthRegularExpression, RegexOptions.None, passwordStrengthRegexTimeout ) ) { status = MembershipCreateStatus.InvalidPassword; return null; @@ -1224,7 +1227,7 @@ public override bool ChangePassword(string username, if( PasswordStrengthRegularExpression.Length > 0 ) { - if( !Regex.IsMatch( newPassword, PasswordStrengthRegularExpression ) ) + if( !RegexUtil.IsMatch( newPassword, PasswordStrengthRegularExpression, RegexOptions.None, passwordStrengthRegexTimeout ) ) { throw new ArgumentException(SR.GetString(SR.Password_does_not_match_regular_expression, "newPassword")); @@ -4020,8 +4023,8 @@ internal void SetSessionOptionsForSecureConnection(LdapConnection connection, bo } catch (DirectoryOperationException) { - // Dev10 - + // Dev10 Bug# 623663: + // concurrent bind is not supported when a client certificate is specified, (continue without it and don't try to set it next time) this.concurrentBindSupported = false; } diff --git a/System.Web/Security/Cryptography/CryptoAlgorithms.cs b/System.Web/Security/Cryptography/CryptoAlgorithms.cs index 5537f87b4..a4fcc08f6 100644 --- a/System.Web/Security/Cryptography/CryptoAlgorithms.cs +++ b/System.Web/Security/Cryptography/CryptoAlgorithms.cs @@ -12,7 +12,7 @@ namespace System.Web.Security.Cryptography { // Utility class to provide the "one true way" of getting instances of // cryptographic algorithms, like SymmetricAlgorithm and HashAlgorithm. - // From discussions with Microsoft and the crypto board, we should prefer + // From discussions with [....] and the crypto board, we should prefer // the CNG implementations of algorithms, then the CAPI implementations, // then finally managed implementations if there are no CNG / CAPI // implementations. The CNG / CAPI implementations are preferred for diff --git a/System.Web/Security/MembershipPasswordAttribute.cs b/System.Web/Security/MembershipPasswordAttribute.cs index a9814daae..b50ac700a 100644 --- a/System.Web/Security/MembershipPasswordAttribute.cs +++ b/System.Web/Security/MembershipPasswordAttribute.cs @@ -5,6 +5,7 @@ using System.Globalization; using System.Linq; using System.Text.RegularExpressions; + using System.Web.Util; /// /// Validates whether a password field meets the current Membership Provider's password requirements. @@ -143,6 +144,9 @@ public string PasswordStrengthError { } } } + + // The timeout for the regex we use to check password strength + public int? PasswordStrengthRegexTimeout { get; set; } #endregion #region Overriden Methods @@ -189,7 +193,8 @@ protected override ValidationResult IsValid(object value, ValidationContext vali Regex passwordStrengthRegex; try { - passwordStrengthRegex = new Regex(passwordStrengthRegularExpression); + // Adding timeout for Regex in case of malicious string causing DoS + passwordStrengthRegex = RegexUtil.CreateRegex(passwordStrengthRegularExpression, RegexOptions.None, PasswordStrengthRegexTimeout); } catch (ArgumentException ex) { throw new InvalidOperationException(SR.GetString(SR.MembershipPasswordAttribute_InvalidRegularExpression), ex); diff --git a/System.Web/Security/RoleClaimProvider.cs b/System.Web/Security/RoleClaimProvider.cs index 03563e9dc..ad8c9dc19 100644 --- a/System.Web/Security/RoleClaimProvider.cs +++ b/System.Web/Security/RoleClaimProvider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // // RoleClaimProvider.cs diff --git a/System.Web/Security/SQLMembershipProvider.cs b/System.Web/Security/SQLMembershipProvider.cs index 3204cb755..af1cf0fce 100644 --- a/System.Web/Security/SQLMembershipProvider.cs +++ b/System.Web/Security/SQLMembershipProvider.cs @@ -77,7 +77,7 @@ public override string ApplicationName _AppName = value; } } - + private string _sqlConnectionString; private bool _EnablePasswordRetrieval; private bool _EnablePasswordReset; @@ -94,6 +94,7 @@ public override string ApplicationName private MembershipPasswordFormat _PasswordFormat; private MembershipPasswordCompatibilityMode _LegacyPasswordCompatibilityMode = MembershipPasswordCompatibilityMode.Framework20; private string s_HashAlgorithm = null; + private int? _passwordStrengthRegexTimeout; private const int PASSWORD_SIZE = 14; @@ -124,6 +125,7 @@ public override void Initialize(string name, NameValueCollection config) _PasswordAttemptWindow = SecUtility.GetIntValue( config, "passwordAttemptWindow", 10, false, 0 ); _MinRequiredPasswordLength = SecUtility.GetIntValue( config, "minRequiredPasswordLength", 7, false, 128 ); _MinRequiredNonalphanumericCharacters = SecUtility.GetIntValue( config, "minRequiredNonalphanumericCharacters", 1, true, 128 ); + _passwordStrengthRegexTimeout = SecUtility.GetNullableIntValue(config, "passwordStrengthRegexTimeout"); _PasswordStrengthRegularExpression = config["passwordStrengthRegularExpression"]; if( _PasswordStrengthRegularExpression != null ) @@ -203,6 +205,7 @@ public override void Initialize(string name, NameValueCollection config) config.Remove("minRequiredNonalphanumericCharacters"); config.Remove("passwordStrengthRegularExpression"); config.Remove("passwordCompatMode"); + config.Remove("passwordStrengthRegexTimeout"); if (config.Count > 0) { string attribUnrecognized = config.GetKey(0); if (!String.IsNullOrEmpty(attribUnrecognized)) @@ -331,7 +334,7 @@ public override MembershipUser CreateUser( string username, if( PasswordStrengthRegularExpression.Length > 0 ) { - if( !Regex.IsMatch( password, PasswordStrengthRegularExpression ) ) + if( !RegexUtil.IsMatch( password, PasswordStrengthRegularExpression, RegexOptions.None, _passwordStrengthRegexTimeout ) ) { status = MembershipCreateStatus.InvalidPassword; return null; @@ -422,7 +425,7 @@ public override MembershipUser CreateUser( string username, throw; } } - + ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// @@ -580,7 +583,7 @@ public override bool ChangePassword(string username, string oldPassword, string if( PasswordStrengthRegularExpression.Length > 0 ) { - if( !Regex.IsMatch( newPassword, PasswordStrengthRegularExpression ) ) + if( !RegexUtil.IsMatch( newPassword, PasswordStrengthRegularExpression, RegexOptions.None, _passwordStrengthRegexTimeout ) ) { throw new ArgumentException(SR.GetString(SR.Password_does_not_match_regular_expression, "newPassword")); diff --git a/System.Web/State/StateRuntime.cs b/System.Web/State/StateRuntime.cs index c354c95e0..de279f206 100644 --- a/System.Web/State/StateRuntime.cs +++ b/System.Web/State/StateRuntime.cs @@ -303,9 +303,9 @@ private void ReportLocked(HttpContext context, CachedContent content) { DateTime localLockDate; long lockAge; - // Note that due to a - - + // Note that due to a bug in the RTM state server client, + // we cannot add to body of the response when sending this + // message, otherwise the client will leak memory. response = context.Response; response.StatusCode = 423; localLockDate = DateTimeUtil.ConvertToLocalTime(content._utcLockDate); @@ -318,9 +318,9 @@ private void ReportLocked(HttpContext context, CachedContent content) { private void ReportActionFlags(HttpContext context, int flags) { HttpResponse response; - // Note that due to a - - + // Note that due to a bug in the RTM state server client, + // we cannot add to body of the response when sending this + // message, otherwise the client will leak memory. response = context.Response; response.AppendHeader(StateHeaders.ACTIONFLAGS_NAME_RAW, flags.ToString(CultureInfo.InvariantCulture)); } diff --git a/System.Web/State/StateWorkerRequest.cs b/System.Web/State/StateWorkerRequest.cs index 8450d6d37..385d054eb 100644 --- a/System.Web/State/StateWorkerRequest.cs +++ b/System.Web/State/StateWorkerRequest.cs @@ -23,7 +23,7 @@ namespace System.Web.SessionState { class StateHttpWorkerRequest : HttpWorkerRequest { - /* long enough to hold the string representation of an IPv4 or IPv6 address; keep in sync with tracker.cxx */ + /* long enough to hold the string representation of an IPv4 or IPv6 address; keep in [....] with tracker.cxx */ private const int ADDRESS_LENGTH_MAX = 64; IntPtr _tracker; diff --git a/System.Web/StaticFileHandler.cs b/System.Web/StaticFileHandler.cs index 679709b43..9ae9f81b5 100644 --- a/System.Web/StaticFileHandler.cs +++ b/System.Web/StaticFileHandler.cs @@ -508,7 +508,7 @@ internal static void ProcessRequestInternal(HttpContext context, string override // Determine Last Modified Time. We might need it soon // if we encounter a Range: and If-Range header - // Using UTC time to avoid daylight savings time + // Using UTC time to avoid daylight savings time bug 83230 lastModifiedInUtc = new DateTime(fileInfo.LastWriteTimeUtc.Year, fileInfo.LastWriteTimeUtc.Month, fileInfo.LastWriteTimeUtc.Day, diff --git a/System.Web/ThreadContext.cs b/System.Web/ThreadContext.cs index bfd7b04d5..297504069 100644 --- a/System.Web/ThreadContext.cs +++ b/System.Web/ThreadContext.cs @@ -61,7 +61,7 @@ internal void AssociateWithCurrentThread(bool setImpersonationContext) { /* * !! IMPORTANT !! - * Keep this logic in sync with DisassociateFromCurrentThread and EnterExecutionContext. + * Keep this logic in [....] with DisassociateFromCurrentThread and EnterExecutionContext. */ // attach http context to the call context @@ -128,7 +128,7 @@ internal void DisassociateFromCurrentThread() { /* * !! IMPORTANT !! - * Keep this logic in sync with AssociateWithCurrentThread and EnterExecutionContext. + * Keep this logic in [....] with AssociateWithCurrentThread and EnterExecutionContext. */ Current = _originalThreadContextCurrent; @@ -176,7 +176,7 @@ internal Action EnterExecutionContext() { /* * !! IMPORTANT !! - * Keep this logic in sync with AssociateWithCurrentThread and DisassociateFromCurrentThread. + * Keep this logic in [....] with AssociateWithCurrentThread and DisassociateFromCurrentThread. */ // ExecutionContext.Run replaces the current impersonation token, so we need to impersonate diff --git a/System.Web/UI/BaseParser.cs b/System.Web/UI/BaseParser.cs index 1ecb550da..b5eea9d3d 100644 --- a/System.Web/UI/BaseParser.cs +++ b/System.Web/UI/BaseParser.cs @@ -79,7 +79,7 @@ internal string CurrentVirtualPathString { } private Regex _tagRegex; - // The 3.5 regex is used only when targeting 2.0/3.5 for backward compatibility (Dev10 + // The 3.5 regex is used only when targeting 2.0/3.5 for backward compatibility (Dev10 bug 830783). private readonly static Regex tagRegex35 = new TagRegex35(); // The 4.0 regex is used for web sites targeting 4.0 and above. private readonly static Regex tagRegex40 = new TagRegex(); diff --git a/System.Web/UI/Control.cs b/System.Web/UI/Control.cs index b698ff6f3..7a21a881a 100644 --- a/System.Web/UI/Control.cs +++ b/System.Web/UI/Control.cs @@ -2719,7 +2719,7 @@ internal virtual void UnloadRecursive(bool dispose) { // But for control which requires its OnInit method to be called again // to properly initialize when the control is removed and added back // to Page's control tree, the control can override IsReloadable - // to true so the control state is reset. e.g. Validator, see + // to true so the control state is reset. e.g. Validator, see bug if (IsReloadable) { _controlState = ControlState.Constructed; } @@ -3179,7 +3179,7 @@ protected virtual Control FindControl(String id, int pathOffset) { internal Control FindControlFromPageIfNecessary(string id) { Control c = FindControl(id); // Find control from the page if it's a hierarchical ID. - // Dev11 + // Dev11 bug 19915 if (c == null && Page != null) { char[] findControlSeparators = { ID_SEPARATOR, LEGACY_ID_SEPARATOR }; if (id.IndexOfAny(findControlSeparators) != -1) { diff --git a/System.Web/UI/ControlBuilder.cs b/System.Web/UI/ControlBuilder.cs index 91b38689c..6a5c01177 100644 --- a/System.Web/UI/ControlBuilder.cs +++ b/System.Web/UI/ControlBuilder.cs @@ -2220,8 +2220,8 @@ private void InitComplexProperties(object obj) { try { // We must push the theme flag to child complex objects so they are init'd properly - // DevDiv - + // DevDiv Bug 59351 + // Set applytheme only when necessary. if (entry.Builder.flags[applyTheme] != flags[applyTheme]) { entry.Builder.flags[applyTheme] = flags[applyTheme]; } diff --git a/System.Web/UI/HTMLTextWriter.cs b/System.Web/UI/HTMLTextWriter.cs index b5c395a74..af76ac63b 100644 --- a/System.Web/UI/HTMLTextWriter.cs +++ b/System.Web/UI/HTMLTextWriter.cs @@ -98,7 +98,7 @@ public virtual bool IsValidFormAttribute(String attribute) { public const char StyleEqualsChar = ':'; public const string DefaultTabString = "\t"; - // The DesignerRegion attribute name must be kept in sync with + // The DesignerRegion attribute name must be kept in [....] with // System.Web.UI.Design.DesignerRegion.DesignerRegionNameAttribute internal const string DesignerRegionAttributeName = "_designerRegion"; diff --git a/System.Web/UI/HtmlForm.cs b/System.Web/UI/HtmlForm.cs index 5dbcc9f16..9c06f604b 100644 --- a/System.Web/UI/HtmlForm.cs +++ b/System.Web/UI/HtmlForm.cs @@ -219,8 +219,8 @@ public string Target { /// /// Overridden to return a constant value or tack the ID onto the same constant value. - /// This fixes a - + /// This fixes a bug in PocketPC which doesn't allow the name and ID of a form to be different + /// public override string UniqueID { get { if (NamingContainer == Page) { @@ -279,14 +279,16 @@ private string GetActionAttribute() { // scenarios need the postback action to be the original URL. Note however, if Server.Transfer/Execute // is used, the action will be set to the transferred/executed page, that is, the value of // CurrentExecutionFilePathObject. This is because of ASURT 59970 and the document attached to - // that + // that bug, which indirectly states that things should behave this way when Transfer/Execute is used. if (Context.ServerExecuteDepth == 0) { // There hasn't been any Server.Transfer or RewritePath. // ASURT 15979: need to use a relative path, not absolute action = clientFilePath.VirtualPathString; int iPos = action.LastIndexOf('/'); if (iPos >= 0) { - action = action.Substring(iPos + 1); + // Ensure the segment is always a relative path, so prepend a dot-segment + // (RFC section 4.2 Relative Reference) + action = "./" + action.Substring(iPos + 1); } } else { @@ -423,7 +425,7 @@ protected override void RenderAttributes(HtmlTextWriter writer) { (page.RequestInternal.Browser.W3CDomVersion.Major > 0)) { if (DefaultButton.Length > 0) { // Find control from the page if it's a hierarchical ID. - // Dev11 + // Dev11 bug 19915 Control c = FindControlFromPageIfNecessary(DefaultButton); if (c is IButtonControl) { diff --git a/System.Web/UI/ObjectStateFormatter.cs b/System.Web/UI/ObjectStateFormatter.cs index 7e60b164e..5eb66eae4 100644 --- a/System.Web/UI/ObjectStateFormatter.cs +++ b/System.Web/UI/ObjectStateFormatter.cs @@ -189,7 +189,7 @@ internal List GetSpecificPurposes() { return null; } - // Note: duplicated (somewhat) in GetMacKeyModifier, keep in sync + // Note: duplicated (somewhat) in GetMacKeyModifier, keep in [....] // See that method for comments on why these modifiers are in place List specificPurposes = new List() { @@ -216,7 +216,7 @@ private byte[] GetMacKeyModifier() { return null; } - // Note: duplicated (somewhat) in GetSpecificPurposes, keep in sync + // Note: duplicated (somewhat) in GetSpecificPurposes, keep in [....] // Use the page's directory and class name as part of the key (ASURT 64044) uint pageHashCode = _page.GetClientStateIdentifier(); diff --git a/System.Web/UI/Page.cs b/System.Web/UI/Page.cs index d8ee546df..974680fd7 100644 --- a/System.Web/UI/Page.cs +++ b/System.Web/UI/Page.cs @@ -195,7 +195,7 @@ public class Page: TemplateControl, IHttpHandler { private const string PageSubmitScriptKey = "PageSubmitScript"; private const string PageReEnableControlsScriptKey = "PageReEnableControlsScript"; - // NOTE: Make sure this stays in sync with MobilePage.PageRegisteredControlsThatRequirePostBackKey + // NOTE: Make sure this stays in [....] with MobilePage.PageRegisteredControlsThatRequirePostBackKey // private const string PageRegisteredControlsThatRequirePostBackKey = "__ControlsRequirePostBackKey__"; @@ -2167,17 +2167,15 @@ internal void LoadScrollPosition() { } // Load the scroll positions from the request if they exist if (_requestValueCollection != null) { + double doubleValue; + string xpos = _requestValueCollection[_scrollPositionXID]; if (xpos != null) { - if (!Int32.TryParse(xpos, out _scrollPositionX)) { - _scrollPositionX = 0; - } + _scrollPositionX = HttpUtility.TryParseCoordinates(xpos, out doubleValue) ? (int)doubleValue : 0 ; } string ypos = _requestValueCollection[_scrollPositionYID]; if (ypos != null) { - if (!Int32.TryParse(ypos, out _scrollPositionY)) { - _scrollPositionY = 0; - } + _scrollPositionY = HttpUtility.TryParseCoordinates(ypos, out doubleValue) ? (int)doubleValue : 0 ; } } } @@ -2273,8 +2271,8 @@ internal void RenderViewStateFields(HtmlTextWriter writer) { // Need to always render out the viewstate field so alternate viewstate persistence will get called writer.Write("\r\n"); @@ -3236,7 +3234,7 @@ private async Task LoadPostDataAsync(IPostBackDataHandler consumer, string bool changed; // ListControl family controls call EnsureDataBound in consumer.LoadPostData, which could be an async call in 4.6. - // LoadPostData, however, is a sync method, which means we cannot await EnsureDataBound in the method. + // LoadPostData, however, is a [....] method, which means we cannot await EnsureDataBound in the method. // To workaround this, for ListControl family controls, we call EnsureDataBound before we call into LoadPostData. if (AppSettings.EnableAsyncModelBinding && consumer is ListControl) { var listControl = consumer as ListControl; @@ -5581,8 +5579,8 @@ private void SetIntrinsics(HttpContext context, bool allowAsync) { HttpCapabilitiesBase caps = _request.Browser; if(caps != null) { - // Dev10 440476: Page.SetIntrinsics method has a - + // Dev10 440476: Page.SetIntrinsics method has a bug causing throwing NullReferenceException + // in certain circumstances. This edge case was regressed by the VSWhidbey fix below. // VSWhidbey 109162: Set content type at the very beginning so it can be // overwritten within the user code of the page if needed. diff --git a/System.Web/UI/PartialCachingControl.cs b/System.Web/UI/PartialCachingControl.cs index 5e61537f1..9efc13a58 100644 --- a/System.Web/UI/PartialCachingControl.cs +++ b/System.Web/UI/PartialCachingControl.cs @@ -468,9 +468,9 @@ private string ComputeVaryCacheKey(HashCodeCombiner combinedHashCode, NameValueCollection reqValCollection; HttpRequest request = Page.Request; if (request != null && request.HttpVerb == HttpVerb.POST) { - // - - + // Bug 6129: Partial cache key should include posted form values in postbacks. + // Include both QueryString and Form values (but not Cookies or Server Variables like Request.Params does). + // Per Request.Params behavior, add QueryString values before Form values reqValCollection = new NameValueCollection(request.QueryString); reqValCollection.Add(request.Form); } diff --git a/System.Web/UI/TargetFrameworkUtil.cs b/System.Web/UI/TargetFrameworkUtil.cs index e4030f7da..e8b736cd8 100644 --- a/System.Web/UI/TargetFrameworkUtil.cs +++ b/System.Web/UI/TargetFrameworkUtil.cs @@ -103,7 +103,7 @@ internal static ClientBuildManagerTypeDescriptionProviderBridge CBMTypeDescripti // The provider needs not be cached because the TFP service // returns light-weight providers that delegate to the same - // underlying TFP instance. (Dev10 + // underlying TFP instance. (Dev10 bug 795001) private static TypeDescriptionProvider GetTargetFrameworkProvider(object obj) { TypeDescriptionProviderService service = TargetFrameworkUtil.TypeDescriptionProviderService; if (service != null) { @@ -532,7 +532,7 @@ private static bool SkipCache { // updated). // - Otherwise, we are either already using standard reflection, or we are using the // TFP in the primary appdomain, and should not be caching statically. - // Dev10 + // Dev10 bug 805134 return s_cbmTdpBridge == null; } } diff --git a/System.Web/UI/TemplateParser.cs b/System.Web/UI/TemplateParser.cs index 13ba31d98..dea1ef4c9 100644 --- a/System.Web/UI/TemplateParser.cs +++ b/System.Web/UI/TemplateParser.cs @@ -1567,7 +1567,7 @@ private bool ProcessBeginTag(Match match, string inputText) { TypeDescriptor.GetAttributes(childType)[typeof(PartialCachingAttribute)]; // If we are parsing a theme file, the controls do not have an ID, - // and we should not be adding one. (Dev10 + // and we should not be adding one. (Dev10 bug 660310) if (!(subBuilder.Parser is PageThemeParser) && cacheAttrib != null) { _id = "_ctrl_" + _controlCount.ToString(NumberFormatInfo.InvariantInfo); subBuilder.ID = _id; diff --git a/System.Web/UI/TraceContext.cs b/System.Web/UI/TraceContext.cs index b0354a0dc..476a9ec00 100644 --- a/System.Web/UI/TraceContext.cs +++ b/System.Web/UI/TraceContext.cs @@ -787,8 +787,8 @@ private void InitRequest() { // header info try { - // - + // Bug 867196: Use Request.Unvalidated to ensure request validation will not + // be triggered when the entries of the collection are accessed. AddCollectionToRequestData(requestData, SR.Trace_Headers_Collection, _context.Request.Unvalidated.Headers); } catch { diff --git a/System.Web/UI/WebControls/Adapters/MenuAdapter.cs b/System.Web/UI/WebControls/Adapters/MenuAdapter.cs index 2fc4fce20..83c46ef37 100644 --- a/System.Web/UI/WebControls/Adapters/MenuAdapter.cs +++ b/System.Web/UI/WebControls/Adapters/MenuAdapter.cs @@ -44,8 +44,8 @@ protected internal override void LoadAdapterControlState(Object state) { private string Escape(string path) { // This function escapes \\ so that they don't get replaced because of - // a Netscape 4 - + // a Netscape 4 bug. Other escapable characters will be escaped by . + // _ becomes __ and \\ becomes \_\ StringBuilder b = null; if (String.IsNullOrEmpty(path)) { diff --git a/System.Web/UI/WebControls/ChangePassword.cs b/System.Web/UI/WebControls/ChangePassword.cs index cd906e11d..458844466 100644 --- a/System.Web/UI/WebControls/ChangePassword.cs +++ b/System.Web/UI/WebControls/ChangePassword.cs @@ -1939,9 +1939,9 @@ protected virtual void OnCancelButtonClick(EventArgs e) { string cancelPageUrl = CancelDestinationPageUrl; if (!String.IsNullOrEmpty(cancelPageUrl)) { - // Microsoft suggested that we should not terminate execution of current page, to give + // [....] suggested that we should not terminate execution of current page, to give // page a chance to cleanup its resources. This may be less performant though. - // Microsoft suggested that we need to call ResolveClientUrl before redirecting. + // [....] suggested that we need to call ResolveClientUrl before redirecting. // Example is this control inside user control, want redirect relative to user control dir. Page.Response.Redirect(ResolveClientUrl(cancelPageUrl), false); } @@ -1993,9 +1993,9 @@ protected virtual void OnContinueButtonClick(EventArgs e) { string continuePageUrl = ContinueDestinationPageUrl; if (!String.IsNullOrEmpty(continuePageUrl)) { - // Microsoft suggested that we should not terminate execution of current page, to give + // [....] suggested that we should not terminate execution of current page, to give // page a chance to cleanup its resources. This may be less performant though. - // Microsoft suggested that we need to call ResolveClientUrl before redirecting. + // [....] suggested that we need to call ResolveClientUrl before redirecting. // Example is this control inside user control, want redirect relative to user control dir. Page.Response.Redirect(ResolveClientUrl(continuePageUrl), false); } @@ -2066,9 +2066,9 @@ private void PerformSuccessAction(string email, string userName, string newPassw string successPageUrl = SuccessPageUrl; if (!String.IsNullOrEmpty(successPageUrl)) { - // Microsoft suggested that we should not terminate execution of current page, to give + // [....] suggested that we should not terminate execution of current page, to give // page a chance to cleanup its resources. This may be less performant though. - // Microsoft suggested that we need to call ResolveClientUrl before redirecting. + // [....] suggested that we need to call ResolveClientUrl before redirecting. // Example is this control inside user control, want redirect relative to user control dir. Page.Response.Redirect(ResolveClientUrl(successPageUrl), false); } diff --git a/System.Web/UI/WebControls/DataBoundControl.cs b/System.Web/UI/WebControls/DataBoundControl.cs index 39801f9c1..0a433fda7 100644 --- a/System.Web/UI/WebControls/DataBoundControl.cs +++ b/System.Web/UI/WebControls/DataBoundControl.cs @@ -445,14 +445,11 @@ protected override void PerformSelect() { OnDataBinding(EventArgs.Empty); } DataSourceView view = GetData(); + _arguments = CreateDataSourceSelectArguments(); _ignoreDataSourceViewChanged = true; RequiresDataBinding = false; MarkAsDataBound(); - - // when PerformSelect is called in async method, setting _arguments - // to a new instance causes an exception deep in ListView. - // Instead, we should use SelectArguments. - view.Select(SelectArguments, OnDataSourceViewSelectCallback); + view.Select(_arguments, OnDataSourceViewSelectCallback); } @@ -493,10 +490,10 @@ protected override void LoadViewState(object savedState) { /// Saves view state. /// protected override object SaveViewState() { - // - - - + // Bug 322689: In the web farms scenario, if a web site is hosted in 4.0 and 4.5 servers + // (though this is not a really supported scenario, we are fixing this instance), + // the View state created by 4.0 should be able to be understood by 4.5 controls. + // So, we create a Pair only if we are using model binding and otherwise fallback to 4.0 behavior. object baseViewState = base.SaveViewState(); diff --git a/System.Web/UI/WebControls/DetailsView.cs b/System.Web/UI/WebControls/DetailsView.cs index 268143d08..c51c96272 100644 --- a/System.Web/UI/WebControls/DetailsView.cs +++ b/System.Web/UI/WebControls/DetailsView.cs @@ -2867,7 +2867,7 @@ private bool LoadHiddenFieldState(string pageIndex, string dataKey) { propertyChanged = true; // since we can't go into insert mode in a callback, oldPageIndex should never be -1 and different from PageIndex - Debug.Assert(oldPageIndex >= 0, "Page indeces are out of sync from callback hidden field state"); + Debug.Assert(oldPageIndex >= 0, "Page indeces are out of [....] from callback hidden field state"); _pageIndex = oldPageIndex; string oldDataKeyString = dataKey; diff --git a/System.Web/UI/WebControls/LoginView.cs b/System.Web/UI/WebControls/LoginView.cs index 820d536af..3ede63ea9 100644 --- a/System.Web/UI/WebControls/LoginView.cs +++ b/System.Web/UI/WebControls/LoginView.cs @@ -350,7 +350,7 @@ protected override void SetDesignModeState(IDictionary data) { // Note: we always recreate the child controls in the designer to correctly handle the case of // the currently selected role group being deleted. This is necessary because the // setter for TemplateIndex won't recreate the controls if the TemplateIndex is unchanged, - // which is the case when deleting all but the last role group. [Fix for + // which is the case when deleting all but the last role group. [Fix for Bug 148406] ChildControlsCreated = false; } } diff --git a/System.Web/UI/WebControls/MenuItem.cs b/System.Web/UI/WebControls/MenuItem.cs index 0eeaa9fc9..f78c6b43c 100644 --- a/System.Web/UI/WebControls/MenuItem.cs +++ b/System.Web/UI/WebControls/MenuItem.cs @@ -966,7 +966,7 @@ internal void RenderItem(HtmlTextWriter writer, int position, bool enabled, Orie // In 4.0, the default value of Menu.StaticSubMenuIndent was changed from 16px to Unit.Empty, // since the table and list rendering modes need to have different effective default values. // To maintain back compat, the effective default value for table rendering is 16px. - // Dev10 + // Dev10 Bug 741543 if (indent.IsEmpty) { indent = Unit.Pixel(16); } diff --git a/System.Web/UI/WebControls/ModelDataSourceView.cs b/System.Web/UI/WebControls/ModelDataSourceView.cs index 8f762058e..2c0240179 100644 --- a/System.Web/UI/WebControls/ModelDataSourceView.cs +++ b/System.Web/UI/WebControls/ModelDataSourceView.cs @@ -464,7 +464,7 @@ protected virtual object ProcessSelectMethodResult(DataSourceSelectArguments arg MethodInfo countHelperMethod = typeof(QueryableHelpers).GetMethod("CountHelper").MakeGenericMethod(modelType); arguments.TotalRowCount = (int)countHelperMethod.Invoke(null, new object[] { result.ReturnValue }); - // + //Bug 180907: We would like to auto sort on DataKeyName when paging is enabled and result is not already sorted by user to overcome a limitation in EF. MethodInfo isOrderingMethodFoundMethod = typeof(QueryableHelpers).GetMethod("IsOrderingMethodFound").MakeGenericMethod(modelType); bool isOrderingMethodFound = (bool)isOrderingMethodFoundMethod.Invoke(null, new object[] { result.ReturnValue }); if (!isOrderingMethodFound) { diff --git a/System.Web/UI/WebControls/Panel.cs b/System.Web/UI/WebControls/Panel.cs index cef8bb9e4..dc6bdc050 100644 --- a/System.Web/UI/WebControls/Panel.cs +++ b/System.Web/UI/WebControls/Panel.cs @@ -290,7 +290,7 @@ protected override void AddAttributesToRender(HtmlTextWriter writer) { (Page.Request.Browser.W3CDomVersion.Major > 0)) { if (DefaultButton.Length > 0) { // Find control from the page if it's a hierarchical ID. - // Dev11 + // Dev11 bug 19915 Control c = FindControlFromPageIfNecessary(DefaultButton); if (c is IButtonControl) { diff --git a/System.Web/UI/WebControls/PasswordRecovery.cs b/System.Web/UI/WebControls/PasswordRecovery.cs index a236ddde5..f75ce6aa4 100644 --- a/System.Web/UI/WebControls/PasswordRecovery.cs +++ b/System.Web/UI/WebControls/PasswordRecovery.cs @@ -1569,9 +1569,9 @@ protected virtual void OnUserLookupError(EventArgs e) { private void PerformSuccessAction() { string successPageUrl = SuccessPageUrl; if (!String.IsNullOrEmpty(successPageUrl)) { - // Microsoft suggested that we should not terminate execution of current page, to give + // [....] suggested that we should not terminate execution of current page, to give // page a chance to cleanup its resources. This may be less performant though. - // Microsoft suggested that we need to call ResolveClientUrl before redirecting. + // [....] suggested that we need to call ResolveClientUrl before redirecting. // Example is this control inside user control, want redirect relative to user control dir. Page.Response.Redirect(ResolveClientUrl(successPageUrl), false); } diff --git a/System.Web/UI/WebControls/RegularExpressionValidator.cs b/System.Web/UI/WebControls/RegularExpressionValidator.cs index 9ce940dcf..9f3bc32b1 100644 --- a/System.Web/UI/WebControls/RegularExpressionValidator.cs +++ b/System.Web/UI/WebControls/RegularExpressionValidator.cs @@ -54,6 +54,8 @@ public string ValidationExpression { } } + // The timeout for regex + public int? MatchTimeout { get; set; } /// /// @@ -87,9 +89,14 @@ protected override bool EvaluateIsValid() { try { // we are looking for an exact match, not just a search hit - Match m = Regex.Match(controlValue, ValidationExpression); + // Adding timeout for Regex in case of malicious string causing DoS + Match m = RegexUtil.Match(controlValue, ValidationExpression, RegexOptions.None, MatchTimeout); + return(m.Success && m.Index == 0 && m.Length == controlValue.Length); - } + } + catch (ArgumentOutOfRangeException) { + throw; + } catch { Debug.Fail("Regex error should have been caught in property setter."); return true; diff --git a/System.Web/UI/WebControls/Repeater.cs b/System.Web/UI/WebControls/Repeater.cs index bb4bbfdc1..e9ff52cba 100644 --- a/System.Web/UI/WebControls/Repeater.cs +++ b/System.Web/UI/WebControls/Repeater.cs @@ -999,10 +999,10 @@ protected override void LoadViewState(object savedState) { /// Saves view state. /// protected override object SaveViewState() { - // - - - + // Bug 322689: In the web farms scenario, if a web site is hosted in 4.0 and 4.5 servers + // (though this is not a really supported scenario, we are fixing this instance), + // the View state created by 4.0 should be able to be understood by 4.5 controls. + // So, we create a Pair only if we are using model binding and otherwise fallback to 4.0 behavior. object baseViewState = base.SaveViewState(); diff --git a/System.Web/UI/WebControls/TextBox.cs b/System.Web/UI/WebControls/TextBox.cs index 89eede656..35e7c2844 100644 --- a/System.Web/UI/WebControls/TextBox.cs +++ b/System.Web/UI/WebControls/TextBox.cs @@ -696,12 +696,12 @@ protected virtual void RaisePostDataChangedEvent() { /// protected internal override void Render(HtmlTextWriter writer) { RenderBeginTag(writer); - //Dev10 - - + //Dev10 Bug 483896: Original TextBox rendering in MultiLine mode suffers from the + //problem of losing the first newline. We fixed this bug by always rendering a newline + //before rendering the value of the Text property. if (TextMode == TextBoxMode.MultiLine) { - //Dev11 - + //Dev11 Bug 437709 fix: We do not want to encode the extra new line that we are + //rendering. However we are doing this only for 4.5 or later frameworks for back-compat. if (RenderingCompatibility >= VersionUtil.Framework45) { writer.Write(System.Environment.NewLine); HttpUtility.HtmlEncode(Text, writer); diff --git a/System.Web/UI/WebControls/TreeNode.cs b/System.Web/UI/WebControls/TreeNode.cs index 4d71a2379..5f30b9b3e 100644 --- a/System.Web/UI/WebControls/TreeNode.cs +++ b/System.Web/UI/WebControls/TreeNode.cs @@ -1213,9 +1213,18 @@ internal void Render(HtmlTextWriter writer, int position, bool[] isLast, bool en if (imageToolTip.Length > 0) { writer.AddAttribute(HtmlTextWriterAttribute.Alt, String.Format(CultureInfo.CurrentCulture, imageToolTip, Text)); + //fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework + if (BinaryCompatibility.Current.TargetsAtLeastFramework461) { + writer.AddAttribute(HtmlTextWriterAttribute.Title, + String.Format(CultureInfo.CurrentCulture, imageToolTip, Text)); + } } else { writer.AddAttribute(HtmlTextWriterAttribute.Alt, String.Empty); + //fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework + if (BinaryCompatibility.Current.TargetsAtLeastFramework461) { + writer.AddAttribute(HtmlTextWriterAttribute.Title, String.Empty); + } } writer.RenderBeginTag(HtmlTextWriterTag.Img); writer.RenderEndTag(); @@ -1362,9 +1371,17 @@ internal void Render(HtmlTextWriter writer, int position, bool[] isLast, bool en writer.AddStyleAttribute(HtmlTextWriterStyle.BorderWidth, "0"); if (ImageToolTip.Length > 0) { writer.AddAttribute(HtmlTextWriterAttribute.Alt, ImageToolTip); + //fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework + if (BinaryCompatibility.Current.TargetsAtLeastFramework461) { + writer.AddAttribute(HtmlTextWriterAttribute.Title, ImageToolTip); + } } else { writer.AddAttribute(HtmlTextWriterAttribute.Alt, String.Empty); + //fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework + if (BinaryCompatibility.Current.TargetsAtLeastFramework461) { + writer.AddAttribute(HtmlTextWriterAttribute.Title, String.Empty); + } } writer.RenderBeginTag(HtmlTextWriterTag.Img); writer.RenderEndTag(); diff --git a/System.Web/UI/WebControls/Wizard.cs b/System.Web/UI/WebControls/Wizard.cs index 882c5adce..4aa0a6f25 100644 --- a/System.Web/UI/WebControls/Wizard.cs +++ b/System.Web/UI/WebControls/Wizard.cs @@ -1876,9 +1876,9 @@ protected virtual void OnFinishButtonClick(WizardNavigationEventArgs e) { string finishPageUrl = FinishDestinationPageUrl; if (!String.IsNullOrEmpty(finishPageUrl)) { - // Microsoft suggested that we should not terminate execution of current page, to give + // [....] suggested that we should not terminate execution of current page, to give // page a chance to cleanup its resources. This may be less performant though. - // Microsoft suggested that we need to call ResolveClientUrl before redirecting. + // [....] suggested that we need to call ResolveClientUrl before redirecting. // Example is this control inside user control, want redirect relative to user control dir. Page.Response.Redirect(ResolveClientUrl(finishPageUrl), false); } diff --git a/System.Web/UI/WebControls/basecomparevalidator.cs b/System.Web/UI/WebControls/basecomparevalidator.cs index 840709301..04de8b3b4 100644 --- a/System.Web/UI/WebControls/basecomparevalidator.cs +++ b/System.Web/UI/WebControls/basecomparevalidator.cs @@ -110,9 +110,9 @@ protected override void AddAttributesToRender(HtmlTextWriter writer) { AddExpandoAttribute(expandoAttributeWriter, id, "dateorder", GetDateElementOrder(), false); AddExpandoAttribute(expandoAttributeWriter, id, "cutoffyear", CutoffYear.ToString(NumberFormatInfo.InvariantInfo), false); - // VSWhidbey 504553: The changes of this - - + // VSWhidbey 504553: The changes of this bug make client-side script not + // using the century attribute anymore, but still generating it for + // backward compatibility with Everett pages. int currentYear = DateTime.Today.Year; int century = currentYear - (currentYear % 100); AddExpandoAttribute(expandoAttributeWriter, id, "century", century.ToString(NumberFormatInfo.InvariantInfo), false); diff --git a/System.Web/UI/WebParts/CatalogZoneBase.cs b/System.Web/UI/WebParts/CatalogZoneBase.cs index 46968b54d..597b93fd5 100644 --- a/System.Web/UI/WebParts/CatalogZoneBase.cs +++ b/System.Web/UI/WebParts/CatalogZoneBase.cs @@ -549,7 +549,7 @@ protected override void RenderBody(HtmlTextWriter writer) { // Mozilla renders padding on an empty TD without this attribute writer.AddStyleAttribute(HtmlTextWriterStyle.Padding, "0"); - // Add an extra row with height of 100%, to Microsoft up any extra space + // Add an extra row with height of 100%, to [....] up any extra space // if the height of the zone is larger than its contents // Mac IE needs height=100% set on instead of writer.AddStyleAttribute(HtmlTextWriterStyle.Height, "100%"); diff --git a/System.Web/UI/WebParts/EditorPart.cs b/System.Web/UI/WebParts/EditorPart.cs index 051143d56..66e496112 100644 --- a/System.Web/UI/WebParts/EditorPart.cs +++ b/System.Web/UI/WebParts/EditorPart.cs @@ -246,7 +246,7 @@ internal void SetZone(EditorZoneBase zone) { } /// - /// Called by the Zone when the EditorPart should sync its values because other EditorParts + /// Called by the Zone when the EditorPart should [....] its values because other EditorParts /// may have changed control properties. This is only called after all the ApplyChanges have returned. /// public abstract void SyncChanges(); diff --git a/System.Web/UI/WebParts/EditorZoneBase.cs b/System.Web/UI/WebParts/EditorZoneBase.cs index ab7ee071b..de13bd300 100644 --- a/System.Web/UI/WebParts/EditorZoneBase.cs +++ b/System.Web/UI/WebParts/EditorZoneBase.cs @@ -412,7 +412,7 @@ protected override void RenderBody(HtmlTextWriter writer) { // Mozilla renders padding on an empty TD without this attribute writer.AddStyleAttribute(HtmlTextWriterStyle.Padding, "0"); - // Add an extra row with height of 100%, to Microsoft up any extra space + // Add an extra row with height of 100%, to [....] up any extra space // if the height of the zone is larger than its contents // Mac IE needs height=100% set on instead of writer.AddStyleAttribute(HtmlTextWriterStyle.Height, "100%"); diff --git a/System.Web/UI/WebParts/ProxyWebPartConnectionCollection.cs b/System.Web/UI/WebParts/ProxyWebPartConnectionCollection.cs index 5ace8f9d8..4791f4a76 100644 --- a/System.Web/UI/WebParts/ProxyWebPartConnectionCollection.cs +++ b/System.Web/UI/WebParts/ProxyWebPartConnectionCollection.cs @@ -113,7 +113,7 @@ protected override void OnSet(int index, object oldValue, object newValue) { CheckReadOnly(); if (_webPartManager != null) { int webPartManagerIndex = _webPartManager.StaticConnections.IndexOf((WebPartConnection)oldValue); - // It is a + // It is a bug if the main WebPartManager does not contain the oldValue Debug.Assert(webPartManagerIndex >= 0); _webPartManager.StaticConnections[webPartManagerIndex] = (WebPartConnection)newValue; } diff --git a/System.Web/UI/WebParts/WebPartManager.cs b/System.Web/UI/WebParts/WebPartManager.cs index 25d9bb1c4..c5b349523 100644 --- a/System.Web/UI/WebParts/WebPartManager.cs +++ b/System.Web/UI/WebParts/WebPartManager.cs @@ -571,7 +571,7 @@ public WebPartDisplayModeCollection SupportedDisplayModes { } // Only call PermitOnly() in legacy CAS mode. In the v4 CAS model, calling PermitOnly() would prevent us from calling - // Activator.CreateInstance() on types in App_Code (assuming it is non-APTCA). (Dev10 + // Activator.CreateInstance() on types in App_Code (assuming it is non-APTCA). (Dev10 Bug 807117) private bool UsePermitOnly { get { if (!_usePermitOnly.HasValue) { @@ -1584,8 +1584,8 @@ private WebPartConnection[] ConnectionsToActivate() { StaticConnections.SetReadOnly(SR.WebPartManager_StaticConnectionsReadOnly); // The user can't directly change the DynamicConnections property since it is internal. - // Make it read-only in case we have a - + // Make it read-only in case we have a bug and try to change it after activation. + // We check the read-only status of this collection in ConnectWebParts() and DisconnectWebParts(). DynamicConnections.SetReadOnly(SR.WebPartManager_DynamicConnectionsReadOnly); return (WebPartConnection[])finalConnectionsToActivate.ToArray(typeof(WebPartConnection)); @@ -2691,7 +2691,7 @@ private static void ImportSkipTo(XmlReader reader, string elementToFind) { /// /// Never throws except for null arguments. Returns an error message in the out parameter instead. - /// [Microsoft] I investigated whether this could be refactored to share common code with + /// [[....]] I investigated whether this could be refactored to share common code with /// LoadDynamicWebPart(), but it seems the methods are too different. /// public virtual WebPart ImportWebPart(XmlReader reader, out string errorMessage) { diff --git a/System.Web/UI/WebParts/WebPartZoneBase.cs b/System.Web/UI/WebParts/WebPartZoneBase.cs index 7dc790dc4..4fd1f72fd 100644 --- a/System.Web/UI/WebParts/WebPartZoneBase.cs +++ b/System.Web/UI/WebParts/WebPartZoneBase.cs @@ -1261,7 +1261,7 @@ protected override void RenderBody(HtmlTextWriter writer) { } if (orientation == Orientation.Vertical) { - // Add an extra row with height of 100%, to Microsoft up any extra space + // Add an extra row with height of 100%, to [....] up any extra space // if the height of the zone is larger than its contents writer.RenderBeginTag(HtmlTextWriterTag.Tr); @@ -1276,7 +1276,7 @@ protected override void RenderBody(HtmlTextWriter writer) { writer.RenderEndTag(); // Tr } else { - // Add an extra cell with width of 100%, to Microsoft up any extra space + // Add an extra cell with width of 100%, to [....] up any extra space // if the width of the zone is larger than its contents. writer.AddStyleAttribute(HtmlTextWriterStyle.Width, "100%"); diff --git a/System.Web/UnsafeNativeMethods.cs b/System.Web/UnsafeNativeMethods.cs index f31af9df3..e6f404375 100644 --- a/System.Web/UnsafeNativeMethods.cs +++ b/System.Web/UnsafeNativeMethods.cs @@ -663,7 +663,7 @@ internal static extern int GetSHA1Hash(byte[] data, int dataSize, // List of functions supported by PMCallISAPI // // ATTENTION!! - // If you change this list, make sure it is in sync with the + // If you change this list, make sure it is in [....] with the // CallISAPIFunc enum in ecbdirect.h // internal enum CallISAPIFunc : int { diff --git a/System.Web/Util/AppVerifier.cs b/System.Web/Util/AppVerifier.cs index 90f6e3eec..f45390c0d 100644 --- a/System.Web/Util/AppVerifier.cs +++ b/System.Web/Util/AppVerifier.cs @@ -189,7 +189,7 @@ internal static Func WrapBeginMethodImpl(Ht bool captureBeginStack = (myBeginMask & (CallStackCollectionBitMasks)AppVerifierCollectCallStackMask) == myBeginMask; InvocationInfo beginHandlerInvocationInfo = InvocationInfo.Capture(captureBeginStack); - Uri requestUrl = null; + string requestUrl = null; RequestNotification? currentNotification = null; bool isPostNotification = false; Type httpHandlerType = null; @@ -199,7 +199,7 @@ internal static Func WrapBeginMethodImpl(Ht HttpContext context = httpApplication.Context; if (context != null) { if (!context.HideRequestResponse && context.Request != null) { - requestUrl = context.Request.Unvalidated.Url; + requestUrl = TryGetRequestUrl(context); } if (context.NotificationContext != null) { @@ -305,7 +305,7 @@ internal static Func WrapBeginMethodImpl(Ht // BeginHandler hasn't yet returned, so this call may be synchronous or asynchronous. // We can tell by comparing the current thread with the thread which called BeginHandler. // From a correctness perspective, it is valid to invoke the AsyncCallback delegate either - // synchronously or asynchronously. From Microsoft: if 'CompletedSynchronously = true', then + // synchronously or asynchronously. From [....]: if 'CompletedSynchronously = true', then // AsyncCallback invocation can happen either on the same thread or on a different thread, // just as long as BeginHandler hasn't yet returned (which in true in this case). if (!asyncResult.CompletedSynchronously) { @@ -469,14 +469,14 @@ public static Action GetSyncContextCheckDelegate(ISyncContext syncContext) /// The listener that can handle verification failures. /// A callback which performs the verification. internal static Action GetSyncContextCheckDelegateImpl(ISyncContext syncContext, Action errorHandler) { - Uri requestUrl = null; + string requestUrl = null; object originalThreadContextId = null; // collect all of the diagnostic information upfront HttpContext originalHttpContext = (syncContext != null) ? syncContext.HttpContext : null; if (originalHttpContext != null) { if (!originalHttpContext.HideRequestResponse && originalHttpContext.Request != null) { - requestUrl = originalHttpContext.Request.Unvalidated.Url; + requestUrl = TryGetRequestUrl(originalHttpContext); } // This will be used as a surrogate for the captured HttpContext so that we don't @@ -551,9 +551,9 @@ internal static Action GetRequestNotificationStatusCh // collect all of the diagnostic information upfront NotificationContext originalNotificationContext = context.NotificationContext; bool isReentry = originalNotificationContext.IsReEntry; - Uri requestUrl = null; + string requestUrl = null; if (!context.HideRequestResponse && context.Request != null) { - requestUrl = context.Request.Unvalidated.Url; + requestUrl = TryGetRequestUrl(context); } AppendAdditionalInfoDelegate appendCurrentNotificationInfo = (errorString) => { @@ -568,9 +568,9 @@ internal static Action GetRequestNotificationStatusCh assert(!isReentry, AppVerifierErrorCode.PendingProcessRequestNotificationStatusAfterCompletingNestedNotification); } else { - // Completing synchronously with pending NotificationContext means a - - + // Completing synchronously with pending NotificationContext means a bug in either user code or the pipeline. + // NotificationContext being null means we already completed asynchronously before completing synchronously. + // Both cases indicate that we have some async operations we failed to account for. assert(context.NotificationContext != null && !context.NotificationContext.PendingAsyncCompletion, AppVerifierErrorCode.RequestNotificationCompletedSynchronouslyWithNotificationContextPending); @@ -591,7 +591,7 @@ internal static Action GetRequestNotificationStatusCh /// The listener that can handle verification failures. /// The caller can provide this delegate to append additional information to the exception. Could be null. /// A callback which performs the verification. - private static AssertDelegate GetAssertDelegateImpl(Uri requestUrl, Action errorHandler, AppendAdditionalInfoDelegate appendAdditionalInfoDelegate) { + private static AssertDelegate GetAssertDelegateImpl(string requestUrl, Action errorHandler, AppendAdditionalInfoDelegate appendAdditionalInfoDelegate) { // If the condition passed to this method evaluates to false, we will raise an error to whoever is listening. return (condition, errorCode) => { long mask = 1L << (int)errorCode; @@ -650,6 +650,15 @@ private static void HandleAppVerifierException(AppVerifierException ex) { GC.KeepAlive(ex); } + private static string TryGetRequestUrl(HttpContext context) { + try { + return context.Request.EnsureRawUrl(); + } + catch (HttpException) { + return null; + } + } + internal static string PrettyPrintDelegate(Delegate del) { return PrettyPrintMemberInfo((del != null) ? del.Method : null); } diff --git a/System.Web/Util/BinaryCompatibility.cs b/System.Web/Util/BinaryCompatibility.cs index 5eb65fa44..eabc339b8 100644 --- a/System.Web/Util/BinaryCompatibility.cs +++ b/System.Web/Util/BinaryCompatibility.cs @@ -31,12 +31,14 @@ public BinaryCompatibility(FrameworkName frameworkName) { TargetsAtLeastFramework451 = (version >= VersionUtil.Framework451); TargetsAtLeastFramework452 = (version >= VersionUtil.Framework452); TargetsAtLeastFramework46 = (version >= VersionUtil.Framework46); + TargetsAtLeastFramework461 = (version >= VersionUtil.Framework461); } public bool TargetsAtLeastFramework45 { get; private set; } public bool TargetsAtLeastFramework451 { get; private set; } public bool TargetsAtLeastFramework452 { get; private set; } public bool TargetsAtLeastFramework46 { get; private set; } + public bool TargetsAtLeastFramework461 { get; private set; } public Version TargetFramework { get; private set; } diff --git a/System.Web/Util/FastPropertyAccessor.cs b/System.Web/Util/FastPropertyAccessor.cs index 661eabdff..0d3ef7d91 100644 --- a/System.Web/Util/FastPropertyAccessor.cs +++ b/System.Web/Util/FastPropertyAccessor.cs @@ -269,8 +269,8 @@ private static void GetPropertyInfo(Type type, string propertyName, out Property } declaringType = baseCheckMethodInfo.GetBaseDefinition().DeclaringType; - // DevDiv - + // DevDiv Bug 27734 + // Ignore the declaring type if it's generic if (declaringType.IsGenericType) declaringType = type; @@ -379,8 +379,8 @@ internal static object GetProperty(object target, string propName, bool inDesign return accessor.GetProperty(target); } else { - // Dev10 - + // Dev10 bug 491386 - avoid CLR code path that causes an exception when designer uses two + // assemblies of the same name at different locations FieldInfo fieldInfo = null; PropertyInfo propInfo = null; Type declaringType; @@ -419,8 +419,8 @@ internal static void SetProperty(object target, string propName, object val, boo accessor.SetProperty(target, val); } else { - // Dev10 - + // Dev10 bug 491386 - avoid CLR code path that causes an exception when designer uses two + // assemblies of the same name at different locations FieldInfo fieldInfo = null; PropertyInfo propInfo = null; Type declaringType = null; diff --git a/System.Web/Util/HttpEncoder.cs b/System.Web/Util/HttpEncoder.cs index 70362cfbc..6455f6db1 100644 --- a/System.Web/Util/HttpEncoder.cs +++ b/System.Web/Util/HttpEncoder.cs @@ -89,7 +89,7 @@ private bool CharRequiresJavaScriptEncoding(char c) { || c == '\'' // HTML-sensitive chars encoded for safety || c == '<' || c == '>' - || (c == '&' && JavaScriptEncodeAmpersand) // + || (c == '&' && JavaScriptEncodeAmpersand) // Bug Dev11 #133237. Encode '&' to provide additional security for people who incorrectly call the encoding methods (unless turned off by backcompat switch) || c == '\u0085' // newline chars (see Unicode 6.2, Table 5-1 [http://www.unicode.org/versions/Unicode6.2.0/ch05.pdf]) have to be encoded (DevDiv #663531) || c == '\u2028' || c == '\u2029'; diff --git a/System.Web/Util/ParseHttpDate.cs b/System.Web/Util/ParseHttpDate.cs index 0de88fe30..f34ba5fcd 100644 --- a/System.Web/Util/ParseHttpDate.cs +++ b/System.Web/Util/ParseHttpDate.cs @@ -92,7 +92,7 @@ static int make_month(string s, int startIndex) } else if ( monthIndex == (sbyte) 'R' ) { // - // if s[1] is 'a' then Microsoft, if 'p' then April + // if s[1] is 'a' then [....], if 'p' then April // if ( s_monthIndexTable[(s[1 + startIndex]-0x40) & 0x3f] == (sbyte) 'A' ) { diff --git a/System.Web/Util/RegexUtil.cs b/System.Web/Util/RegexUtil.cs new file mode 100644 index 000000000..b856b90e0 --- /dev/null +++ b/System.Web/Util/RegexUtil.cs @@ -0,0 +1,83 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Text.RegularExpressions; + +namespace System.Web.Util { + internal class RegexUtil { + + // this method is for the regex match which accepts the pattern from developer + // since asp.net doesn't have control of the regex pattern string and it is possible + // to take more than 2 sec to match a string, give developer option to set timeout value + public static bool IsMatch(string stringToMatch, string pattern, RegexOptions regOption, int? timeoutInMillsec) { + int timeout = GetRegexTimeout(timeoutInMillsec); + + if (timeout > 0 || timeoutInMillsec.HasValue) { + return Regex.IsMatch(stringToMatch, pattern, regOption, TimeSpan.FromMilliseconds((double)timeout)); + } else { + return Regex.IsMatch(stringToMatch, pattern, regOption); + } + } + + public static Match Match(string stringToMatch, string pattern, RegexOptions regOption, int? timeoutInMillsec) { + int timeout = GetRegexTimeout(timeoutInMillsec); + + if (timeout > 0 || timeoutInMillsec.HasValue) { + return Regex.Match(stringToMatch, pattern, regOption, TimeSpan.FromMilliseconds((double)timeout)); + } else { + return Regex.Match(stringToMatch, pattern, regOption); + } + } + + public static Regex CreateRegex(string pattern, RegexOptions option, int? timeoutInMillsec) { + int timeout = GetRegexTimeout(timeoutInMillsec); + + if (timeout > 0 || timeoutInMillsec.HasValue) { + return new Regex(pattern, option, TimeSpan.FromMilliseconds((double)timeout)); + } else { + return new Regex(pattern, option); + } + } + + // This method is for the regex asp.net controls the regex pattern and it should NOT take longer than 2 secs to match the string + // so no need for developer to specify a timeout value + internal static Regex CreateRegex(string pattern, RegexOptions option) { + return CreateRegex(pattern, option, null); + } + + private static bool? _isRegexTimeoutSetInAppDomain; + private static bool IsRegexTimeoutSetInAppDomain { + get { + if (!_isRegexTimeoutSetInAppDomain.HasValue) { + bool timeoutSetInAppDomain = false; + try { + timeoutSetInAppDomain = AppDomain.CurrentDomain.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") != null; + } catch { + } + _isRegexTimeoutSetInAppDomain = timeoutSetInAppDomain; + } + return _isRegexTimeoutSetInAppDomain.Value; + } + } + + private static int GetRegexTimeout(int? timeoutInMillsec) { + int timeout = -1; + + // here is the logic for using timeout in regex + // 1. if the caller sets a timeout value, then we use it(this may cause Regex throw ArgumentOutOfRangeException, + // but developer will know what they need to do when seeing the exception) + // 2. if there is global setting in AppDomain, we do nothing(leave it to Regex to handle the timeout) + // 3. if the web app targets to 4.6.1+, then we set 2 secs timeout + if (timeoutInMillsec.HasValue) { + timeout = timeoutInMillsec.Value; + } else { + if (!IsRegexTimeoutSetInAppDomain && BinaryCompatibility.Current.TargetsAtLeastFramework461) { + timeout = 2000; + } + } + return timeout; + } + } +} diff --git a/System.Web/Util/SecUtil.cs b/System.Web/Util/SecUtil.cs index 567446cea..9a104eabb 100644 --- a/System.Web/Util/SecUtil.cs +++ b/System.Web/Util/SecUtil.cs @@ -215,6 +215,17 @@ internal static int GetIntValue(NameValueCollection config, string valueName, in return iValue; } + internal static int? GetNullableIntValue(NameValueCollection config, string valueName) { + int iValue; + string sValue = config[valueName]; + + if (sValue == null || !Int32.TryParse(sValue, out iValue)) { + return null; + } + + return iValue; + } + #if !FEATURE_PAL // internal static void CheckSchemaVersion(ProviderBase provider, SqlConnection connection, string[] features, string version, ref int schemaVersionCheck) { if (connection == null) { diff --git a/System.Web/Util/UriUtil.cs b/System.Web/Util/UriUtil.cs index dd62049e9..091076e02 100644 --- a/System.Web/Util/UriUtil.cs +++ b/System.Web/Util/UriUtil.cs @@ -165,7 +165,7 @@ internal static bool TrySplitUriForPathEncode(string input, out string schemeAnd // For example, the "//" could be missing, or there could be "///" as in "file:///C:\foo.txt" // To retain the same string as originally given, find the authority in the original url and include // everything up to that. - int authorityIndex = inputWithoutQueryFragment.IndexOf(authority, StringComparison.Ordinal); + int authorityIndex = inputWithoutQueryFragment.IndexOf(authority, StringComparison.OrdinalIgnoreCase); if (authorityIndex != -1) { int schemeAndAuthorityLength = authorityIndex + authority.Length; schemeAndAuthority = inputWithoutQueryFragment.Substring(0, schemeAndAuthorityLength); diff --git a/System.Web/Util/VersionUtil.cs b/System.Web/Util/VersionUtil.cs index a28855bd9..5d485eabb 100644 --- a/System.Web/Util/VersionUtil.cs +++ b/System.Web/Util/VersionUtil.cs @@ -23,6 +23,7 @@ internal static class VersionUtil { public static readonly Version Framework451 = new Version(4, 5, 1); public static readonly Version Framework452 = new Version(4, 5, 2); public static readonly Version Framework46 = new Version(4, 6); + public static readonly Version Framework461 = new Version(4, 6, 1); // Convenience accessor for the "default" framework version; various configuration // switches can use this as a default value. This value must only be bumped during diff --git a/System.Web/WebSockets/AspNetWebSocket.cs b/System.Web/WebSockets/AspNetWebSocket.cs index 64b6f9552..742ac821b 100644 --- a/System.Web/WebSockets/AspNetWebSocket.cs +++ b/System.Web/WebSockets/AspNetWebSocket.cs @@ -489,8 +489,8 @@ internal static void ValidateCloseStatusCodeAndDescription(WebSocketCloseStatus } if (closeStatus == WebSocketCloseStatus.Empty) { - // Fix - + // Fix Bug : 312472, we would like to allow empty strings to be passed to our APIs when status code is 1005. + // Since WSPC requires the statusDescription to be null, we convert. if (statusDescription == String.Empty) { statusDescription = null; } diff --git a/System.Web/httpserverutility.cs b/System.Web/httpserverutility.cs index 54ea1bc16..0b4299665 100644 --- a/System.Web/httpserverutility.cs +++ b/System.Web/httpserverutility.cs @@ -492,7 +492,7 @@ private void ExecuteInternal(IHttpHandler handler, TextWriter writer, bool prese targetPage.SmartNavigation = true; #pragma warning restore 0618 - // If the target page is async need to save/restore sync context + // If the target page is async need to save/restore [....] context if (targetPage is IHttpAsyncHandler) { savedSyncContext = _context.InstallNewAspNetSynchronizationContext(); } diff --git a/System.Web/misc/SecurityUtils.cs b/System.Web/misc/SecurityUtils.cs index 159dedbb6..76e02fafb 100644 --- a/System.Web/misc/SecurityUtils.cs +++ b/System.Web/misc/SecurityUtils.cs @@ -8,11 +8,11 @@ */ -#if Microsoft_NAMESPACE +#if WINFORMS_NAMESPACE namespace System.Windows.Forms #elif DRAWING_NAMESPACE namespace System.Drawing -#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY +#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY namespace System.Internal #elif SYSTEM_NAMESPACE namespace System @@ -127,7 +127,7 @@ internal static object SecureCreateInstance(Type type, object[] args, bool allow return Activator.CreateInstance(type, flags, null, args, null); } -#if (!Microsoft_NAMESPACE) +#if (!WINFORMS_NAMESPACE) /// /// This helper method provides safe access to Activator.CreateInstance. diff --git a/System.Workflow.Activities/Common/BasePropertyDescriptor.cs b/System.Workflow.Activities/Common/BasePropertyDescriptor.cs index 6217eb687..edf00c3bb 100644 --- a/System.Workflow.Activities/Common/BasePropertyDescriptor.cs +++ b/System.Workflow.Activities/Common/BasePropertyDescriptor.cs @@ -22,7 +22,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\BasePropertyDescriptor.cs *********************************************************************/ @@ -414,8 +414,8 @@ public override string Name { if (this.avoidDuplication) { - // WinOE - + // WinOE Bug 10442: should only prefix with "(Parameter)" if there is and existing + // member of the same name. return GetParameterPropertyName(this.componentType, base.Name); } else diff --git a/System.Workflow.Activities/Common/CompModHelpers.cs b/System.Workflow.Activities/Common/CompModHelpers.cs index 904f2cb30..cc6b22aba 100644 --- a/System.Workflow.Activities/Common/CompModHelpers.cs +++ b/System.Workflow.Activities/Common/CompModHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\CompModHelpers.cs *********************************************************************/ @@ -1169,10 +1169,10 @@ internal static Activity ParseActivityForBind(Activity context, string activityN Guid parentContextGuid = GetRuntimeContextGuid(parentContextActivity); while (activity == null && declaringContextGuid != currentContextGuid) { - // WinOE - - - + // WinOE Bug 17931: if the context id is different, it means that this activity is running in a child context (such as + // the children of a replicator or a while). we need to resolve the activity within the child context + // first. If we go up to the declaring activity, we'd be finding children of the template instead of + // the actual running instance. while (parentContextActivity != null && parentContextGuid == currentContextGuid) { currentContextActivity = parentContextActivity; @@ -1395,10 +1395,10 @@ public void OnComponentChanged() } #endregion - // This class has been added as a fix for - - - + // This class has been added as a fix for bug 18214 in order to + // create an independent code-path for debugger's use of ParseActivity functionality. + // The GetActivity method of this class uses QualifiedName instead of Name property + // for finding activities. internal static class DebuggerHelpers { [SuppressMessage("Microsoft.Globalization", "CA1307:SpecifyStringComparison", Justification = "IndexOf(\".\") not a security issue.")] diff --git a/System.Workflow.Activities/Common/CompilerHelpers.cs b/System.Workflow.Activities/Common/CompilerHelpers.cs index 27ec4c11f..d02d9fe91 100644 --- a/System.Workflow.Activities/Common/CompilerHelpers.cs +++ b/System.Workflow.Activities/Common/CompilerHelpers.cs @@ -10,7 +10,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\CompilerHelpers.cs *********************************************************************/ diff --git a/System.Workflow.Activities/Common/DelegateTypeInfo.cs b/System.Workflow.Activities/Common/DelegateTypeInfo.cs index a7f911669..c3667ac5b 100644 --- a/System.Workflow.Activities/Common/DelegateTypeInfo.cs +++ b/System.Workflow.Activities/Common/DelegateTypeInfo.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\DelegateTypeInfo.cs *********************************************************************/ diff --git a/System.Workflow.Activities/Common/NativeMethods.cs b/System.Workflow.Activities/Common/NativeMethods.cs index 8870aea03..38e72c5ab 100644 --- a/System.Workflow.Activities/Common/NativeMethods.cs +++ b/System.Workflow.Activities/Common/NativeMethods.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\NativeMethods.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/System.Workflow.Activities/Common/TypeSystemHelpers.cs b/System.Workflow.Activities/Common/TypeSystemHelpers.cs index d8cc8d986..caa3bbcf2 100644 --- a/System.Workflow.Activities/Common/TypeSystemHelpers.cs +++ b/System.Workflow.Activities/Common/TypeSystemHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\TypeSystemHelpers.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/System.Workflow.Activities/Common/ValidationHelpers.cs b/System.Workflow.Activities/Common/ValidationHelpers.cs index 65a902590..b0ada5fd4 100644 --- a/System.Workflow.Activities/Common/ValidationHelpers.cs +++ b/System.Workflow.Activities/Common/ValidationHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\ValidationHelpers.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/System.Workflow.Activities/Common/Walker.cs b/System.Workflow.Activities/Common/Walker.cs index 7e450ac2b..9bd77fe7e 100644 --- a/System.Workflow.Activities/Common/Walker.cs +++ b/System.Workflow.Activities/Common/Walker.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\Walker.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/System.Workflow.Activities/Common/userdatakeys.cs b/System.Workflow.Activities/Common/userdatakeys.cs index b2a5a7a33..96aeacd92 100644 --- a/System.Workflow.Activities/Common/userdatakeys.cs +++ b/System.Workflow.Activities/Common/userdatakeys.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Common\Shared - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Common\Shared\userdatakeys.cs *********************************************************************/ namespace System.Workflow.Activities.Common diff --git a/System.Workflow.Activities/CorrelationValidator.cs b/System.Workflow.Activities/CorrelationValidator.cs index 8d2add81b..b7c11d49d 100644 --- a/System.Workflow.Activities/CorrelationValidator.cs +++ b/System.Workflow.Activities/CorrelationValidator.cs @@ -840,7 +840,7 @@ internal static ValidationErrorCollection Validate(ValidationManager manager, Ob //This is a work around for delgates of unbounded generic type. There is no support //in file code model for these so we dont support it for now. The only way //to detect if the DesignTimeEventInfo has EventHandler of unbounded generic type - //is to check if we get the methods correctly here Ref + //is to check if we get the methods correctly here Ref Bug#17783 EventInfo eventInfo = interfaceType.GetEvent(operation); if (eventInfo == null || eventInfo.GetAddMethod(true) == null) { diff --git a/System.Workflow.Activities/Delay.cs b/System.Workflow.Activities/Delay.cs index aebbe257d..be0a25e03 100644 --- a/System.Workflow.Activities/Delay.cs +++ b/System.Workflow.Activities/Delay.cs @@ -349,8 +349,8 @@ void IEventActivity.Unsubscribe(ActivityExecutionContext parentContext, IActivit if (wfQueue != null && wfQueue.Count != 0) wfQueue.Dequeue(); - // WinOE - + // WinOE Bug 16929: In the case of dynamic update, if this activity is being removed, + // we can not trace back to the root activity from "this". Activity root = parentContext.Activity; while (root.Parent != null) root = root.Parent; diff --git a/System.Workflow.Activities/LocalService/CorrelationService.cs b/System.Workflow.Activities/LocalService/CorrelationService.cs index 4d06e1f09..f5df33064 100644 --- a/System.Workflow.Activities/LocalService/CorrelationService.cs +++ b/System.Workflow.Activities/LocalService/CorrelationService.cs @@ -197,13 +197,13 @@ private static void ValidateCorrelation(ICollection initial IComparable initializerValue = initializerValues.Current.Value as IComparable; object followerValue = followerValues.Current.Value; - // - - - - - - + // Bug DevDiv2\DevDiv 552322 - http://vstfdevdiv.redmond.corp.microsoft.com:8080/DevDiv2/DevDiv/_workitems#_a=edit&id=552322 + // Reflection does not guarantee ordering, so the two collections (arrays) of + // CorrelationProperties may not be in the same order, based on Name. So we need to check all the + // elements of the followerProperties for the Name of the current initializerValue. + // The collections MIGHT be in the same order. Before searching the followerProperties collection for an element with a matching + // name, see if the current element in the initializerValues and followerValues enumerators have a matching name. + // If they do match, just fall thru because followerValue is already set to followerValues.Current.Value; if (!initializerValues.Current.Name.Equals(followerValues.Current.Name, StringComparison.OrdinalIgnoreCase)) { CorrelationProperty followerProperty = null; diff --git a/System.Workflow.Activities/LocalService/FollowerQueueCreator.cs b/System.Workflow.Activities/LocalService/FollowerQueueCreator.cs index 3db7b1ea9..a9088872f 100644 --- a/System.Workflow.Activities/LocalService/FollowerQueueCreator.cs +++ b/System.Workflow.Activities/LocalService/FollowerQueueCreator.cs @@ -1,4 +1,4 @@ -#region Using directives +#region Using directives using System; using System.Diagnostics; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Activity.cs b/System.Workflow.ComponentModel/AuthoringOM/Activity.cs index 01f8711a9..b7fb7591d 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Activity.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Activity.cs @@ -911,7 +911,7 @@ private Activity ResolveActivityByName(string activityQualifiedName, bool within } else if (!this.DesignMode) { - // WinOE + // WinOE Bug 20584: Fix this for dynamic updates only. See bug description for details. CompositeActivity parent = (withinThisActivityOnly ? this : this.RootActivity) as CompositeActivity; if (parent != null) { diff --git a/System.Workflow.ComponentModel/AuthoringOM/ActivityExecutor.cs b/System.Workflow.ComponentModel/AuthoringOM/ActivityExecutor.cs index b58bbb630..4ee980c8c 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/ActivityExecutor.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/ActivityExecutor.cs @@ -127,9 +127,9 @@ void ISupportWorkflowChanges.OnWorkflowChangesCompleted(ActivityExecutionContext compositeActivity.OnWorkflowChangesCompleted(executionContext); } - // Refer - - + // Refer Bug 9339 (VB Compilation Failure - Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information.) + //An unhandled exception of type 'System.TypeLoadException' occurred + // "Signature of the body and declaration in a method implementation do not match" protected override ActivityExecutionStatus Execute(T activity, ActivityExecutionContext executionContext) { return base.Execute(activity, executionContext); diff --git a/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/DesignTimeType.cs b/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/DesignTimeType.cs index b60ee98da..32eec08bf 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/DesignTimeType.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/DesignTimeType.cs @@ -1115,15 +1115,15 @@ private List GetCodeDomMembers() return memberCollection; } - // CFx - - - - - - - - + // CFx bug 461 + // The code dom being generated by VsCodeDomParser.cs does not + // add default constructors for classes unless they + // exist in the source code. Unfortunately, this cannot be easily + // fixed in the CodeDomParser because the code dom returned by that + // class is expected to kept in [....] with the real source code. + // So we cannot "fabricate" a default constructor there without + // breaking lots of assumptions elsewhere in the code. + // Instead, we add a default constructor here, if necessary. private List GetCodeDomConstructors() { List constructors = GetCodeDomMembers(); diff --git a/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/TypeProvider.cs b/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/TypeProvider.cs index 1ea88cabe..95e9dd8b7 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/TypeProvider.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Compiler/TypeSystem/TypeProvider.cs @@ -463,12 +463,12 @@ public Type GetType(string name, bool throwOnError) } // replace the System.Type with RTTypeWrapper for generic types. - // WinOE - - - - - + // WinOE Bug 16560: The type provider may be used at runtime. No RTTypeWrapper should ever be returned + // at runtime. + // At design time, we need to wrap all generic types even if the parameter types are not + // design time types. This is because our parsing function creates a base generic type before it binds + // all the parameters. The RTTypeWrapper.MakeGenericType override will then take care of binding to + // design time types. if (this.designTimeTypes != null && this.designTimeTypes.Count > 0 && returnType.Assembly != null && returnType.IsGenericTypeDefinition) { if (this.hashOfRTTypes.Contains(returnType)) diff --git a/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompiler.cs b/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompiler.cs index 7ad8751fd..72e030664 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompiler.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompiler.cs @@ -683,8 +683,8 @@ public WorkflowCompilerResults Compile(WorkflowCompilerParameters parameters, st parameters.LocalAssembly = GenerateLocalAssembly(files, codeFiles, parameters, results, out intermediateTempFiles, out localAssemblyPath, out createdDirectoryName); if (parameters.LocalAssembly != null) { - // WinOE - + // WinOE Bug 17591: we must set the local assembly here, + // otherwise, the resolver won't be able to resolve custom types correctly. resolver.SetLocalAssembly(parameters.LocalAssembly); // Work around HERE!!! diff --git a/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompilerHelpers.cs b/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompilerHelpers.cs index d9e3a1d7a..ceb085c28 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompilerHelpers.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Compiler/XomlCompilerHelpers.cs @@ -104,7 +104,7 @@ internal static void InternalCompileFromDomBatch(string[] files, string[] codeFi } // In case of VB, if the ctor is autogenerated the PDB will not have symbol - // information. Use InitializeComponent method as the fallback. + // information. Use InitializeComponent method as the fallback. Bug 19085. if (String.IsNullOrEmpty(fileName)) { MethodInfo initializeComponent = type.GetMethod("InitializeComponent", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance, null, Type.EmptyTypes, null); diff --git a/System.Workflow.ComponentModel/AuthoringOM/DependencyProperty.cs b/System.Workflow.ComponentModel/AuthoringOM/DependencyProperty.cs index 16fa06d53..b4bc498aa 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/DependencyProperty.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/DependencyProperty.cs @@ -178,7 +178,7 @@ private static DependencyProperty ValidateAndRegister(string name, System.Type p FieldInfo fieldInfo = null; bool isEvent = (typeof(System.Delegate).IsAssignableFrom(propertyType) && (defaultMetadata == null || (defaultMetadata.Options & DependencyPropertyOptions.DelegateProperty) == 0)); - // WinOE + // WinOE Bug 13807: events can not be meta properties. if (isEvent && defaultMetadata != null && defaultMetadata.IsMetaProperty) throw new ArgumentException(SR.GetString(SR.Error_DPAddHandlerMetaProperty), "defaultMetadata"); diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/CommandSet.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/CommandSet.cs index 27a55ac98..d621aec24 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/CommandSet.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/CommandSet.cs @@ -80,7 +80,7 @@ public CommandSet(IServiceProvider serviceProvider) // Properties new CommandSetItem(new EventHandler(OnStatusAlways), new EventHandler(OnMenuDesignerProperties), WorkflowMenuCommands.DesignerProperties), - // IMPORTANT: Microsoft does not handle this command, so VS.NET sends it to solution explorer + // IMPORTANT: [....] does not handle this command, so VS.NET sends it to solution explorer // window, which enables this meu item on the for the current file node new CommandSetItem(new EventHandler(OnStatusAlways), new EventHandler(OnViewCode), new CommandID(StandardCommands.Cut.Guid, 333)), @@ -563,7 +563,7 @@ private bool SendKeyDownCommand(Keys key) WorkflowView view = rootDesigner.GetView(ViewTechnology.Default) as WorkflowView; if (view != null) { - //because the some key presses are not coming into the Microsoft OnKeyDown + //because the some key presses are not coming into the [....] OnKeyDown //we need to do this work around to manually send the keypress into the designer KeyEventArgs eventArgs = new KeyEventArgs(key); diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/CompositeActivityDesigner.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/CompositeActivityDesigner.cs index bbbb984c1..1b29bfee5 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/CompositeActivityDesigner.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/CompositeActivityDesigner.cs @@ -764,7 +764,7 @@ public virtual bool CanInsertActivities(HitTestInfo insertLocation, ReadOnlyColl return false; ActivityDesigner designerToInsert = null; -#pragma warning disable 56506// +#pragma warning disable 56506//bug in presharp, activity has already been checked for null value if (activity.Site != null) { //get an existing designer @@ -787,7 +787,7 @@ public virtual bool CanInsertActivities(HitTestInfo insertLocation, ReadOnlyColl activity.UserData[typeof(ActivityDesigner)] = designerToInsert; } } -#pragma warning restore 56506// +#pragma warning restore 56506//bug in presharp if (designerToInsert == null) return false; @@ -1024,8 +1024,8 @@ public virtual void RemoveActivities(ReadOnlyCollection activitiesToRe //For details look at, //\\cpvsbuild\drops\whidbey\pd6\raw\40903.19\sources\ndp\fx\src\Designer\Host\UndoEngine.cs //OnComponentRemoving function which retains the references we hold to the parent - //This - + //This bug can be reproed by deleting a compositeactivity from design surface and then doing an undo + //VSWhidbey #312230 activity.SetParent(null); if (activity is CompositeActivity) { diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/CustomActivityDesigner.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/CustomActivityDesigner.cs index 937d53422..f77c81369 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/CustomActivityDesigner.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/CustomActivityDesigner.cs @@ -725,14 +725,14 @@ internal sealed class CustomProperty private string category; private string description; private DesignerSerializationVisibility designerSerializationVisibility = DesignerSerializationVisibility.Visible; - // NOTE: we don't write the ValidationOption attribute anymore (WinOE - - - - - - - + // NOTE: we don't write the ValidationOption attribute anymore (WinOE Bug 17398). We have removed our property creation + // dialog in beta1. Now this code is only used for property promotion. If the promoted property is a meta property, + // it can not be bindable so no promotion is not allowed. If the property is an instance property, this attribute is ignored. + // There is no reason for writing out this attribute anymore.We just remove it from property promotion all together. + // NOTE II: for the same reason that this code is only used for promotion, we don't write out meta properties anymore. + // We had customized the CodeDomSerializer.Deserialize to recognize meta properties by inspecting the field init expression, + // which is no long needed. If we were to bring this functionality back in the future, sample code can be found + // from the file history in Source Depot. private bool isEvent = false; private bool browseable = true; private bool hidden = false; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/ThemeConfigurationDialog.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/ThemeConfigurationDialog.cs index ad60d2bfc..aa9a5ced9 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/ThemeConfigurationDialog.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/ThemeConfigurationDialog.cs @@ -25,7 +25,7 @@ namespace System.Workflow.ComponentModel.Design [Obsolete("The System.Workflow.* types are deprecated. Instead, please use the new types from System.Activities.*")] public sealed class ThemeConfigurationDialog : System.Windows.Forms.Form { - #region Microsoft Generated Members + #region [....] Generated Members private System.Windows.Forms.Button button3; private System.Windows.Forms.TreeView designerTreeView; private System.Windows.Forms.Label themeNameLabel; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/TypeBrowserDialog.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/TypeBrowserDialog.cs index a73a938fa..9ee70afdc 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/TypeBrowserDialog.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/TypeBrowserDialog.cs @@ -1230,7 +1230,7 @@ internal void UpdateHelpText(Type selectedType) catch (NullReferenceException) { // Work around: for some reason RuntimeType.Namespace throws exception for array of generic - // Remove the try-catch when the + // Remove the try-catch when the bug is fixed. } keywords[1] = "{" + keywords[1] + "}"; keywords[2] = (selectedType.Assembly != null) ? selectedType.Assembly.GetName().FullName : ""; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/WorkflowPageSetupDialog.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/WorkflowPageSetupDialog.cs index 0c0d1897e..57f8cb537 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/WorkflowPageSetupDialog.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/Dialogs/WorkflowPageSetupDialog.cs @@ -14,7 +14,7 @@ namespace System.Workflow.ComponentModel.Design [Obsolete("The System.Workflow.* types are deprecated. Instead, please use the new types from System.Activities.*")] public sealed class WorkflowPageSetupDialog : System.Windows.Forms.Form { - #region Microsoft Desiger Generated Members + #region [....] Desiger Generated Members private System.ComponentModel.Container components = null; private System.Windows.Forms.TabControl tabs; private System.Windows.Forms.PictureBox landscapePicture; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/MenuCommands.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/MenuCommands.cs index c8701dd8f..9d07b2e10 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/MenuCommands.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/MenuCommands.cs @@ -60,7 +60,7 @@ public sealed class WorkflowMenuCommands : StandardCommands private const int cmdidWOEShowAll = 0x3107; public const int FirstZoomCommand = cmdidWOEZoom400; //the first and last zoom commands - public const int LastZoomCommand = cmdidWOEShowAll; //should be in sync with the \private\Core\Tools\OrchestrationDesignerUI\PkgCmdID.h + public const int LastZoomCommand = cmdidWOEShowAll; //should be in [....] with the \private\Core\Tools\OrchestrationDesignerUI\PkgCmdID.h // page layout private const int cmdidDefaultPage = 0x3110; diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/ReferenceService.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/ReferenceService.cs index a2ca29c6a..14e64a3ae 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/ReferenceService.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/ReferenceService.cs @@ -64,7 +64,7 @@ private void EnsureReferences() { // If the references are null, create them for the first time and connect // up our events to listen to changes to the container. Otherwise, check to - // see if the added or removed lists contain anything for us to sync up. + // see if the added or removed lists contain anything for us to [....] up. // if (this.references == null) { diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/StructuredCompositeActivityDesigner.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/StructuredCompositeActivityDesigner.cs index ed7ed08ff..0decc066f 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/StructuredCompositeActivityDesigner.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/StructuredCompositeActivityDesigner.cs @@ -150,7 +150,7 @@ public DesignerView ActiveView //activities with errors we want to reveal these activities DesignerHelpers.RefreshDesignerActions(Activity.Site); - //Keep the dynamic action and designer verbs in sync + //Keep the dynamic action and designer verbs in [....] RefreshDesignerVerbs(); } } diff --git a/System.Workflow.ComponentModel/AuthoringOM/Design/WorkflowView.cs b/System.Workflow.ComponentModel/AuthoringOM/Design/WorkflowView.cs index 6a3dac250..1b8a6df80 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/Design/WorkflowView.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/Design/WorkflowView.cs @@ -181,7 +181,7 @@ public WorkflowView(IServiceProvider serviceProvider) //Initialize the tooltip shown this.workflowToolTip = new WorkflowToolTip(this); - //Sync the global theme change event, which is fired by the theme infrastructure for theme change + //[....] the global theme change event, which is fired by the theme infrastructure for theme change WorkflowTheme.ThemeChanged += new EventHandler(OnThemeChange); //Create the core message filters @@ -1497,7 +1497,7 @@ private void OnSelectionChanged(object sender, EventArgs e) //To enable this functionality please note that selection change is not a good event as it will get //fired in multiple cases, instead we should add a event in extended ui service which will do this and move //the following code in the event handler of that event - //Ref + //Ref Bug#3925 if (RootDesigner != null && RootDesigner.Activity != null) { diff --git a/System.Workflow.ComponentModel/AuthoringOM/ScheduleChanges.cs b/System.Workflow.ComponentModel/AuthoringOM/ScheduleChanges.cs index 4f767edf0..efc369bad 100644 --- a/System.Workflow.ComponentModel/AuthoringOM/ScheduleChanges.cs +++ b/System.Workflow.ComponentModel/AuthoringOM/ScheduleChanges.cs @@ -201,8 +201,8 @@ internal void ApplyTo(Activity activity) { foreach (Activity contextActivity in contextActivities) { - // WinOE - + // WinOE Bug 16903: Ask the contextActivity itself whether or not it can be removed. + // An activity can not be removed if it's in the executing mode. if (changeAction is RemovedActivityAction && contextActivity.DottedPath == ((RemovedActivityAction)changeAction).OriginalRemovedActivity.DottedPath) validationErrors.AddRange(changeAction.ValidateChanges(contextActivity)); diff --git a/System.Workflow.ComponentModel/Shared/BasePropertyDescriptor.cs b/System.Workflow.ComponentModel/Shared/BasePropertyDescriptor.cs index 532c3d76d..edb21a0ab 100644 --- a/System.Workflow.ComponentModel/Shared/BasePropertyDescriptor.cs +++ b/System.Workflow.ComponentModel/Shared/BasePropertyDescriptor.cs @@ -21,7 +21,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\BasePropertyDescriptor.cs *********************************************************************/ @@ -413,8 +413,8 @@ public override string Name { if (this.avoidDuplication) { - // WinOE - + // WinOE Bug 10442: should only prefix with "(Parameter)" if there is and existing + // member of the same name. return GetParameterPropertyName(this.componentType, base.Name); } else diff --git a/System.Workflow.ComponentModel/Shared/CompModHelpers.cs b/System.Workflow.ComponentModel/Shared/CompModHelpers.cs index 1e5a102e2..2183def57 100644 --- a/System.Workflow.ComponentModel/Shared/CompModHelpers.cs +++ b/System.Workflow.ComponentModel/Shared/CompModHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\CompModHelpers.cs *********************************************************************/ namespace System.Workflow.ComponentModel.Design @@ -1167,10 +1167,10 @@ internal static Activity ParseActivityForBind(Activity context, string activityN Guid parentContextGuid = GetRuntimeContextGuid(parentContextActivity); while (activity == null && declaringContextGuid != currentContextGuid) { - // WinOE - - - + // WinOE Bug 17931: if the context id is different, it means that this activity is running in a child context (such as + // the children of a replicator or a while). we need to resolve the activity within the child context + // first. If we go up to the declaring activity, we'd be finding children of the template instead of + // the actual running instance. while (parentContextActivity != null && parentContextGuid == currentContextGuid) { currentContextActivity = parentContextActivity; @@ -1393,10 +1393,10 @@ public void OnComponentChanged() } #endregion - // This class has been added as a fix for - - - + // This class has been added as a fix for bug 18214 in order to + // create an independent code-path for debugger's use of ParseActivity functionality. + // The GetActivity method of this class uses QualifiedName instead of Name property + // for finding activities. internal static class DebuggerHelpers { [SuppressMessage("Microsoft.Globalization", "CA1307:SpecifyStringComparison", Justification = "IndexOf(\".\") not a security issue.")] diff --git a/System.Workflow.ComponentModel/Shared/CompilerHelpers.cs b/System.Workflow.ComponentModel/Shared/CompilerHelpers.cs index 437248e7e..c6dceb5b0 100644 --- a/System.Workflow.ComponentModel/Shared/CompilerHelpers.cs +++ b/System.Workflow.ComponentModel/Shared/CompilerHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\CompilerHelpers.cs *********************************************************************/ diff --git a/System.Workflow.ComponentModel/Shared/DelegateTypeInfo.cs b/System.Workflow.ComponentModel/Shared/DelegateTypeInfo.cs index 3539c96ed..01603ca74 100644 --- a/System.Workflow.ComponentModel/Shared/DelegateTypeInfo.cs +++ b/System.Workflow.ComponentModel/Shared/DelegateTypeInfo.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\DelegateTypeInfo.cs *********************************************************************/ namespace System.Workflow.ComponentModel diff --git a/System.Workflow.ComponentModel/Shared/NativeMethods.cs b/System.Workflow.ComponentModel/Shared/NativeMethods.cs index cfd5e0e81..f6e921b5f 100644 --- a/System.Workflow.ComponentModel/Shared/NativeMethods.cs +++ b/System.Workflow.ComponentModel/Shared/NativeMethods.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\NativeMethods.cs *********************************************************************/ namespace System.Workflow.Interop diff --git a/System.Workflow.ComponentModel/Shared/TypeSystemHelpers.cs b/System.Workflow.ComponentModel/Shared/TypeSystemHelpers.cs index 896ddf1cd..9b53df5ee 100644 --- a/System.Workflow.ComponentModel/Shared/TypeSystemHelpers.cs +++ b/System.Workflow.ComponentModel/Shared/TypeSystemHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\TypeSystemHelpers.cs *********************************************************************/ namespace System.Workflow.ComponentModel.Compiler diff --git a/System.Workflow.ComponentModel/Shared/ValidationHelpers.cs b/System.Workflow.ComponentModel/Shared/ValidationHelpers.cs index 6f80c6056..a93a3d061 100644 --- a/System.Workflow.ComponentModel/Shared/ValidationHelpers.cs +++ b/System.Workflow.ComponentModel/Shared/ValidationHelpers.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\ValidationHelpers.cs *********************************************************************/ namespace System.Workflow.ComponentModel.Compiler diff --git a/System.Workflow.ComponentModel/Shared/Walker.cs b/System.Workflow.ComponentModel/Shared/Walker.cs index 1a8c8858e..e47e60f1c 100644 --- a/System.Workflow.ComponentModel/Shared/Walker.cs +++ b/System.Workflow.ComponentModel/Shared/Walker.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\Walker.cs *********************************************************************/ namespace System.Workflow.ComponentModel diff --git a/System.Workflow.ComponentModel/Shared/XomlSerializationHelpers.cs b/System.Workflow.ComponentModel/Shared/XomlSerializationHelpers.cs index 90a6b6c5e..8407e6098 100644 --- a/System.Workflow.ComponentModel/Shared/XomlSerializationHelpers.cs +++ b/System.Workflow.ComponentModel/Shared/XomlSerializationHelpers.cs @@ -207,11 +207,11 @@ internal static CodeNamespaceCollection GenerateCodeFromXomlDocument(Activity ro continue; if (codeDomProvider.IsValidIdentifier(codeDomSerializationManager.GetName(activity))) { - // WinOE - - - - + // WinOE Bug 14561. This is to fix a performance problem. When an activity is added to the activity + // tree at the runtime, it's much faster if the ID of the activity is already set. The code that + // the CodeDomSerializer generates will add the activity first before it sets the ID for the child + // activity. We can change that order by always serializing the children first. Therefore, we + // construct a list where we guarantee that the child will be serialized before its parent. allActivities.Insert(0, activity); } else diff --git a/System.Workflow.ComponentModel/Shared/userdatakeys.cs b/System.Workflow.ComponentModel/Shared/userdatakeys.cs index 3afb84b96..9812b64d2 100644 --- a/System.Workflow.ComponentModel/Shared/userdatakeys.cs +++ b/System.Workflow.ComponentModel/Shared/userdatakeys.cs @@ -9,7 +9,7 @@ /********************************************************************* * NOTE: A copy of this file exists at: WF\Activities\Common - * The two files must be kept in sync. Any change made here must also + * The two files must be kept in [....]. Any change made here must also * be made to WF\Activities\Common\UserDataKeys.cs *********************************************************************/ namespace System.Workflow.ComponentModel diff --git a/System.Workflow.Runtime/DebugEngine/DebugController.cs b/System.Workflow.Runtime/DebugEngine/DebugController.cs index 3a040d71d..3515b4383 100644 --- a/System.Workflow.Runtime/DebugEngine/DebugController.cs +++ b/System.Workflow.Runtime/DebugEngine/DebugController.cs @@ -880,7 +880,7 @@ private void OnWorkflowChanged(object sender, EventArgs eventArgs) #region Helper methods and properties // Callers of this method should acquire the executor lock only if they - // are not being called in the runtime thread.( + // are not being called in the runtime thread.(bug 17231). private void LoadExistingInstance(WorkflowInstance instance, bool attaching) { WorkflowExecutor executor = instance.GetWorkflowResourceUNSAFE(); diff --git a/System.Workflow.Runtime/DebugEngine/DebugControllerThread.cs b/System.Workflow.Runtime/DebugEngine/DebugControllerThread.cs index 14e2986fc..c540688ab 100644 --- a/System.Workflow.Runtime/DebugEngine/DebugControllerThread.cs +++ b/System.Workflow.Runtime/DebugEngine/DebugControllerThread.cs @@ -159,8 +159,8 @@ public void ExpressionEvaluationFunction() { try { - // Expression eval on x64 does not work ( - + // Expression eval on x64 does not work (bug 18143) so + // don't let the thread spin. if (IntPtr.Size == 8) { Thread.Sleep(Timeout.Infinite); diff --git a/System.Workflow.Runtime/ExecutorLocksHeldException.cs b/System.Workflow.Runtime/ExecutorLocksHeldException.cs index 2744a3bf9..ba6ece5f1 100644 --- a/System.Workflow.Runtime/ExecutorLocksHeldException.cs +++ b/System.Workflow.Runtime/ExecutorLocksHeldException.cs @@ -10,7 +10,7 @@ // REVISIONS // Date Ver By Remarks // ~~~~~~~~~~ ~~~ ~~~~~~~~ ~~~~~~~~~~~~~~ -// 03/08/01 1.0 Microsoft Created. +// 03/08/01 1.0 [....] Created. // **************************************************************************** using System; using System.Runtime.Serialization; diff --git a/System.Workflow.Runtime/Hosting/SqlWorkflowPersistenceService.cs b/System.Workflow.Runtime/Hosting/SqlWorkflowPersistenceService.cs index a02a57008..4327f7bd4 100644 --- a/System.Workflow.Runtime/Hosting/SqlWorkflowPersistenceService.cs +++ b/System.Workflow.Runtime/Hosting/SqlWorkflowPersistenceService.cs @@ -453,7 +453,7 @@ public Byte[] RetrieveInstanceState(Guid instanceStateId, Guid ownerId, DateTime WorkflowTrace.Host.TraceEvent(TraceEventType.Information, 0, "SqlWorkflowPersistenceService.RetrieveInstanceState retrying."); continue; } - else if (e is RetryReadException) // ### hardcoded retry to work around sql ADM64 read + else if (e is RetryReadException) // ### hardcoded retry to work around sql ADM64 read bug ### { count++; if (count < 10) @@ -510,7 +510,7 @@ public Byte[] RetrieveCompletedScope(Guid scopeId) WorkflowTrace.Host.TraceEvent(TraceEventType.Information, 0, "SqlWorkflowPersistenceService.RetrieveCompletedScope retrying."); continue; } - else if (e is RetryReadException) // ### hardcoded retry to work around sql ADM64 read + else if (e is RetryReadException) // ### hardcoded retry to work around sql ADM64 read bug ### { count++; if (count < 10) @@ -617,7 +617,7 @@ private static Byte[] RetrieveStateFromDB(DbCommand command, bool checkOwnership { WorkflowTrace.Host.TraceEvent(TraceEventType.Information, 0, "SqlWorkflowPersistenceService.RetrieveStateFromDB Failed to read results {0}", instanceId); } - else if ((int)resultParam.Value > 0) // found results but failed to read - sql + else if ((int)resultParam.Value > 0) // found results but failed to read - sql bug - retry the query { WorkflowTrace.Host.TraceEvent(TraceEventType.Error, 0, "SqlWorkflowPersistenceService.RetrieveStateFromDB Failed to read results {1}, @result == {0}", (int)resultParam.Value, instanceId); throw new RetryReadException(); diff --git a/System.Workflow.Runtime/Hosting/WorkflowWebHostingModule.cs b/System.Workflow.Runtime/Hosting/WorkflowWebHostingModule.cs index aa4a26754..a5155c762 100644 --- a/System.Workflow.Runtime/Hosting/WorkflowWebHostingModule.cs +++ b/System.Workflow.Runtime/Hosting/WorkflowWebHostingModule.cs @@ -10,7 +10,7 @@ // REVISIONS // Date Ver By Remarks // ~~~~~~~~~~ ~~~ ~~~~~~~~ ~~~~~~~~~~~~~~ -// 02/22/05 1.0 Microsoft Implementation. +// 02/22/05 1.0 [....] Implementation. * ****************************************************************************/ #region Using directives diff --git a/System.Workflow.Runtime/Scheduler.cs b/System.Workflow.Runtime/Scheduler.cs index 0952d2bc1..383e5442e 100644 --- a/System.Workflow.Runtime/Scheduler.cs +++ b/System.Workflow.Runtime/Scheduler.cs @@ -158,7 +158,7 @@ public void Run() transactionalProperties = (TransactionalProperties)atomicActivity.GetValue(WorkflowExecutor.TransactionalPropertiesProperty); // If we've aborted for any reason stop now! // If we attempt to enter a new TransactionScope the com+ context will get corrupted - // See windows se + // See windows se bug 137267 if (!WorkflowExecutor.CheckAndProcessTransactionAborted(transactionalProperties)) { if (transactionalProperties.TransactionScope == null) diff --git a/System.Workflow.Runtime/System/Activities/Statements/Interop.cs b/System.Workflow.Runtime/System/Activities/Statements/Interop.cs index e82732e73..c45bac9f2 100644 --- a/System.Workflow.Runtime/System/Activities/Statements/Interop.cs +++ b/System.Workflow.Runtime/System/Activities/Statements/Interop.cs @@ -1453,7 +1453,7 @@ void ProcessNestedChildren(System.Workflow.ComponentModel.Activity interopBody, } } - //This needs to be in sync with the table in the spec + //This needs to be in [....] with the table in the spec //We use this internally to keep a hashset of validation data enum InteropValidationEnum { diff --git a/System.Workflow.Runtime/WorkflowEventArgs.cs b/System.Workflow.Runtime/WorkflowEventArgs.cs index a81dd7b35..9e811599a 100644 --- a/System.Workflow.Runtime/WorkflowEventArgs.cs +++ b/System.Workflow.Runtime/WorkflowEventArgs.cs @@ -71,7 +71,7 @@ public Activity WorkflowDefinition if (this._workflowDefinition == null) { // Clone the original definition after locking the - // definition's sync object which was passed in + // definition's [....] object which was passed in // the constructor. This is so that the host cannot // corrupt the shared definition Activity tempDefinition = this._originalWorkflowDefinition.Clone(); diff --git a/System.Workflow.Runtime/WorkflowExecutor.cs b/System.Workflow.Runtime/WorkflowExecutor.cs index 9194516f9..0d2d2daf4 100644 --- a/System.Workflow.Runtime/WorkflowExecutor.cs +++ b/System.Workflow.Runtime/WorkflowExecutor.cs @@ -961,7 +961,7 @@ private bool ProtectedPersist(bool unlock) if (WorkflowExecutor.IsIrrecoverableException(e)) { throw; - } //@@undone: for Microsoft:- we should not be running exception handler, when we are unlocking. + } //@@undone: for [....]:- we should not be running exception handler, when we are unlocking. else if (this.WorkflowStatus != WorkflowStatus.Suspended && this.IsInstanceValid) { // the persistence attempt threw an exception @@ -1548,7 +1548,7 @@ private bool PerformUnloading(bool handleExceptions) } } - // shutsdown the schedule instance sync + // shutsdown the schedule instance [....] internal void Unload() { WorkflowTrace.Runtime.TraceEvent(TraceEventType.Information, 0, "Workflow Runtime: WorkflowExecutor: Got an unload request for instance {0}", this.InstanceIdString); @@ -1612,7 +1612,7 @@ internal void Unload() #region Terminate - // terminates the schedule instance sync + // terminates the schedule instance [....] // must be called only from outside the instance... the thread running the instance must // never call this method... it should call TerminateOnIdle instead. internal void Terminate(string error) @@ -1748,7 +1748,7 @@ internal bool TerminateOnIdle(string error) #region Abort - // aborts the schedule instance sync + // aborts the schedule instance [....] // must be called only from outside the instance... the thread running the instance must // never call this method... it should call AbortOnIdle instead. internal void Abort() @@ -1860,7 +1860,7 @@ internal void AbortOnIdle() #region Suspend - // suspends the schedule instance sync + // suspends the schedule instance [....] // must be called only from outside the instance... the thread running the instance must // never call this method... it should call SuspendOnIdle instead. internal bool Suspend(string error) @@ -1966,7 +1966,7 @@ internal bool SuspendOnIdle(string error) #region Resume - // resumes the schedule instance sync + // resumes the schedule instance [....] // must be called only from outside the instance... the thread running the instance must // never call this method... it should call ResumeOnIdle instead. internal void Resume() @@ -1996,7 +1996,7 @@ internal void Resume() //@@Undone-- bmalhi there is one test in bat //which fails here. This check is right thing but im //commenting it out for bat. - // Microsoft: this fails because when we load an instance into memory it grabs + // [....]: this fails because when we load an instance into memory it grabs // the scheduler lock and starts running. By the time the user Resume request // gets the scheduler lock the instance is often done (the AbortBat test case scenario) // Balinder is attempting a fix to separate rehydration from resuming execution. diff --git a/System.WorkflowServices/System/ServiceModel/QueueNameHelper.cs b/System.WorkflowServices/System/ServiceModel/QueueNameHelper.cs index bf4836d6b..01381b9a1 100644 --- a/System.WorkflowServices/System/ServiceModel/QueueNameHelper.cs +++ b/System.WorkflowServices/System/ServiceModel/QueueNameHelper.cs @@ -39,7 +39,7 @@ public static string Create(string partialQueueName, IDictionary string conversationId = null; //Chosen explicit look up against generic looping of Context Headers - //to mitigate security threat + //to mitigate security threat bug PS#3470. if (contextProperties.TryGetValue(WellKnownContextProperties.ConversationId, out conversationId)) { StringBuilder stringBuilder = new StringBuilder(); diff --git a/System.WorkflowServices/System/ServiceModel/WorkflowServiceHost.cs b/System.WorkflowServices/System/ServiceModel/WorkflowServiceHost.cs index f4610d89c..87b3b2378 100644 --- a/System.WorkflowServices/System/ServiceModel/WorkflowServiceHost.cs +++ b/System.WorkflowServices/System/ServiceModel/WorkflowServiceHost.cs @@ -64,7 +64,7 @@ public WorkflowServiceHost(Stream workflowDefinition, Stream ruleDefinition, ITy // Based on prior art from WCF: // ServiceModel.lst:System.ServiceModel.ServiceHost..ctor(System.Object,System.Uri[]) // |DoNotCallOverridableMethodsInConstructors - // |Microsoft|By design, don't want to complicate ServiceHost state model + // |[....]|By design, don't want to complicate ServiceHost state model [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] internal WorkflowServiceHost(WorkflowDefinitionContext workflowDefinitionContext, params Uri[] baseAddress) : base() diff --git a/System.WorkflowServices/System/Workflow/Activities/Design/OperationPickerDialog.cs b/System.WorkflowServices/System/Workflow/Activities/Design/OperationPickerDialog.cs index c74151825..81662844a 100644 --- a/System.WorkflowServices/System/Workflow/Activities/Design/OperationPickerDialog.cs +++ b/System.WorkflowServices/System/Workflow/Activities/Design/OperationPickerDialog.cs @@ -303,7 +303,7 @@ private void OperationPickerDialogLoad(object sender, EventArgs e) // This is to make the selected operation the selected item in the operationsListBox. - // This needs to be done to work around the Microsoft + // This needs to be done to work around the [....] bug causing selection events to not fire till form is loaded. if (this.selectedOperation != null) { SelectServiceOperation(this.selectedOperation); diff --git a/System.WorkflowServices/System/Workflow/Runtime/Hosting/SynchronizationContextWorkflowSchedulerService.cs b/System.WorkflowServices/System/Workflow/Runtime/Hosting/SynchronizationContextWorkflowSchedulerService.cs index bae23fc0b..76380ee64 100644 --- a/System.WorkflowServices/System/Workflow/Runtime/Hosting/SynchronizationContextWorkflowSchedulerService.cs +++ b/System.WorkflowServices/System/Workflow/Runtime/Hosting/SynchronizationContextWorkflowSchedulerService.cs @@ -84,7 +84,7 @@ internal static class SynchronizationContextPostHelper public static void Post(SynchronizationContext synchronizationContext, SendOrPostCallback callback, object state) { - Fx.Assert(synchronizationContext != null, "Null Sync Context"); + Fx.Assert(synchronizationContext != null, "Null [....] Context"); Fx.Assert(callback != null, "Null Callback"); synchronizationContext.OperationStarted(); diff --git a/System.Xml/InternalApis/Clr/inc/AppContextDefaultValues.cs b/System.Xml/InternalApis/Clr/inc/AppContextDefaultValues.cs index 124f9f45a..8a130a0f3 100644 --- a/System.Xml/InternalApis/Clr/inc/AppContextDefaultValues.cs +++ b/System.Xml/InternalApis/Clr/inc/AppContextDefaultValues.cs @@ -25,7 +25,6 @@ public static void PopulateDefaultValues() /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can /// more easily support this on other platforms. /// - [System.Security.SecuritySafeCritical] private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) { string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; diff --git a/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs b/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs index b2508ba53..065662f2e 100644 --- a/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs +++ b/System.Xml/InternalApis/NDP_Common/inc/Win8Helpers.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace Microsoft.Win32 { diff --git a/System.Xml/System/Xml/Base64Decoder.cs b/System.Xml/System/Xml/Base64Decoder.cs index 700f00247..6fce5e708 100644 --- a/System.Xml/System/Xml/Base64Decoder.cs +++ b/System.Xml/System/Xml/Base64Decoder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Base64Encoder.cs b/System.Xml/System/Xml/Base64Encoder.cs index 826dda147..2e5db862d 100644 --- a/System.Xml/System/Xml/Base64Encoder.cs +++ b/System.Xml/System/Xml/Base64Encoder.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Text; diff --git a/System.Xml/System/Xml/BinHexDecoder.cs b/System.Xml/System/Xml/BinHexDecoder.cs index f0e3e37cb..a5b8c826a 100644 --- a/System.Xml/System/Xml/BinHexDecoder.cs +++ b/System.Xml/System/Xml/BinHexDecoder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/BinHexEncoder.cs b/System.Xml/System/Xml/BinHexEncoder.cs index 80aaef885..84af530c3 100644 --- a/System.Xml/System/Xml/BinHexEncoder.cs +++ b/System.Xml/System/Xml/BinHexEncoder.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/BinaryXml/SqlUtils.cs b/System.Xml/System/Xml/BinaryXml/SqlUtils.cs index f431af850..ac782eede 100644 --- a/System.Xml/System/Xml/BinaryXml/SqlUtils.cs +++ b/System.Xml/System/Xml/BinaryXml/SqlUtils.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/BinaryXml/XmlBinaryReader.cs b/System.Xml/System/Xml/BinaryXml/XmlBinaryReader.cs index 249bf8a70..7ec7d87c0 100644 --- a/System.Xml/System/Xml/BinaryXml/XmlBinaryReader.cs +++ b/System.Xml/System/Xml/BinaryXml/XmlBinaryReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/BinaryXml/XmlBinaryReaderAsync.cs b/System.Xml/System/Xml/BinaryXml/XmlBinaryReaderAsync.cs index c5617d0be..c246cd780 100644 --- a/System.Xml/System/Xml/BinaryXml/XmlBinaryReaderAsync.cs +++ b/System.Xml/System/Xml/BinaryXml/XmlBinaryReaderAsync.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/BitStack.cs b/System.Xml/System/Xml/BitStack.cs index af5df11c2..1a24b0503 100644 --- a/System.Xml/System/Xml/BitStack.cs +++ b/System.Xml/System/Xml/BitStack.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Bits.cs b/System.Xml/System/Xml/Bits.cs index e33134c3d..c971932da 100644 --- a/System.Xml/System/Xml/Bits.cs +++ b/System.Xml/System/Xml/Bits.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/ByteStack.cs b/System.Xml/System/Xml/ByteStack.cs index d1dac9ff8..dad824cbb 100644 --- a/System.Xml/System/Xml/ByteStack.cs +++ b/System.Xml/System/Xml/ByteStack.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Cache/XPathDocumentBuilder.cs b/System.Xml/System/Xml/Cache/XPathDocumentBuilder.cs index 7282d5455..5ca097401 100644 --- a/System.Xml/System/Xml/Cache/XPathDocumentBuilder.cs +++ b/System.Xml/System/Xml/Cache/XPathDocumentBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Globalization; diff --git a/System.Xml/System/Xml/Cache/XPathDocumentIterator.cs b/System.Xml/System/Xml/Cache/XPathDocumentIterator.cs index 937c44a75..54d2808d1 100644 --- a/System.Xml/System/Xml/Cache/XPathDocumentIterator.cs +++ b/System.Xml/System/Xml/Cache/XPathDocumentIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Xml/System/Xml/Cache/XPathDocumentNavigator.cs b/System.Xml/System/Xml/Cache/XPathDocumentNavigator.cs index f46468ff6..d5884ff33 100644 --- a/System.Xml/System/Xml/Cache/XPathDocumentNavigator.cs +++ b/System.Xml/System/Xml/Cache/XPathDocumentNavigator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.IO; diff --git a/System.Xml/System/Xml/Cache/XPathNode.cs b/System.Xml/System/Xml/Cache/XPathNode.cs index 9170badb6..1706a413b 100644 --- a/System.Xml/System/Xml/Cache/XPathNode.cs +++ b/System.Xml/System/Xml/Cache/XPathNode.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Xml/System/Xml/Cache/XPathNodeHelper.cs b/System.Xml/System/Xml/Cache/XPathNodeHelper.cs index fbc150cb5..d41386dc0 100644 --- a/System.Xml/System/Xml/Cache/XPathNodeHelper.cs +++ b/System.Xml/System/Xml/Cache/XPathNodeHelper.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Diagnostics; diff --git a/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs b/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs index f65ab8c14..b2bd27cfc 100644 --- a/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs +++ b/System.Xml/System/Xml/Cache/XPathNodeInfoAtom.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; using System.Text; diff --git a/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs b/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs index b50a79dd4..9ada03fbd 100644 --- a/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs +++ b/System.Xml/System/Xml/Core/CharEntityEncoderFallback.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Text; @@ -124,10 +124,10 @@ public override bool Fallback( char charUnknownHigh, char charUnknownLow, int in } public override char GetNextChar() { - // - - - + // Bug fix: 35637. The protocol using GetNextChar() and MovePrevious() called by Encoder is not well documented. + // Here we have to to signal to Encoder that the previous read was last character. Only AFTER we can + // mark ourself as done (-1). Otherwise MovePrevious() can still be called, but -1 is already incorrectly set + // and return false from MovePrevious(). Then Encoder ----ing the rest of the bytes. if (charEntityIndex == charEntity.Length) { charEntityIndex = -1; diff --git a/System.Xml/System/Xml/Core/HtmlEncodedRawTextWriter.cs b/System.Xml/System/Xml/Core/HtmlEncodedRawTextWriter.cs index 0b90bc445..3e87a2880 100644 --- a/System.Xml/System/Xml/Core/HtmlEncodedRawTextWriter.cs +++ b/System.Xml/System/Xml/Core/HtmlEncodedRawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, @@ -111,7 +111,7 @@ public override void WriteDocType( string name, string pubid, string sysid, stri RawText( " // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // // This file is generated by TernaryTreeGenerator.cs, diff --git a/System.Xml/System/Xml/Core/HtmlUtf8RawTextWriter.cs b/System.Xml/System/Xml/Core/HtmlUtf8RawTextWriter.cs index 21746af58..ce58ac04c 100644 --- a/System.Xml/System/Xml/Core/HtmlUtf8RawTextWriter.cs +++ b/System.Xml/System/Xml/Core/HtmlUtf8RawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, @@ -111,7 +111,7 @@ public override void WriteDocType( string name, string pubid, string sysid, stri RawText( " // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Xml/System/Xml/Core/QueryOutputWriter.cs b/System.Xml/System/Xml/Core/QueryOutputWriter.cs index b2eb04606..38d96cab2 100644 --- a/System.Xml/System/Xml/Core/QueryOutputWriter.cs +++ b/System.Xml/System/Xml/Core/QueryOutputWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Core/QueryOutputWriterV1.cs b/System.Xml/System/Xml/Core/QueryOutputWriterV1.cs index b8118da24..7804b49e6 100644 --- a/System.Xml/System/Xml/Core/QueryOutputWriterV1.cs +++ b/System.Xml/System/Xml/Core/QueryOutputWriterV1.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/ReadContentAsBinaryHelper.cs b/System.Xml/System/Xml/Core/ReadContentAsBinaryHelper.cs index f901bb3b8..2279ac9d4 100644 --- a/System.Xml/System/Xml/Core/ReadContentAsBinaryHelper.cs +++ b/System.Xml/System/Xml/Core/ReadContentAsBinaryHelper.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Xml/System/Xml/Core/ReadOnlyTernaryTree.cs b/System.Xml/System/Xml/Core/ReadOnlyTernaryTree.cs index e2bdd673a..c18e27b12 100644 --- a/System.Xml/System/Xml/Core/ReadOnlyTernaryTree.cs +++ b/System.Xml/System/Xml/Core/ReadOnlyTernaryTree.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; @@ -17,7 +17,7 @@ internal enum TernaryTreeByte {characterByte = 0, leftTree = 1, rightTree = 2, // // XSL HTML output method properties // - // Keep the first four bits in sync, so that the element and attribute mask operation can be combined. + // Keep the first four bits in [....], so that the element and attribute mask operation can be combined. internal enum ElementProperties : uint {DEFAULT = 0, URI_PARENT = 1, BOOL_PARENT = 2, NAME_PARENT = 4, EMPTY = 8, NO_ENTITIES = 16, HEAD = 32, BLOCK_WS = 64, HAS_NS = 128} internal enum AttributeProperties : uint {DEFAULT = 0, URI = 1, BOOLEAN = 2, NAME = 4} diff --git a/System.Xml/System/Xml/Core/SecureStringHasher.cs b/System.Xml/System/Xml/Core/SecureStringHasher.cs index a0e126082..95684b22d 100644 --- a/System.Xml/System/Xml/Core/SecureStringHasher.cs +++ b/System.Xml/System/Xml/Core/SecureStringHasher.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/TextEncodedRawTextWriter.cs b/System.Xml/System/Xml/Core/TextEncodedRawTextWriter.cs index 6565d5d3d..d09ec7789 100644 --- a/System.Xml/System/Xml/Core/TextEncodedRawTextWriter.cs +++ b/System.Xml/System/Xml/Core/TextEncodedRawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, diff --git a/System.Xml/System/Xml/Core/TextUtf8RawTextWriter.cs b/System.Xml/System/Xml/Core/TextUtf8RawTextWriter.cs index 4192d3285..1ed397e8f 100644 --- a/System.Xml/System/Xml/Core/TextUtf8RawTextWriter.cs +++ b/System.Xml/System/Xml/Core/TextUtf8RawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, diff --git a/System.Xml/System/Xml/Core/ValidatingReaderNodeData.cs b/System.Xml/System/Xml/Core/ValidatingReaderNodeData.cs index 35ebb9344..0220c3ac4 100644 --- a/System.Xml/System/Xml/Core/ValidatingReaderNodeData.cs +++ b/System.Xml/System/Xml/Core/ValidatingReaderNodeData.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlAsyncCheckReader.cs b/System.Xml/System/Xml/Core/XmlAsyncCheckReader.cs index 5c8e6dbfa..acfc26412 100644 --- a/System.Xml/System/Xml/Core/XmlAsyncCheckReader.cs +++ b/System.Xml/System/Xml/Core/XmlAsyncCheckReader.cs @@ -55,7 +55,7 @@ private void CheckAsync() { } } - #region Sync Methods, Properties Check + #region [....] Methods, Properties Check public override XmlReaderSettings Settings { get { diff --git a/System.Xml/System/Xml/Core/XmlAsyncCheckWriter.cs b/System.Xml/System/Xml/Core/XmlAsyncCheckWriter.cs index 2ec002e88..9d3d1259b 100644 --- a/System.Xml/System/Xml/Core/XmlAsyncCheckWriter.cs +++ b/System.Xml/System/Xml/Core/XmlAsyncCheckWriter.cs @@ -28,7 +28,7 @@ private void CheckAsync() { } } - #region Sync Methods, Properties Check + #region [....] Methods, Properties Check public override XmlWriterSettings Settings { get { diff --git a/System.Xml/System/Xml/Core/XmlAutoDetectWriter.cs b/System.Xml/System/Xml/Core/XmlAutoDetectWriter.cs index c36fceca0..be7bdf2f1 100644 --- a/System.Xml/System/Xml/Core/XmlAutoDetectWriter.cs +++ b/System.Xml/System/Xml/Core/XmlAutoDetectWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ diff --git a/System.Xml/System/Xml/Core/XmlCharCheckingReader.cs b/System.Xml/System/Xml/Core/XmlCharCheckingReader.cs index 4d57beeb3..e7494e219 100644 --- a/System.Xml/System/Xml/Core/XmlCharCheckingReader.cs +++ b/System.Xml/System/Xml/Core/XmlCharCheckingReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlCharCheckingWriter.cs b/System.Xml/System/Xml/Core/XmlCharCheckingWriter.cs index 879e99e09..d997aaf59 100644 --- a/System.Xml/System/Xml/Core/XmlCharCheckingWriter.cs +++ b/System.Xml/System/Xml/Core/XmlCharCheckingWriter.cs @@ -4,7 +4,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ @@ -445,7 +445,7 @@ private string ReplaceNewLines( char[] data, int offset, int len ) { // Interleave 2 adjacent invalid chars with a space. This is used for fixing invalid values of comments and PIs. // Any "--" in comment must be replaced with "- -" and any "-" at the end must be appended with " ". // Any "?>" in PI value must be replaced with "? >". - // This code has a + // This code has a bug SQL BU Defect Tracking #480848, which was triaged as Won't Fix because it is a breaking change private string InterleaveInvalidChars( string text, char invChar1, char invChar2 ) { StringBuilder sb = null; int start = 0; diff --git a/System.Xml/System/Xml/Core/XmlEncodedRawTextWriter.cs b/System.Xml/System/Xml/Core/XmlEncodedRawTextWriter.cs index 341890df1..15d6839fb 100644 --- a/System.Xml/System/Xml/Core/XmlEncodedRawTextWriter.cs +++ b/System.Xml/System/Xml/Core/XmlEncodedRawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, @@ -416,8 +416,8 @@ internal override void WriteStartNamespaceDeclaration(string prefix) { if ( trackTextContent && inTextContent != false ) { ChangeTextContentMark( false ); } - // VSTFDEVDIV - + // VSTFDEVDIV bug #583965: Inconsistency between Silverlight 2 and Dev10 in the way a single xmlns attribute is serialized + // Resolved as: Won't fix (breaking change) if ( prefix.Length == 0 ) { RawText( " xmlns=\"" ); diff --git a/System.Xml/System/Xml/Core/XmlEncodedRawTextWriterAsync.cs b/System.Xml/System/Xml/Core/XmlEncodedRawTextWriterAsync.cs index 17e6333eb..bfb770ee5 100644 --- a/System.Xml/System/Xml/Core/XmlEncodedRawTextWriterAsync.cs +++ b/System.Xml/System/Xml/Core/XmlEncodedRawTextWriterAsync.cs @@ -224,8 +224,8 @@ internal override async Task WriteStartNamespaceDeclarationAsync(string prefix) if ( trackTextContent && inTextContent != false ) { ChangeTextContentMark( false ); } - // VSTFDEVDIV - + // VSTFDEVDIV bug #583965: Inconsistency between Silverlight 2 and Dev10 in the way a single xmlns attribute is serialized + // Resolved as: Won't fix (breaking change) #if SILVERLIGHT if ( attrEndPos == bufPos ) { diff --git a/System.Xml/System/Xml/Core/XmlEventCache.cs b/System.Xml/System/Xml/Core/XmlEventCache.cs index b48dd010f..2f9b8e7dc 100644 --- a/System.Xml/System/Xml/Core/XmlEventCache.cs +++ b/System.Xml/System/Xml/Core/XmlEventCache.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Xml/System/Xml/Core/XmlParserContext.cs b/System.Xml/System/Xml/Core/XmlParserContext.cs index 6b70e55b4..c6427aa67 100644 --- a/System.Xml/System/Xml/Core/XmlParserContext.cs +++ b/System.Xml/System/Xml/Core/XmlParserContext.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Xml; diff --git a/System.Xml/System/Xml/Core/XmlRawWriter.cs b/System.Xml/System/Xml/Core/XmlRawWriter.cs index 6c05735bc..0de566338 100644 --- a/System.Xml/System/Xml/Core/XmlRawWriter.cs +++ b/System.Xml/System/Xml/Core/XmlRawWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlReader.cs b/System.Xml/System/Xml/Core/XmlReader.cs index 40379dd15..444944542 100644 --- a/System.Xml/System/Xml/Core/XmlReader.cs +++ b/System.Xml/System/Xml/Core/XmlReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/Core/XmlReaderSettings.cs b/System.Xml/System/Xml/Core/XmlReaderSettings.cs index 5f1f12eee..c3ceeb85d 100644 --- a/System.Xml/System/Xml/Core/XmlReaderSettings.cs +++ b/System.Xml/System/Xml/Core/XmlReaderSettings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/Core/XmlSubtreeReader.cs b/System.Xml/System/Xml/Core/XmlSubtreeReader.cs index 602e1acb3..c78e851ad 100644 --- a/System.Xml/System/Xml/Core/XmlSubtreeReader.cs +++ b/System.Xml/System/Xml/Core/XmlSubtreeReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlTextEncoder.cs b/System.Xml/System/Xml/Core/XmlTextEncoder.cs index 7e4c58fd1..8c90585f9 100644 --- a/System.Xml/System/Xml/Core/XmlTextEncoder.cs +++ b/System.Xml/System/Xml/Core/XmlTextEncoder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlTextReader.cs b/System.Xml/System/Xml/Core/XmlTextReader.cs index 096f9b5cb..2ce8ee9b5 100644 --- a/System.Xml/System/Xml/Core/XmlTextReader.cs +++ b/System.Xml/System/Xml/Core/XmlTextReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlTextReaderImpl.cs b/System.Xml/System/Xml/Core/XmlTextReaderImpl.cs index ab3997554..8ac1d7065 100644 --- a/System.Xml/System/Xml/Core/XmlTextReaderImpl.cs +++ b/System.Xml/System/Xml/Core/XmlTextReaderImpl.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlTextReaderImplHelpers.cs b/System.Xml/System/Xml/Core/XmlTextReaderImplHelpers.cs index 8d3dcd6f8..3a031b704 100644 --- a/System.Xml/System/Xml/Core/XmlTextReaderImplHelpers.cs +++ b/System.Xml/System/Xml/Core/XmlTextReaderImplHelpers.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlTextWriter.cs b/System.Xml/System/Xml/Core/XmlTextWriter.cs index c69a40836..731426702 100644 --- a/System.Xml/System/Xml/Core/XmlTextWriter.cs +++ b/System.Xml/System/Xml/Core/XmlTextWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; @@ -1364,8 +1364,8 @@ private unsafe void ValidateName(string name, bool isNCName) { // Namespaces supported if (namespaces) { - // We can't use ValidateNames.ParseQName here because of backwards compatibility - + // We can't use ValidateNames.ParseQName here because of backwards compatibility bug we need to preserve. + // The bug is that the character after ':' is validated only as a NCName characters instead of NCStartName. int colonPosition = -1; // Parse NCName (may be prefix, may be local name) @@ -1384,7 +1384,7 @@ private unsafe void ValidateName(string name, bool isNCName) { // make sure it is not the first or last characters if (position > 0 && position + 1 < nameLength) { colonPosition = position; - // Because of the back-compat + // Because of the back-compat bug (described above) parse the rest as Nmtoken position++; position += ValidateNames.ParseNmtoken(name, position); goto Continue; diff --git a/System.Xml/System/Xml/Core/XmlUtf8RawTextWriter.cs b/System.Xml/System/Xml/Core/XmlUtf8RawTextWriter.cs index 8cbec68c9..9267f3cf1 100644 --- a/System.Xml/System/Xml/Core/XmlUtf8RawTextWriter.cs +++ b/System.Xml/System/Xml/Core/XmlUtf8RawTextWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // WARNING: This file is generated and should not be modified directly. Instead, @@ -360,8 +360,8 @@ internal override bool SupportsNamespaceDeclarationInChunks { internal override void WriteStartNamespaceDeclaration(string prefix) { Debug.Assert( prefix != null ); - // VSTFDEVDIV - + // VSTFDEVDIV bug #583965: Inconsistency between Silverlight 2 and Dev10 in the way a single xmlns attribute is serialized + // Resolved as: Won't fix (breaking change) if ( prefix.Length == 0 ) { RawText( " xmlns=\"" ); diff --git a/System.Xml/System/Xml/Core/XmlUtf8RawTextWriterAsync.cs b/System.Xml/System/Xml/Core/XmlUtf8RawTextWriterAsync.cs index bce188d15..3d5024d13 100644 --- a/System.Xml/System/Xml/Core/XmlUtf8RawTextWriterAsync.cs +++ b/System.Xml/System/Xml/Core/XmlUtf8RawTextWriterAsync.cs @@ -210,8 +210,8 @@ internal override async Task WriteStartNamespaceDeclarationAsync(string prefix) CheckAsyncCall(); Debug.Assert( prefix != null ); - // VSTFDEVDIV - + // VSTFDEVDIV bug #583965: Inconsistency between Silverlight 2 and Dev10 in the way a single xmlns attribute is serialized + // Resolved as: Won't fix (breaking change) #if SILVERLIGHT if ( attrEndPos == bufPos ) { diff --git a/System.Xml/System/Xml/Core/XmlValidatingReader.cs b/System.Xml/System/Xml/Core/XmlValidatingReader.cs index 9c997f144..5027da2ff 100644 --- a/System.Xml/System/Xml/Core/XmlValidatingReader.cs +++ b/System.Xml/System/Xml/Core/XmlValidatingReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlValidatingReaderImpl.cs b/System.Xml/System/Xml/Core/XmlValidatingReaderImpl.cs index 55d380288..7836c255b 100644 --- a/System.Xml/System/Xml/Core/XmlValidatingReaderImpl.cs +++ b/System.Xml/System/Xml/Core/XmlValidatingReaderImpl.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlWellFormedWriter.cs b/System.Xml/System/Xml/Core/XmlWellFormedWriter.cs index 27378cd78..30bf76c54 100644 --- a/System.Xml/System/Xml/Core/XmlWellFormedWriter.cs +++ b/System.Xml/System/Xml/Core/XmlWellFormedWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; @@ -1370,7 +1370,7 @@ private void WriteStartDocumentImpl(XmlStandalone standalone) { } } else { - // We do not pass the standalone value here - Dev10 + // We do not pass the standalone value here - Dev10 Bug #479769 writer.WriteStartDocument(); } } diff --git a/System.Xml/System/Xml/Core/XmlWellFormedWriterAsync.cs b/System.Xml/System/Xml/Core/XmlWellFormedWriterAsync.cs index f38cc97dd..13d33b2c4 100644 --- a/System.Xml/System/Xml/Core/XmlWellFormedWriterAsync.cs +++ b/System.Xml/System/Xml/Core/XmlWellFormedWriterAsync.cs @@ -1013,7 +1013,7 @@ private async Task WriteStartDocumentImplAsync(XmlStandalone standalone) { } } else { - // We do not pass the standalone value here - Dev10 + // We do not pass the standalone value here - Dev10 Bug #479769 await writer.WriteStartDocumentAsync().ConfigureAwait(false); } } diff --git a/System.Xml/System/Xml/Core/XmlWellFormedWriterHelpers.cs b/System.Xml/System/Xml/Core/XmlWellFormedWriterHelpers.cs index 144d806e5..6454136ea 100644 --- a/System.Xml/System/Xml/Core/XmlWellFormedWriterHelpers.cs +++ b/System.Xml/System/Xml/Core/XmlWellFormedWriterHelpers.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlWrappingReader.cs b/System.Xml/System/Xml/Core/XmlWrappingReader.cs index 0bddf6c93..5aba9d28d 100644 --- a/System.Xml/System/Xml/Core/XmlWrappingReader.cs +++ b/System.Xml/System/Xml/Core/XmlWrappingReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlWrappingWriter.cs b/System.Xml/System/Xml/Core/XmlWrappingWriter.cs index f73c5eb90..6176c6dd5 100644 --- a/System.Xml/System/Xml/Core/XmlWrappingWriter.cs +++ b/System.Xml/System/Xml/Core/XmlWrappingWriter.cs @@ -4,7 +4,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ diff --git a/System.Xml/System/Xml/Core/XmlWriter.cs b/System.Xml/System/Xml/Core/XmlWriter.cs index f4ca61856..64ce1c429 100644 --- a/System.Xml/System/Xml/Core/XmlWriter.cs +++ b/System.Xml/System/Xml/Core/XmlWriter.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Core/XmlWriterAsync.cs b/System.Xml/System/Xml/Core/XmlWriterAsync.cs index e799402b0..bd18d0db0 100644 --- a/System.Xml/System/Xml/Core/XmlWriterAsync.cs +++ b/System.Xml/System/Xml/Core/XmlWriterAsync.cs @@ -263,7 +263,7 @@ public virtual Task WriteNodeAsync(XmlReader reader, bool defattr) { // Copies the current node from the given reader to the writer (including child nodes), and if called on an element moves the XmlReader // to the corresponding end element. - //use sync methods on the reader + //use [....] methods on the reader internal async Task WriteNodeAsync_CallSyncReader(XmlReader reader, bool defattr) { bool canReadChunk = reader.CanReadValueChunk; diff --git a/System.Xml/System/Xml/Core/XmlWriterSettings.cs b/System.Xml/System/Xml/Core/XmlWriterSettings.cs index 4cf699ad1..321debcd6 100644 --- a/System.Xml/System/Xml/Core/XmlWriterSettings.cs +++ b/System.Xml/System/Xml/Core/XmlWriterSettings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections.Generic; diff --git a/System.Xml/System/Xml/Core/XsdCachingReader.cs b/System.Xml/System/Xml/Core/XsdCachingReader.cs index 2775de956..eabe7e09a 100644 --- a/System.Xml/System/Xml/Core/XsdCachingReader.cs +++ b/System.Xml/System/Xml/Core/XsdCachingReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/Core/XsdValidatingReader.cs b/System.Xml/System/Xml/Core/XsdValidatingReader.cs index 1624db0c1..78b479a94 100644 --- a/System.Xml/System/Xml/Core/XsdValidatingReader.cs +++ b/System.Xml/System/Xml/Core/XsdValidatingReader.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/DiagnosticsSwitches.cs b/System.Xml/System/Xml/DiagnosticsSwitches.cs index aa2a2be4f..18e16e93e 100644 --- a/System.Xml/System/Xml/DiagnosticsSwitches.cs +++ b/System.Xml/System/Xml/DiagnosticsSwitches.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/DocumentSchemaValidator.cs b/System.Xml/System/Xml/Dom/DocumentSchemaValidator.cs index ad2afe144..61467a7e2 100644 --- a/System.Xml/System/Xml/Dom/DocumentSchemaValidator.cs +++ b/System.Xml/System/Xml/Dom/DocumentSchemaValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Dom/DocumentXPathNavigator.cs b/System.Xml/System/Xml/Dom/DocumentXPathNavigator.cs index 519989144..651565088 100644 --- a/System.Xml/System/Xml/Dom/DocumentXPathNavigator.cs +++ b/System.Xml/System/Xml/Dom/DocumentXPathNavigator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Dom/DocumentXmlWriter.cs b/System.Xml/System/Xml/Dom/DocumentXmlWriter.cs index a593fc00f..b81819b7f 100644 --- a/System.Xml/System/Xml/Dom/DocumentXmlWriter.cs +++ b/System.Xml/System/Xml/Dom/DocumentXmlWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Dom/DomNameTable.cs b/System.Xml/System/Xml/Dom/DomNameTable.cs index 1887cf8fe..f804251dd 100644 --- a/System.Xml/System/Xml/Dom/DomNameTable.cs +++ b/System.Xml/System/Xml/Dom/DomNameTable.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Dom/XPathNodeList.cs b/System.Xml/System/Xml/Dom/XPathNodeList.cs index 375f9c645..72cce94b6 100644 --- a/System.Xml/System/Xml/Dom/XPathNodeList.cs +++ b/System.Xml/System/Xml/Dom/XPathNodeList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlAttribute.cs b/System.Xml/System/Xml/Dom/XmlAttribute.cs index e72968196..5a78890c5 100644 --- a/System.Xml/System/Xml/Dom/XmlAttribute.cs +++ b/System.Xml/System/Xml/Dom/XmlAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlAttributeCollection.cs b/System.Xml/System/Xml/Dom/XmlAttributeCollection.cs index bfe86a970..5825e1d6b 100644 --- a/System.Xml/System/Xml/Dom/XmlAttributeCollection.cs +++ b/System.Xml/System/Xml/Dom/XmlAttributeCollection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ diff --git a/System.Xml/System/Xml/Dom/XmlCDataSection.cs b/System.Xml/System/Xml/Dom/XmlCDataSection.cs index b1f2676b1..9879cf9e5 100644 --- a/System.Xml/System/Xml/Dom/XmlCDataSection.cs +++ b/System.Xml/System/Xml/Dom/XmlCDataSection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlCharacterData.cs b/System.Xml/System/Xml/Dom/XmlCharacterData.cs index 6797b896b..3744cd8bc 100644 --- a/System.Xml/System/Xml/Dom/XmlCharacterData.cs +++ b/System.Xml/System/Xml/Dom/XmlCharacterData.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { using System.Diagnostics; diff --git a/System.Xml/System/Xml/Dom/XmlChildEnumerator.cs b/System.Xml/System/Xml/Dom/XmlChildEnumerator.cs index d17bffe83..41a25efe2 100644 --- a/System.Xml/System/Xml/Dom/XmlChildEnumerator.cs +++ b/System.Xml/System/Xml/Dom/XmlChildEnumerator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlChildNodes.cs b/System.Xml/System/Xml/Dom/XmlChildNodes.cs index 391b56667..6450c64f6 100644 --- a/System.Xml/System/Xml/Dom/XmlChildNodes.cs +++ b/System.Xml/System/Xml/Dom/XmlChildNodes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { using System.Collections; diff --git a/System.Xml/System/Xml/Dom/XmlComment.cs b/System.Xml/System/Xml/Dom/XmlComment.cs index 8e7289c89..087c7546a 100644 --- a/System.Xml/System/Xml/Dom/XmlComment.cs +++ b/System.Xml/System/Xml/Dom/XmlComment.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlDeclaration.cs b/System.Xml/System/Xml/Dom/XmlDeclaration.cs index 8de8430a3..bd8ab0ef6 100644 --- a/System.Xml/System/Xml/Dom/XmlDeclaration.cs +++ b/System.Xml/System/Xml/Dom/XmlDeclaration.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlDocument.cs b/System.Xml/System/Xml/Dom/XmlDocument.cs index 03d419b0d..dff26fa7d 100644 --- a/System.Xml/System/Xml/Dom/XmlDocument.cs +++ b/System.Xml/System/Xml/Dom/XmlDocument.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/Dom/XmlDocumentFragment.cs b/System.Xml/System/Xml/Dom/XmlDocumentFragment.cs index ef3e33eca..1ee01648c 100644 --- a/System.Xml/System/Xml/Dom/XmlDocumentFragment.cs +++ b/System.Xml/System/Xml/Dom/XmlDocumentFragment.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // DocumentFragment is a "lightweight" or "minimal" diff --git a/System.Xml/System/Xml/Dom/XmlDocumentType.cs b/System.Xml/System/Xml/Dom/XmlDocumentType.cs index 19ae68b98..27daa745e 100644 --- a/System.Xml/System/Xml/Dom/XmlDocumentType.cs +++ b/System.Xml/System/Xml/Dom/XmlDocumentType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlDomTextWriter.cs b/System.Xml/System/Xml/Dom/XmlDomTextWriter.cs index 0369f5e16..228d6ff1f 100644 --- a/System.Xml/System/Xml/Dom/XmlDomTextWriter.cs +++ b/System.Xml/System/Xml/Dom/XmlDomTextWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlElement.cs b/System.Xml/System/Xml/Dom/XmlElement.cs index e2d979845..66171a917 100644 --- a/System.Xml/System/Xml/Dom/XmlElement.cs +++ b/System.Xml/System/Xml/Dom/XmlElement.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Dom/XmlElementList.cs b/System.Xml/System/Xml/Dom/XmlElementList.cs index ef190d83c..d76e66c2a 100644 --- a/System.Xml/System/Xml/Dom/XmlElementList.cs +++ b/System.Xml/System/Xml/Dom/XmlElementList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlEntity.cs b/System.Xml/System/Xml/Dom/XmlEntity.cs index 0522631c1..3576d03a7 100644 --- a/System.Xml/System/Xml/Dom/XmlEntity.cs +++ b/System.Xml/System/Xml/Dom/XmlEntity.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlEntityReference.cs b/System.Xml/System/Xml/Dom/XmlEntityReference.cs index 4bb982a16..d9ee2866b 100644 --- a/System.Xml/System/Xml/Dom/XmlEntityReference.cs +++ b/System.Xml/System/Xml/Dom/XmlEntityReference.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ // EntityReference objects may be inserted into the structure diff --git a/System.Xml/System/Xml/Dom/XmlImplementation.cs b/System.Xml/System/Xml/Dom/XmlImplementation.cs index 13711af70..0082d7faf 100644 --- a/System.Xml/System/Xml/Dom/XmlImplementation.cs +++ b/System.Xml/System/Xml/Dom/XmlImplementation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Globalization; diff --git a/System.Xml/System/Xml/Dom/XmlLinkedNode.cs b/System.Xml/System/Xml/Dom/XmlLinkedNode.cs index 9e62d4674..0c29d1527 100644 --- a/System.Xml/System/Xml/Dom/XmlLinkedNode.cs +++ b/System.Xml/System/Xml/Dom/XmlLinkedNode.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlLoader.cs b/System.Xml/System/Xml/Dom/XmlLoader.cs index ca642eff4..988ab2d16 100644 --- a/System.Xml/System/Xml/Dom/XmlLoader.cs +++ b/System.Xml/System/Xml/Dom/XmlLoader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlName.cs b/System.Xml/System/Xml/Dom/XmlName.cs index dc217a6e6..0b9723361 100644 --- a/System.Xml/System/Xml/Dom/XmlName.cs +++ b/System.Xml/System/Xml/Dom/XmlName.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlNamedNodemap.cs b/System.Xml/System/Xml/Dom/XmlNamedNodemap.cs index aa1f05e28..5def2f6d2 100644 --- a/System.Xml/System/Xml/Dom/XmlNamedNodemap.cs +++ b/System.Xml/System/Xml/Dom/XmlNamedNodemap.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlNode.cs b/System.Xml/System/Xml/Dom/XmlNode.cs index d814e3d23..cebe87087 100644 --- a/System.Xml/System/Xml/Dom/XmlNode.cs +++ b/System.Xml/System/Xml/Dom/XmlNode.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlNodeChangedEventArgs.cs b/System.Xml/System/Xml/Dom/XmlNodeChangedEventArgs.cs index ac4c5097e..617f0b54c 100644 --- a/System.Xml/System/Xml/Dom/XmlNodeChangedEventArgs.cs +++ b/System.Xml/System/Xml/Dom/XmlNodeChangedEventArgs.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlNodeList.cs b/System.Xml/System/Xml/Dom/XmlNodeList.cs index d19afba0b..697ae9264 100644 --- a/System.Xml/System/Xml/Dom/XmlNodeList.cs +++ b/System.Xml/System/Xml/Dom/XmlNodeList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlNodeReader.cs b/System.Xml/System/Xml/Dom/XmlNodeReader.cs index 2ef079a48..514b79fb8 100644 --- a/System.Xml/System/Xml/Dom/XmlNodeReader.cs +++ b/System.Xml/System/Xml/Dom/XmlNodeReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/Dom/XmlNotation.cs b/System.Xml/System/Xml/Dom/XmlNotation.cs index 527bdcf6b..79be847a2 100644 --- a/System.Xml/System/Xml/Dom/XmlNotation.cs +++ b/System.Xml/System/Xml/Dom/XmlNotation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlProcessingInstruction.cs b/System.Xml/System/Xml/Dom/XmlProcessingInstruction.cs index 04d09502a..c940944be 100644 --- a/System.Xml/System/Xml/Dom/XmlProcessingInstruction.cs +++ b/System.Xml/System/Xml/Dom/XmlProcessingInstruction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/Dom/XmlSignificantWhiteSpace.cs b/System.Xml/System/Xml/Dom/XmlSignificantWhiteSpace.cs index d083222ae..70cd9498a 100644 --- a/System.Xml/System/Xml/Dom/XmlSignificantWhiteSpace.cs +++ b/System.Xml/System/Xml/Dom/XmlSignificantWhiteSpace.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/Dom/XmlText.cs b/System.Xml/System/Xml/Dom/XmlText.cs index 52d745741..4d9e3dc10 100644 --- a/System.Xml/System/Xml/Dom/XmlText.cs +++ b/System.Xml/System/Xml/Dom/XmlText.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/Dom/XmlUnspecifiedAttribute.cs b/System.Xml/System/Xml/Dom/XmlUnspecifiedAttribute.cs index fecd81cc5..c1a0974d0 100644 --- a/System.Xml/System/Xml/Dom/XmlUnspecifiedAttribute.cs +++ b/System.Xml/System/Xml/Dom/XmlUnspecifiedAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/Dom/XmlWhitespace.cs b/System.Xml/System/Xml/Dom/XmlWhitespace.cs index 3e0df6ab3..ce4f166e8 100644 --- a/System.Xml/System/Xml/Dom/XmlWhitespace.cs +++ b/System.Xml/System/Xml/Dom/XmlWhitespace.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/EmptyEnumerator.cs b/System.Xml/System/Xml/EmptyEnumerator.cs index 5d9787f12..b9c7f41d8 100644 --- a/System.Xml/System/Xml/EmptyEnumerator.cs +++ b/System.Xml/System/Xml/EmptyEnumerator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/HWStack.cs b/System.Xml/System/Xml/HWStack.cs index 2f076f8c8..9df2ad165 100644 --- a/System.Xml/System/Xml/HWStack.cs +++ b/System.Xml/System/Xml/HWStack.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/IXmlLineInfo.cs b/System.Xml/System/Xml/IXmlLineInfo.cs index 438840e1c..a5503a177 100644 --- a/System.Xml/System/Xml/IXmlLineInfo.cs +++ b/System.Xml/System/Xml/IXmlLineInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/LineInfo.cs b/System.Xml/System/Xml/LineInfo.cs index 76afcce36..4095a490d 100644 --- a/System.Xml/System/Xml/LineInfo.cs +++ b/System.Xml/System/Xml/LineInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/NameTable.cs b/System.Xml/System/Xml/NameTable.cs index 9ffc2ff5e..debdacdd3 100644 --- a/System.Xml/System/Xml/NameTable.cs +++ b/System.Xml/System/Xml/NameTable.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Ref.cs b/System.Xml/System/Xml/Ref.cs index 8df1dc313..f90790b10 100644 --- a/System.Xml/System/Xml/Ref.cs +++ b/System.Xml/System/Xml/Ref.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; diff --git a/System.Xml/System/Xml/Resolvers/XmlPreloadedResolver.cs b/System.Xml/System/Xml/Resolvers/XmlPreloadedResolver.cs index e3b347a51..69f9f41d7 100644 --- a/System.Xml/System/Xml/Resolvers/XmlPreloadedResolver.cs +++ b/System.Xml/System/Xml/Resolvers/XmlPreloadedResolver.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/Resolvers/XmlPreloadedResolverAsync.cs b/System.Xml/System/Xml/Resolvers/XmlPreloadedResolverAsync.cs index 109c6e6ad..01cde42a3 100644 --- a/System.Xml/System/Xml/Resolvers/XmlPreloadedResolverAsync.cs +++ b/System.Xml/System/Xml/Resolvers/XmlPreloadedResolverAsync.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/Schema/Asttree.cs b/System.Xml/System/Xml/Schema/Asttree.cs index 31facd0a7..48074ea45 100644 --- a/System.Xml/System/Xml/Schema/Asttree.cs +++ b/System.Xml/System/Xml/Schema/Asttree.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/AutoValidator.cs b/System.Xml/System/Xml/Schema/AutoValidator.cs index 33231373d..a18d39a6b 100644 --- a/System.Xml/System/Xml/Schema/AutoValidator.cs +++ b/System.Xml/System/Xml/Schema/AutoValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/BaseProcessor.cs b/System.Xml/System/Xml/Schema/BaseProcessor.cs index e6cf4bd1e..287f39f7a 100644 --- a/System.Xml/System/Xml/Schema/BaseProcessor.cs +++ b/System.Xml/System/Xml/Schema/BaseProcessor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/BaseValidator.cs b/System.Xml/System/Xml/Schema/BaseValidator.cs index 772630727..a41795d18 100644 --- a/System.Xml/System/Xml/Schema/BaseValidator.cs +++ b/System.Xml/System/Xml/Schema/BaseValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/BitSet.cs b/System.Xml/System/Xml/Schema/BitSet.cs index f8573bbcf..564c593ce 100644 --- a/System.Xml/System/Xml/Schema/BitSet.cs +++ b/System.Xml/System/Xml/Schema/BitSet.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/Chameleonkey.cs b/System.Xml/System/Xml/Schema/Chameleonkey.cs index b487289d7..2cf8040e5 100644 --- a/System.Xml/System/Xml/Schema/Chameleonkey.cs +++ b/System.Xml/System/Xml/Schema/Chameleonkey.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/CompiledidEntityConstraint.cs b/System.Xml/System/Xml/Schema/CompiledidEntityConstraint.cs index d6bb8a5ea..afe0acdf7 100644 --- a/System.Xml/System/Xml/Schema/CompiledidEntityConstraint.cs +++ b/System.Xml/System/Xml/Schema/CompiledidEntityConstraint.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/ConstraintStruct.cs b/System.Xml/System/Xml/Schema/ConstraintStruct.cs index 468d82b74..4e6cbfc1c 100644 --- a/System.Xml/System/Xml/Schema/ConstraintStruct.cs +++ b/System.Xml/System/Xml/Schema/ConstraintStruct.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { @@ -386,10 +386,9 @@ public override int GetHashCode() { } hashcode = 0; // indicate it's changed. even the calculated hashcode below is 0 for (int i = 0; i < this.ks.Length; i ++) { - if (this.ks[i] != null) { - // extract its primitive value to calculate hashcode - // decimal is handled differently to enable among different CLR types - this.ks[i].SetDecimal(); + // extract its primitive value to calculate hashcode + // decimal is handled differently to enable among different CLR types + this.ks[i].SetDecimal(); if (this.ks[i].IsDecimal) { for (int j = 0 ; j < this.ks[i].Dim ; j ++) { hashcode += this.ks[i].Dvalue[j].GetHashCode(); @@ -415,55 +414,31 @@ public override int GetHashCode() { hashcode += this.ks[i].Value.GetHashCode(); } } - } } return hashcode; } // considering about derived type public override bool Equals(object other) { - if (LocalAppContextSwitches.IgnoreEmptyKeySequences) { - // each key sequence member can have different type - KeySequence keySequence = (KeySequence)other; - for (int i = 0; i < this.ks.Length; i++) { - if (!this.ks[i].Equals(keySequence.ks[i])) { - return false; - } - } - return true; - } - else { - // each key sequence member can have different type - KeySequence keySequence = (KeySequence)other; - for (int i = 0; i < this.ks.Length; i++) { - if (!(this.ks[i] == null && keySequence.ks[i] == null) && (this.ks[i] == null || keySequence.ks[i] == null || !this.ks[i].Equals(keySequence.ks[i]))) { - return false; - } + // each key sequence member can have different type + KeySequence keySequence = (KeySequence)other; + for (int i = 0; i < this.ks.Length; i++) { + if (!this.ks[i].Equals(keySequence.ks[i])) { + return false; } - return true; } - } + return true; + } public override string ToString() { - if (LocalAppContextSwitches.IgnoreEmptyKeySequences) { - StringBuilder sb = new StringBuilder(); - sb.Append(this.ks[0].ToString()); - for (int i = 1; i < this.ks.Length; i++) { - sb.Append(" "); - sb.Append(this.ks[i].ToString()); - } - return sb.ToString(); + StringBuilder sb = new StringBuilder(); + sb.Append(this.ks[0].ToString()); + for (int i = 1; i < this.ks.Length; i++) { + sb.Append(" "); + sb.Append(this.ks[i].ToString()); } - else { - StringBuilder sb = new StringBuilder(); - sb.Append(this.ks[0].ToString()); - for (int i = 1; i < this.ks.Length; i++) { - sb.Append(" "); - sb.Append(this.ks[i] == null ? "{}" : this.ks[i].ToString()); - } - return sb.ToString(); - } - } + return sb.ToString(); + } } } diff --git a/System.Xml/System/Xml/Schema/ContentValidator.cs b/System.Xml/System/Xml/Schema/ContentValidator.cs index a2eb25b66..fcee874bd 100644 --- a/System.Xml/System/Xml/Schema/ContentValidator.cs +++ b/System.Xml/System/Xml/Schema/ContentValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Xml/System/Xml/Schema/DataTypeImplementation.cs b/System.Xml/System/Xml/Schema/DataTypeImplementation.cs index 2e85e1866..efeab3644 100644 --- a/System.Xml/System/Xml/Schema/DataTypeImplementation.cs +++ b/System.Xml/System/Xml/Schema/DataTypeImplementation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { @@ -805,7 +805,7 @@ protected int Compare(byte[] value1, byte[] value2) { return 0; } -#if Microsoft +#if PRIYAL protected object GetValueToCheck(object value, IXmlNamespaceResolver nsmgr) { object valueToCheck = value; string resId; diff --git a/System.Xml/System/Xml/Schema/DtdParser.cs b/System.Xml/System/Xml/Schema/DtdParser.cs index c72fe649f..a9d85fc20 100644 --- a/System.Xml/System/Xml/Schema/DtdParser.cs +++ b/System.Xml/System/Xml/Schema/DtdParser.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Schema/DtdValidator.cs b/System.Xml/System/Xml/Schema/DtdValidator.cs index 086df1b39..f103e3da0 100644 --- a/System.Xml/System/Xml/Schema/DtdValidator.cs +++ b/System.Xml/System/Xml/Schema/DtdValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/FacetChecker.cs b/System.Xml/System/Xml/Schema/FacetChecker.cs index ea32d7099..398a2aa52 100644 --- a/System.Xml/System/Xml/Schema/FacetChecker.cs +++ b/System.Xml/System/Xml/Schema/FacetChecker.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/Inference/Infer.cs b/System.Xml/System/Xml/Schema/Inference/Infer.cs index 18b13628c..2c7ce79c3 100644 --- a/System.Xml/System/Xml/Schema/Inference/Infer.cs +++ b/System.Xml/System/Xml/Schema/Inference/Infer.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Schema/Inference/XmlSchemaInferenceException.cs b/System.Xml/System/Xml/Schema/Inference/XmlSchemaInferenceException.cs index 69a3156bf..d41c45f14 100644 --- a/System.Xml/System/Xml/Schema/Inference/XmlSchemaInferenceException.cs +++ b/System.Xml/System/Xml/Schema/Inference/XmlSchemaInferenceException.cs @@ -2,8 +2,8 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft -// Microsoft +// [....] +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema diff --git a/System.Xml/System/Xml/Schema/NamespaceList.cs b/System.Xml/System/Xml/Schema/NamespaceList.cs index 93ecf3f60..7cb6a8a33 100644 --- a/System.Xml/System/Xml/Schema/NamespaceList.cs +++ b/System.Xml/System/Xml/Schema/NamespaceList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ diff --git a/System.Xml/System/Xml/Schema/Parser.cs b/System.Xml/System/Xml/Schema/Parser.cs index e296e7446..4f38bf400 100644 --- a/System.Xml/System/Xml/Schema/Parser.cs +++ b/System.Xml/System/Xml/Schema/Parser.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/Preprocessor.cs b/System.Xml/System/Xml/Schema/Preprocessor.cs index 06af06469..e7dd3880a 100644 --- a/System.Xml/System/Xml/Schema/Preprocessor.cs +++ b/System.Xml/System/Xml/Schema/Preprocessor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaAttDef.cs b/System.Xml/System/Xml/Schema/SchemaAttDef.cs index 0cd4d5757..48becdf5b 100644 --- a/System.Xml/System/Xml/Schema/SchemaAttDef.cs +++ b/System.Xml/System/Xml/Schema/SchemaAttDef.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaCollectionCompiler.cs b/System.Xml/System/Xml/Schema/SchemaCollectionCompiler.cs index 7dfc0226e..314986435 100644 --- a/System.Xml/System/Xml/Schema/SchemaCollectionCompiler.cs +++ b/System.Xml/System/Xml/Schema/SchemaCollectionCompiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { @@ -678,8 +678,8 @@ private void CompileSimpleContentRestriction(XmlSchemaComplexType complexType, X if (baseType.ContentType == XmlSchemaContentType.TextOnly) { if (simpleRestriction.BaseType == null) { datatype = baseType.Datatype; - //There is a - + //There is a bug here. Need to check if simpleRestriction has facets. + //If yes, Need tp apply these facets as well. } else { CompileSimpleType(simpleRestriction.BaseType); diff --git a/System.Xml/System/Xml/Schema/SchemaCollectionpreProcessor.cs b/System.Xml/System/Xml/Schema/SchemaCollectionpreProcessor.cs index f2fa40056..82e408150 100644 --- a/System.Xml/System/Xml/Schema/SchemaCollectionpreProcessor.cs +++ b/System.Xml/System/Xml/Schema/SchemaCollectionpreProcessor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaDeclBase.cs b/System.Xml/System/Xml/Schema/SchemaDeclBase.cs index 22f1d1dc8..65c11d09c 100644 --- a/System.Xml/System/Xml/Schema/SchemaDeclBase.cs +++ b/System.Xml/System/Xml/Schema/SchemaDeclBase.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaElementDecl.cs b/System.Xml/System/Xml/Schema/SchemaElementDecl.cs index 345c89d13..52d641f92 100644 --- a/System.Xml/System/Xml/Schema/SchemaElementDecl.cs +++ b/System.Xml/System/Xml/Schema/SchemaElementDecl.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaEntity.cs b/System.Xml/System/Xml/Schema/SchemaEntity.cs index f326c5bfe..c0c96d0d9 100644 --- a/System.Xml/System/Xml/Schema/SchemaEntity.cs +++ b/System.Xml/System/Xml/Schema/SchemaEntity.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaInfo.cs b/System.Xml/System/Xml/Schema/SchemaInfo.cs index 294ef6a35..6429bcad3 100644 --- a/System.Xml/System/Xml/Schema/SchemaInfo.cs +++ b/System.Xml/System/Xml/Schema/SchemaInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Schema/SchemaNames.cs b/System.Xml/System/Xml/Schema/SchemaNames.cs index c255e23f5..fb87652be 100644 --- a/System.Xml/System/Xml/Schema/SchemaNames.cs +++ b/System.Xml/System/Xml/Schema/SchemaNames.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaNamespacemanager.cs b/System.Xml/System/Xml/Schema/SchemaNamespacemanager.cs index ee380b1c1..af750839a 100644 --- a/System.Xml/System/Xml/Schema/SchemaNamespacemanager.cs +++ b/System.Xml/System/Xml/Schema/SchemaNamespacemanager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaNotation.cs b/System.Xml/System/Xml/Schema/SchemaNotation.cs index e156aa006..2c9604ce5 100644 --- a/System.Xml/System/Xml/Schema/SchemaNotation.cs +++ b/System.Xml/System/Xml/Schema/SchemaNotation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/SchemaSetCompiler.cs b/System.Xml/System/Xml/Schema/SchemaSetCompiler.cs index 02ce25bc6..d1dc9412e 100644 --- a/System.Xml/System/Xml/Schema/SchemaSetCompiler.cs +++ b/System.Xml/System/Xml/Schema/SchemaSetCompiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { @@ -591,7 +591,7 @@ private XmlSchemaSimpleType[] CompileBaseMemberTypes(XmlSchemaSimpleType simpleT } //Now add the baseTypes that are defined inside the union itself - XmlSchemaObjectCollection mainBaseTypes = mainUnion.BaseTypes; // + XmlSchemaObjectCollection mainBaseTypes = mainUnion.BaseTypes; //TODO check for null if (mainBaseTypes != null) { for (int i = 0; i < mainBaseTypes.Count; ++i) { XmlSchemaSimpleType st = (XmlSchemaSimpleType)mainBaseTypes[i]; @@ -736,8 +736,8 @@ private void CompileSimpleContentRestriction(XmlSchemaComplexType complexType, X if (baseType.ContentType == XmlSchemaContentType.TextOnly) { if (simpleRestriction.BaseType == null) { datatype = baseType.Datatype; - //There is a - + //There is a bug here. Need to check if simpleRestriction has facets. + //If yes, Need tp apply these facets as well. } else { CompileSimpleType(simpleRestriction.BaseType); @@ -1365,7 +1365,7 @@ private bool IsGroupBaseFromAny(XmlSchemaGroupBase derivedGroupBase, XmlSchemaAn return true; } -#if Microsoft +#if PRIYAL private bool IsElementFromGroupBase(XmlSchemaElement derivedElement, XmlSchemaGroupBase baseGroupBase, bool skipEmptableOnly) { if (!IsRangeSimple(baseGroupBase.MinOccurs, baseGroupBase.MaxOccurs) || !IsRangeSimple(derivedElement.MinOccurs, derivedElement.MaxOccurs)) { return IsElementFromGroupBase(derivedElement, baseGroupBase); //SPEC COMPLIANT diff --git a/System.Xml/System/Xml/Schema/ValidationEventArgs.cs b/System.Xml/System/Xml/Schema/ValidationEventArgs.cs index 779280b7e..8cce19ff1 100644 --- a/System.Xml/System/Xml/Schema/ValidationEventArgs.cs +++ b/System.Xml/System/Xml/Schema/ValidationEventArgs.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/ValidationState.cs b/System.Xml/System/Xml/Schema/ValidationState.cs index 8efbae5e5..8d60154db 100644 --- a/System.Xml/System/Xml/Schema/ValidationState.cs +++ b/System.Xml/System/Xml/Schema/ValidationState.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XdrBuilder.cs b/System.Xml/System/Xml/Schema/XdrBuilder.cs index fb5d27057..d19527ca7 100644 --- a/System.Xml/System/Xml/Schema/XdrBuilder.cs +++ b/System.Xml/System/Xml/Schema/XdrBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XdrValidator.cs b/System.Xml/System/Xml/Schema/XdrValidator.cs index 1f68d23b7..232088c90 100644 --- a/System.Xml/System/Xml/Schema/XdrValidator.cs +++ b/System.Xml/System/Xml/Schema/XdrValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlAtomicValue.cs b/System.Xml/System/Xml/Schema/XmlAtomicValue.cs index 20356ef46..b5f81386b 100644 --- a/System.Xml/System/Xml/Schema/XmlAtomicValue.cs +++ b/System.Xml/System/Xml/Schema/XmlAtomicValue.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Xml/System/Xml/Schema/XmlSchema.cs b/System.Xml/System/Xml/Schema/XmlSchema.cs index 58e4d475e..569b5bf53 100644 --- a/System.Xml/System/Xml/Schema/XmlSchema.cs +++ b/System.Xml/System/Xml/Schema/XmlSchema.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAll.cs b/System.Xml/System/Xml/Schema/XmlSchemaAll.cs index 049a900b6..2b84df839 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAll.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAll.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAnnotated.cs b/System.Xml/System/Xml/Schema/XmlSchemaAnnotated.cs index 836e430db..48c108af7 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAnnotated.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAnnotated.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAnnotation.cs b/System.Xml/System/Xml/Schema/XmlSchemaAnnotation.cs index 9fd7fd10f..c3a052d0e 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAnnotation.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAnnotation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAny.cs b/System.Xml/System/Xml/Schema/XmlSchemaAny.cs index a811ed67e..a57e92753 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAny.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAny.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAnyAttribute.cs b/System.Xml/System/Xml/Schema/XmlSchemaAnyAttribute.cs index 8eb31c731..c1fc90449 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAnyAttribute.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAnyAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAppInfo.cs b/System.Xml/System/Xml/Schema/XmlSchemaAppInfo.cs index aba46e610..c738d792a 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAppInfo.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAppInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAttribute.cs b/System.Xml/System/Xml/Schema/XmlSchemaAttribute.cs index 4920ccbbe..30eebaaac 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAttribute.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroup.cs b/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroup.cs index 46ee40ef0..f05e75f10 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroup.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroupref.cs b/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroupref.cs index b69122fe3..d42202a8f 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroupref.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaAttributeGroupref.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaChoice.cs b/System.Xml/System/Xml/Schema/XmlSchemaChoice.cs index 9e4e15769..db19ae6e2 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaChoice.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaChoice.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaCollection.cs b/System.Xml/System/Xml/Schema/XmlSchemaCollection.cs index 23f4a3c21..38b1e0240 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaCollection.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaCollection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaCompilationSettings.cs b/System.Xml/System/Xml/Schema/XmlSchemaCompilationSettings.cs index c0544a162..babedcc1c 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaCompilationSettings.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaCompilationSettings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaComplexContent.cs b/System.Xml/System/Xml/Schema/XmlSchemaComplexContent.cs index 7fd72fb39..87560df0c 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaComplexContent.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaComplexContent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaComplexContentExtension.cs b/System.Xml/System/Xml/Schema/XmlSchemaComplexContentExtension.cs index ba4213a29..8404e53b5 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaComplexContentExtension.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaComplexContentExtension.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaComplexContentRestriction.cs b/System.Xml/System/Xml/Schema/XmlSchemaComplexContentRestriction.cs index 1879a3b34..522d63544 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaComplexContentRestriction.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaComplexContentRestriction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaComplexType.cs b/System.Xml/System/Xml/Schema/XmlSchemaComplexType.cs index 0ce2f136c..1db07809c 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaComplexType.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaComplexType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaDataType.cs b/System.Xml/System/Xml/Schema/XmlSchemaDataType.cs index 28bd99b2d..164891340 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaDataType.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaDataType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; using System.Diagnostics; @@ -337,7 +337,7 @@ internal static string XdrCanonizeUri(string uri, XmlNameTable nameTable, Schema return canonicalUri; } -#if Microsoft +#if PRIYAL private bool CanConvert(object value, System.Type inputType, System.Type defaultType, out string resId) { resId = null; decimal decimalValue; diff --git a/System.Xml/System/Xml/Schema/XmlSchemaDocumentation.cs b/System.Xml/System/Xml/Schema/XmlSchemaDocumentation.cs index a3d46ffb9..8468b38d2 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaDocumentation.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaDocumentation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaElement.cs b/System.Xml/System/Xml/Schema/XmlSchemaElement.cs index 52604d931..fd7e91449 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaElement.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaElement.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.ComponentModel; diff --git a/System.Xml/System/Xml/Schema/XmlSchemaException.cs b/System.Xml/System/Xml/Schema/XmlSchemaException.cs index 6f9aebcca..508c058bb 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaException.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaExternal.cs b/System.Xml/System/Xml/Schema/XmlSchemaExternal.cs index b5e41e694..29f2d0d73 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaExternal.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaExternal.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaFacet.cs b/System.Xml/System/Xml/Schema/XmlSchemaFacet.cs index 1a5478697..df6402047 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaFacet.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaFacet.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaGroup.cs b/System.Xml/System/Xml/Schema/XmlSchemaGroup.cs index df6049d0c..0453e2f6d 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaGroup.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaGroup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaGroupRef.cs b/System.Xml/System/Xml/Schema/XmlSchemaGroupRef.cs index 973cfbf60..8f6bfd74f 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaGroupRef.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaGroupRef.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaIdEntityConstraint.cs b/System.Xml/System/Xml/Schema/XmlSchemaIdEntityConstraint.cs index 768a05dfb..94ff513cd 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaIdEntityConstraint.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaIdEntityConstraint.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaImport.cs b/System.Xml/System/Xml/Schema/XmlSchemaImport.cs index 68aa2a3fe..4683a0a74 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaImport.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaImport.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaInclude.cs b/System.Xml/System/Xml/Schema/XmlSchemaInclude.cs index a7d9fc838..143944e44 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaInclude.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaInclude.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaInfo.cs b/System.Xml/System/Xml/Schema/XmlSchemaInfo.cs index e8a764df5..81d503a13 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaInfo.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Xml; diff --git a/System.Xml/System/Xml/Schema/XmlSchemaNotation.cs b/System.Xml/System/Xml/Schema/XmlSchemaNotation.cs index cc14abe77..38178eccd 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaNotation.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaNotation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaObject.cs b/System.Xml/System/Xml/Schema/XmlSchemaObject.cs index 70c41758f..7c42f39bc 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaObject.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaObject.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaObjectCollection.cs b/System.Xml/System/Xml/Schema/XmlSchemaObjectCollection.cs index aa392aea9..a3e46ec07 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaObjectCollection.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaObjectCollection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaObjectTable.cs b/System.Xml/System/Xml/Schema/XmlSchemaObjectTable.cs index ff82368dd..5277ce639 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaObjectTable.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaObjectTable.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaParticle.cs b/System.Xml/System/Xml/Schema/XmlSchemaParticle.cs index 4317b7302..7ed178dbe 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaParticle.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaParticle.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaRedefine.cs b/System.Xml/System/Xml/Schema/XmlSchemaRedefine.cs index 1eb572a43..baa659da8 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaRedefine.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaRedefine.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSequence.cs b/System.Xml/System/Xml/Schema/XmlSchemaSequence.cs index 73a329725..9ea17ae09 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSequence.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSequence.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSet.cs b/System.Xml/System/Xml/Schema/XmlSchemaSet.cs index bffc4b7cf..ab9d27e27 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSet.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSet.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Diagnostics; using System.Collections; @@ -598,11 +598,11 @@ public void Compile() { /// [To be supplied.] /// public XmlSchema Reprocess(XmlSchema schema) { - // Due to - - - - + // Due to bug 644477 - this method is tightly coupled (THE CODE IS BASICALLY COPIED) to Remove, Add and AddSchemaToSet + // methods. If you change anything here *make sure* to update Remove/Add/AddSchemaToSet method(s) accordingly. + // The only difference is that we don't touch .schemas collection here to not break a code like this: + // foreach(XmlSchema s in schemaset.schemas) { schemaset.Reprocess(s); } + // This is by purpose. if (schema == null) { throw new ArgumentNullException("schema"); } @@ -718,8 +718,8 @@ public ICollection Schemas(String targetNamespace) { //Internal Methods private XmlSchema Add(string targetNamespace, XmlSchema schema) { - // Due to - + // Due to bug 644477 - this method is tightly coupled (THE CODE IS BASICALLY COPIED) to Reprocess + // method. If you change anything here *make sure* to update Reprocess method accordingly. if (schema == null || schema.ErrorCount != 0) { //Schema with parsing errors cannot be loaded return null; @@ -908,8 +908,8 @@ private void SetDtdProcessing(XmlReader reader) { } private void AddSchemaToSet(XmlSchema schema) { - // Due to - + // Due to bug 644477 - this method is tightly coupled (THE CODE IS BASICALLY COPIED) to Reprocess + // method. If you change anything here *make sure* to update Reprocess method accordingly. schemas.Add(schema.SchemaId, schema); //Add to targetNamespaces table @@ -998,8 +998,8 @@ private void ResolveSubstitutionGroup(XmlSchemaSubstitutionGroup substitutionGro } internal XmlSchema Remove(XmlSchema schema, bool forceCompile) { - // Due to - + // Due to bug 644477 - this method is tightly coupled (THE CODE IS BASICALLY COPIED) to Reprocess + // method. If you change anything here *make sure* to update Reprocess method accordingly. if (schema == null) { throw new ArgumentNullException("schema"); } diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContent.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContent.cs index 09e12ca1d..72b8e838c 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContent.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContent.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentExtension.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentExtension.cs index 518fc1a80..bd843c600 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentExtension.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentExtension.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentRestriction.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentRestriction.cs index 6d5572294..44ba84957 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentRestriction.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleContentRestriction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleType.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleType.cs index 7c5f4e01c..fc2d9a636 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleType.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeList.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeList.cs index e4c1d46e3..b61ad2ced 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeList.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeRestriction.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeRestriction.cs index ed297392f..00a50e25d 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeRestriction.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeRestriction.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeUnion.cs b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeUnion.cs index b79aa843e..7b0f5d209 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeUnion.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSimpleTypeUnion.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaSubstitutionGroup.cs b/System.Xml/System/Xml/Schema/XmlSchemaSubstitutionGroup.cs index 8a9a38a1f..57c128310 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaSubstitutionGroup.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaSubstitutionGroup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaType.cs b/System.Xml/System/Xml/Schema/XmlSchemaType.cs index 03330c744..033fa6c43 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaType.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaType.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Xml/System/Xml/Schema/XmlSchemaValidationException.cs b/System.Xml/System/Xml/Schema/XmlSchemaValidationException.cs index 855c9e0cb..7f6719ef1 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaValidationException.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaValidationException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XmlSchemaValidator.cs b/System.Xml/System/Xml/Schema/XmlSchemaValidator.cs index 05b3b5784..acfd701d4 100644 --- a/System.Xml/System/Xml/Schema/XmlSchemaValidator.cs +++ b/System.Xml/System/Xml/Schema/XmlSchemaValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; @@ -1971,8 +1971,15 @@ private void EndElementIdentityConstraints(object typedValue, string stringValue } else { // for element, Reader.Value = ""; - if(typedValue != null && stringValue.Length != 0) { - laxis.Ks[laxis.Column] = new TypedObject(typedValue, stringValue, datatype); + if (LocalAppContextSwitches.IgnoreEmptyKeySequences) { + if (typedValue != null && stringValue.Length != 0) { + laxis.Ks[laxis.Column] = new TypedObject(typedValue, stringValue, datatype); + } + } + else { + if (typedValue != null) { + laxis.Ks[laxis.Column] = new TypedObject(typedValue, stringValue, datatype); + } } } } @@ -2006,10 +2013,8 @@ private void EndElementIdentityConstraints(object typedValue, string stringValue break; case CompiledIdentityConstraint.ConstraintRole.Unique: - if (LocalAppContextSwitches.IgnoreEmptyKeySequences) { - if (!ks.IsQualified()) { - continue; - } + if (!ks.IsQualified()) { + continue; } if (constraints[i].qualifiedTable.Contains (ks)) { // unique or key checking confliction diff --git a/System.Xml/System/Xml/Schema/XmlValueConverter.cs b/System.Xml/System/Xml/Schema/XmlValueConverter.cs index 10742ccec..02ccfd06e 100644 --- a/System.Xml/System/Xml/Schema/XmlValueConverter.cs +++ b/System.Xml/System/Xml/Schema/XmlValueConverter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Xml; diff --git a/System.Xml/System/Xml/Schema/XsdBuilder.cs b/System.Xml/System/Xml/Schema/XsdBuilder.cs index 1b003a79e..21c0ddc0e 100644 --- a/System.Xml/System/Xml/Schema/XsdBuilder.cs +++ b/System.Xml/System/Xml/Schema/XsdBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XsdDateTime.cs b/System.Xml/System/Xml/Schema/XsdDateTime.cs index 923651d28..41b2d7223 100644 --- a/System.Xml/System/Xml/Schema/XsdDateTime.cs +++ b/System.Xml/System/Xml/Schema/XsdDateTime.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XsdDuration.cs b/System.Xml/System/Xml/Schema/XsdDuration.cs index 8efe7a1fb..cd8d56364 100644 --- a/System.Xml/System/Xml/Schema/XsdDuration.cs +++ b/System.Xml/System/Xml/Schema/XsdDuration.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Schema/XsdValidator.cs b/System.Xml/System/Xml/Schema/XsdValidator.cs index eeed4aeca..32f4e9275 100644 --- a/System.Xml/System/Xml/Schema/XsdValidator.cs +++ b/System.Xml/System/Xml/Schema/XsdValidator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Schema { diff --git a/System.Xml/System/Xml/Serialization/Advanced/SchemaImporterExtension.cs b/System.Xml/System/Xml/Serialization/Advanced/SchemaImporterExtension.cs index c619b6c7a..405b942ee 100644 --- a/System.Xml/System/Xml/Serialization/Advanced/SchemaImporterExtension.cs +++ b/System.Xml/System/Xml/Serialization/Advanced/SchemaImporterExtension.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Advanced { diff --git a/System.Xml/System/Xml/Serialization/CodeExporter.cs b/System.Xml/System/Xml/Serialization/CodeExporter.cs index 4b1cfbc7e..5084e376c 100644 --- a/System.Xml/System/Xml/Serialization/CodeExporter.cs +++ b/System.Xml/System/Xml/Serialization/CodeExporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/CodeGenerator.cs b/System.Xml/System/Xml/Serialization/CodeGenerator.cs index bba1d884d..59daa34a2 100644 --- a/System.Xml/System/Xml/Serialization/CodeGenerator.cs +++ b/System.Xml/System/Xml/Serialization/CodeGenerator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/Serialization/CodeIdentifier.cs b/System.Xml/System/Xml/Serialization/CodeIdentifier.cs index c0dea737d..324f1af21 100644 --- a/System.Xml/System/Xml/Serialization/CodeIdentifier.cs +++ b/System.Xml/System/Xml/Serialization/CodeIdentifier.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/CodeIdentifiers.cs b/System.Xml/System/Xml/Serialization/CodeIdentifiers.cs index 33c37fb94..1213c82f2 100644 --- a/System.Xml/System/Xml/Serialization/CodeIdentifiers.cs +++ b/System.Xml/System/Xml/Serialization/CodeIdentifiers.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Compilation.cs b/System.Xml/System/Xml/Serialization/Compilation.cs index 7706d7f97..686958833 100644 --- a/System.Xml/System/Xml/Serialization/Compilation.cs +++ b/System.Xml/System/Xml/Serialization/Compilation.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Compiler.cs b/System.Xml/System/Xml/Serialization/Compiler.cs index 1cd1c6499..a415250e5 100644 --- a/System.Xml/System/Xml/Serialization/Compiler.cs +++ b/System.Xml/System/Xml/Serialization/Compiler.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Configuration/ConfigurationStrings.cs b/System.Xml/System/Xml/Serialization/Configuration/ConfigurationStrings.cs index 34b7f45b4..76688cdf0 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/ConfigurationStrings.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/ConfigurationStrings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration { diff --git a/System.Xml/System/Xml/Serialization/Configuration/DateTimeSerializationSection.cs b/System.Xml/System/Xml/Serialization/Configuration/DateTimeSerializationSection.cs index 35fe5d870..027acb398 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/DateTimeSerializationSection.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/DateTimeSerializationSection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration diff --git a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElement.cs b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElement.cs index d9888c041..7f39043eb 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElement.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElement.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration diff --git a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElementCollection.cs b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElementCollection.cs index 3f899c42c..e07656322 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElementCollection.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionElementCollection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration diff --git a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionsSection.cs b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionsSection.cs index 24cceb88b..3ecdd9aa4 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionsSection.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/SchemaImporterExtensionsSection.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration diff --git a/System.Xml/System/Xml/Serialization/Configuration/SerializationSectionGroup.cs b/System.Xml/System/Xml/Serialization/Configuration/SerializationSectionGroup.cs index d580ade6d..331af984e 100644 --- a/System.Xml/System/Xml/Serialization/Configuration/SerializationSectionGroup.cs +++ b/System.Xml/System/Xml/Serialization/Configuration/SerializationSectionGroup.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization.Configuration diff --git a/System.Xml/System/Xml/Serialization/ImportContext.cs b/System.Xml/System/Xml/Serialization/ImportContext.cs index 0020cbd41..7a4bd83ad 100644 --- a/System.Xml/System/Xml/Serialization/ImportContext.cs +++ b/System.Xml/System/Xml/Serialization/ImportContext.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Mappings.cs b/System.Xml/System/Xml/Serialization/Mappings.cs index b8be09a3a..b1143fdd1 100644 --- a/System.Xml/System/Xml/Serialization/Mappings.cs +++ b/System.Xml/System/Xml/Serialization/Mappings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Models.cs b/System.Xml/System/Xml/Serialization/Models.cs index adeb66317..a555726ea 100644 --- a/System.Xml/System/Xml/Serialization/Models.cs +++ b/System.Xml/System/Xml/Serialization/Models.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/NameTable.cs b/System.Xml/System/Xml/Serialization/NameTable.cs index 9df48e366..eb9a3973a 100644 --- a/System.Xml/System/Xml/Serialization/NameTable.cs +++ b/System.Xml/System/Xml/Serialization/NameTable.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/PrimitiveXmlSerializers.cs b/System.Xml/System/Xml/Serialization/PrimitiveXmlSerializers.cs index d2df57b81..5915f59b1 100644 --- a/System.Xml/System/Xml/Serialization/PrimitiveXmlSerializers.cs +++ b/System.Xml/System/Xml/Serialization/PrimitiveXmlSerializers.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SchemaImporter.cs b/System.Xml/System/Xml/Serialization/SchemaImporter.cs index 98b437c73..df6e2baa7 100644 --- a/System.Xml/System/Xml/Serialization/SchemaImporter.cs +++ b/System.Xml/System/Xml/Serialization/SchemaImporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SchemaObjectWriter.cs b/System.Xml/System/Xml/Serialization/SchemaObjectWriter.cs index c3cdc3dfa..0c356f8b4 100644 --- a/System.Xml/System/Xml/Serialization/SchemaObjectWriter.cs +++ b/System.Xml/System/Xml/Serialization/SchemaObjectWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapAttributeAttribute.cs b/System.Xml/System/Xml/Serialization/SoapAttributeAttribute.cs index b7d0b0173..c67b07494 100644 --- a/System.Xml/System/Xml/Serialization/SoapAttributeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapAttributeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapAttributeOverrides.cs b/System.Xml/System/Xml/Serialization/SoapAttributeOverrides.cs index 973efa75f..70e4578fd 100644 --- a/System.Xml/System/Xml/Serialization/SoapAttributeOverrides.cs +++ b/System.Xml/System/Xml/Serialization/SoapAttributeOverrides.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapAttributes.cs b/System.Xml/System/Xml/Serialization/SoapAttributes.cs index 1351c4f24..7e51c2ae2 100644 --- a/System.Xml/System/Xml/Serialization/SoapAttributes.cs +++ b/System.Xml/System/Xml/Serialization/SoapAttributes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapCodeExporter.cs b/System.Xml/System/Xml/Serialization/SoapCodeExporter.cs index 0f6903891..f7b9ed878 100644 --- a/System.Xml/System/Xml/Serialization/SoapCodeExporter.cs +++ b/System.Xml/System/Xml/Serialization/SoapCodeExporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapElementAttribute.cs b/System.Xml/System/Xml/Serialization/SoapElementAttribute.cs index d1efc68cc..b30a00770 100644 --- a/System.Xml/System/Xml/Serialization/SoapElementAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapElementAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapEnumAttribute.cs b/System.Xml/System/Xml/Serialization/SoapEnumAttribute.cs index badd54f86..28af677d6 100644 --- a/System.Xml/System/Xml/Serialization/SoapEnumAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapEnumAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapIgnoreAttribute.cs b/System.Xml/System/Xml/Serialization/SoapIgnoreAttribute.cs index d4b6f158a..fbd44f768 100644 --- a/System.Xml/System/Xml/Serialization/SoapIgnoreAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapIgnoreAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapIncludeAttribute.cs b/System.Xml/System/Xml/Serialization/SoapIncludeAttribute.cs index b94e97973..5c406d7f5 100644 --- a/System.Xml/System/Xml/Serialization/SoapIncludeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapIncludeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapReflectionImporter.cs b/System.Xml/System/Xml/Serialization/SoapReflectionImporter.cs index 89159cfe0..5c7fdae0c 100644 --- a/System.Xml/System/Xml/Serialization/SoapReflectionImporter.cs +++ b/System.Xml/System/Xml/Serialization/SoapReflectionImporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapSchemaExporter.cs b/System.Xml/System/Xml/Serialization/SoapSchemaExporter.cs index aaf94a644..17d6dfd57 100644 --- a/System.Xml/System/Xml/Serialization/SoapSchemaExporter.cs +++ b/System.Xml/System/Xml/Serialization/SoapSchemaExporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapSchemaImporter.cs b/System.Xml/System/Xml/Serialization/SoapSchemaImporter.cs index f36606e7b..65a6e2a38 100644 --- a/System.Xml/System/Xml/Serialization/SoapSchemaImporter.cs +++ b/System.Xml/System/Xml/Serialization/SoapSchemaImporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapSchemamember.cs b/System.Xml/System/Xml/Serialization/SoapSchemamember.cs index eb710ad17..09f0e10d7 100644 --- a/System.Xml/System/Xml/Serialization/SoapSchemamember.cs +++ b/System.Xml/System/Xml/Serialization/SoapSchemamember.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SoapTypeAttribute.cs b/System.Xml/System/Xml/Serialization/SoapTypeAttribute.cs index 51b16412c..450f4ce5a 100644 --- a/System.Xml/System/Xml/Serialization/SoapTypeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/SoapTypeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/SourceInfo.cs b/System.Xml/System/Xml/Serialization/SourceInfo.cs index b0337dfe8..1663c89a9 100644 --- a/System.Xml/System/Xml/Serialization/SourceInfo.cs +++ b/System.Xml/System/Xml/Serialization/SourceInfo.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Types.cs b/System.Xml/System/Xml/Serialization/Types.cs index 103b424f9..f924a4374 100644 --- a/System.Xml/System/Xml/Serialization/Types.cs +++ b/System.Xml/System/Xml/Serialization/Types.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { @@ -476,7 +476,7 @@ static TypeScope() { AddPrimitive(typeof(byte[]), "base64Binary", "ByteArrayBase64", TypeFlags.AmbiguousDataType | TypeFlags.CanBeAttributeValue | TypeFlags.CanBeElementValue | TypeFlags.HasCustomFormatter | TypeFlags.Reference | TypeFlags.IgnoreDefault | TypeFlags.XmlEncodingNotRequired | TypeFlags.HasDefaultConstructor); AddPrimitive(typeof(byte[]), "hexBinary", "ByteArrayHex", TypeFlags.AmbiguousDataType | TypeFlags.CanBeAttributeValue | TypeFlags.CanBeElementValue | TypeFlags.HasCustomFormatter | TypeFlags.Reference | TypeFlags.IgnoreDefault | TypeFlags.XmlEncodingNotRequired | TypeFlags.HasDefaultConstructor); - // NOTE, Microsoft: byte[] can also be used to mean array of bytes. That datatype is not a primitive, so we + // NOTE, [....]: byte[] can also be used to mean array of bytes. That datatype is not a primitive, so we // can't use the AmbiguousDataType mechanism. To get an array of bytes in literal XML, apply [XmlArray] or // [XmlArrayItem]. diff --git a/System.Xml/System/Xml/Serialization/XmlAnyAttributeAttribute.cs b/System.Xml/System/Xml/Serialization/XmlAnyAttributeAttribute.cs index aee71d513..87a78f38d 100644 --- a/System.Xml/System/Xml/Serialization/XmlAnyAttributeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlAnyAttributeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlAnyElementAttribute.cs b/System.Xml/System/Xml/Serialization/XmlAnyElementAttribute.cs index d9479840f..d83ce1e40 100644 --- a/System.Xml/System/Xml/Serialization/XmlAnyElementAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlAnyElementAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlAnyElementAttributes.cs b/System.Xml/System/Xml/Serialization/XmlAnyElementAttributes.cs index 58a9fc1cc..898934b90 100644 --- a/System.Xml/System/Xml/Serialization/XmlAnyElementAttributes.cs +++ b/System.Xml/System/Xml/Serialization/XmlAnyElementAttributes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlArrayAttribute.cs b/System.Xml/System/Xml/Serialization/XmlArrayAttribute.cs index f2f777ba4..6011b322f 100644 --- a/System.Xml/System/Xml/Serialization/XmlArrayAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlArrayAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlArrayItemAttribute.cs b/System.Xml/System/Xml/Serialization/XmlArrayItemAttribute.cs index e652fb697..a476a7eda 100644 --- a/System.Xml/System/Xml/Serialization/XmlArrayItemAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlArrayItemAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlArrayItemAttributes.cs b/System.Xml/System/Xml/Serialization/XmlArrayItemAttributes.cs index fb335d877..b5fbde2b9 100644 --- a/System.Xml/System/Xml/Serialization/XmlArrayItemAttributes.cs +++ b/System.Xml/System/Xml/Serialization/XmlArrayItemAttributes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlAttributeAttribute.cs b/System.Xml/System/Xml/Serialization/XmlAttributeAttribute.cs index f7d59c32f..07751a9b3 100644 --- a/System.Xml/System/Xml/Serialization/XmlAttributeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlAttributeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlAttributeOverrides.cs b/System.Xml/System/Xml/Serialization/XmlAttributeOverrides.cs index bdb8893ec..af725a332 100644 --- a/System.Xml/System/Xml/Serialization/XmlAttributeOverrides.cs +++ b/System.Xml/System/Xml/Serialization/XmlAttributeOverrides.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlAttributes.cs b/System.Xml/System/Xml/Serialization/XmlAttributes.cs index 31bb36612..58437daba 100644 --- a/System.Xml/System/Xml/Serialization/XmlAttributes.cs +++ b/System.Xml/System/Xml/Serialization/XmlAttributes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlChoiceIdentifierAttribute.cs b/System.Xml/System/Xml/Serialization/XmlChoiceIdentifierAttribute.cs index 021d99d07..c30af562a 100644 --- a/System.Xml/System/Xml/Serialization/XmlChoiceIdentifierAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlChoiceIdentifierAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlCodeExporter.cs b/System.Xml/System/Xml/Serialization/XmlCodeExporter.cs index bb8d1e177..690a9d8e1 100644 --- a/System.Xml/System/Xml/Serialization/XmlCodeExporter.cs +++ b/System.Xml/System/Xml/Serialization/XmlCodeExporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlElementAttribute.cs b/System.Xml/System/Xml/Serialization/XmlElementAttribute.cs index bbe4dea20..cb302c652 100644 --- a/System.Xml/System/Xml/Serialization/XmlElementAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlElementAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlElementAttributes.cs b/System.Xml/System/Xml/Serialization/XmlElementAttributes.cs index d868493f2..a94e8215b 100644 --- a/System.Xml/System/Xml/Serialization/XmlElementAttributes.cs +++ b/System.Xml/System/Xml/Serialization/XmlElementAttributes.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlEnumAttribute.cs b/System.Xml/System/Xml/Serialization/XmlEnumAttribute.cs index 969830dc0..3c658f592 100644 --- a/System.Xml/System/Xml/Serialization/XmlEnumAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlEnumAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlIgnoreAttribute.cs b/System.Xml/System/Xml/Serialization/XmlIgnoreAttribute.cs index 3aafd13b7..1205bb29f 100644 --- a/System.Xml/System/Xml/Serialization/XmlIgnoreAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlIgnoreAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlIncludeAttribute.cs b/System.Xml/System/Xml/Serialization/XmlIncludeAttribute.cs index 7616791ae..54034c8e1 100644 --- a/System.Xml/System/Xml/Serialization/XmlIncludeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlIncludeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlMapping.cs b/System.Xml/System/Xml/Serialization/XmlMapping.cs index 33efdae68..6158e7773 100644 --- a/System.Xml/System/Xml/Serialization/XmlMapping.cs +++ b/System.Xml/System/Xml/Serialization/XmlMapping.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlMemberMapping.cs b/System.Xml/System/Xml/Serialization/XmlMemberMapping.cs index ee5af6c4d..1636b004a 100644 --- a/System.Xml/System/Xml/Serialization/XmlMemberMapping.cs +++ b/System.Xml/System/Xml/Serialization/XmlMemberMapping.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlMembersMapping.cs b/System.Xml/System/Xml/Serialization/XmlMembersMapping.cs index 75331e3de..cfda29252 100644 --- a/System.Xml/System/Xml/Serialization/XmlMembersMapping.cs +++ b/System.Xml/System/Xml/Serialization/XmlMembersMapping.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlNamespaceDeclarationsAttribute.cs b/System.Xml/System/Xml/Serialization/XmlNamespaceDeclarationsAttribute.cs index ff139a068..efe61e284 100644 --- a/System.Xml/System/Xml/Serialization/XmlNamespaceDeclarationsAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlNamespaceDeclarationsAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlReflectionImporter.cs b/System.Xml/System/Xml/Serialization/XmlReflectionImporter.cs index 679017453..67ee9bc54 100644 --- a/System.Xml/System/Xml/Serialization/XmlReflectionImporter.cs +++ b/System.Xml/System/Xml/Serialization/XmlReflectionImporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlReflectionMember.cs b/System.Xml/System/Xml/Serialization/XmlReflectionMember.cs index d3f36fe92..2c9c0699d 100644 --- a/System.Xml/System/Xml/Serialization/XmlReflectionMember.cs +++ b/System.Xml/System/Xml/Serialization/XmlReflectionMember.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlRootAttribute.cs b/System.Xml/System/Xml/Serialization/XmlRootAttribute.cs index 622539303..fd00efa54 100644 --- a/System.Xml/System/Xml/Serialization/XmlRootAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlRootAttribute.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSchemaExporter.cs b/System.Xml/System/Xml/Serialization/XmlSchemaExporter.cs index d8e6e1318..8c0704b15 100644 --- a/System.Xml/System/Xml/Serialization/XmlSchemaExporter.cs +++ b/System.Xml/System/Xml/Serialization/XmlSchemaExporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSchemaImporter.cs b/System.Xml/System/Xml/Serialization/XmlSchemaImporter.cs index 1f7aa1d1a..2f4309b4f 100644 --- a/System.Xml/System/Xml/Serialization/XmlSchemaImporter.cs +++ b/System.Xml/System/Xml/Serialization/XmlSchemaImporter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSchemaProviderAttribute.cs b/System.Xml/System/Xml/Serialization/XmlSchemaProviderAttribute.cs index 27c46a662..ccdeec6bb 100644 --- a/System.Xml/System/Xml/Serialization/XmlSchemaProviderAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlSchemaProviderAttribute.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSchemas.cs b/System.Xml/System/Xml/Serialization/XmlSchemas.cs index 1e3e27f8e..eef8682e7 100644 --- a/System.Xml/System/Xml/Serialization/XmlSchemas.cs +++ b/System.Xml/System/Xml/Serialization/XmlSchemas.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationGeneratedCode.cs b/System.Xml/System/Xml/Serialization/XmlSerializationGeneratedCode.cs index d3f838001..a46500689 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationGeneratedCode.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationGeneratedCode.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationILGen.cs b/System.Xml/System/Xml/Serialization/XmlSerializationILGen.cs index 3460db55b..564d888ef 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationILGen.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationILGen.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationReader.cs b/System.Xml/System/Xml/Serialization/XmlSerializationReader.cs index 50c5e3b3e..9bbd7e244 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationReader.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { @@ -4185,7 +4185,7 @@ void WriteArray(string source, string arrayName, ArrayMapping arrayMapping, bool memberMapping.TypeDesc = arrayMapping.TypeDesc; memberMapping.ReadOnly = readOnly; Member member = new Member(this, source, arrayName, 0, memberMapping, false); - member.IsNullable = false;//Note, Microsoft: IsNullable is set to false since null condition (xsi:nil) is already handled by 'ReadNull()' + member.IsNullable = false;//Note, [....]: IsNullable is set to false since null condition (xsi:nil) is already handled by 'ReadNull()' Member[] members = new Member[] { member }; WriteMemberBegin(members); diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationReaderILGen.cs b/System.Xml/System/Xml/Serialization/XmlSerializationReaderILGen.cs index 6ba4b2d7f..e7f2c1bef 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationReaderILGen.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationReaderILGen.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { @@ -2881,7 +2881,7 @@ void WriteArray(string source, string arrayName, ArrayMapping arrayMapping, bool memberMapping.MemberInfo = memberInfos[source.Substring(3)]; } Member member = new Member(this, source, arrayName, elementIndex, memberMapping, false); - member.IsNullable = false;//Note, Microsoft: IsNullable is set to false since null condition (xsi:nil) is already handled by 'ReadNull()' + member.IsNullable = false;//Note, [....]: IsNullable is set to false since null condition (xsi:nil) is already handled by 'ReadNull()' Member[] members = new Member[] { member }; WriteMemberBegin(members); diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationWriter.cs b/System.Xml/System/Xml/Serialization/XmlSerializationWriter.cs index d15b2bf9b..69bbbd408 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationWriter.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { @@ -3627,7 +3627,7 @@ internal string GetStringForMember(string obj, string memberName, TypeDesc typeD return "(("+typeDesc.CSharpName+")"+obj+").@"+memberName; } //throw GetReflectionVariableException(saveTypeDesc.CSharpName,memberName); - // NOTE, Microsoft:Must never happen. If it does let the code + // NOTE, [....]:Must never happen. If it does let the code // gen continue to help debugging what's gone wrong. // Eventually the compilation will fail. return "["+obj+"]"; diff --git a/System.Xml/System/Xml/Serialization/XmlSerializationWriterILGen.cs b/System.Xml/System/Xml/Serialization/XmlSerializationWriterILGen.cs index 05e529ea2..0884a6c7b 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializationWriterILGen.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializationWriterILGen.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializer.cs b/System.Xml/System/Xml/Serialization/XmlSerializer.cs index eb11fe3b3..9600e7603 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializer.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializerAssemblyAttribute.cs b/System.Xml/System/Xml/Serialization/XmlSerializerAssemblyAttribute.cs index d8b1a898d..677f7a15f 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializerAssemblyAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializerAssemblyAttribute.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializerFactory.cs b/System.Xml/System/Xml/Serialization/XmlSerializerFactory.cs index a4bf3a0a9..9163984f4 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializerFactory.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializerFactory.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializerNamespaces.cs b/System.Xml/System/Xml/Serialization/XmlSerializerNamespaces.cs index ce3b533dc..de689d2a5 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializerNamespaces.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializerNamespaces.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlSerializerVersionAttribute.cs b/System.Xml/System/Xml/Serialization/XmlSerializerVersionAttribute.cs index be04e8991..4b5d05ee5 100644 --- a/System.Xml/System/Xml/Serialization/XmlSerializerVersionAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlSerializerVersionAttribute.cs @@ -3,7 +3,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlTextAttribute.cs b/System.Xml/System/Xml/Serialization/XmlTextAttribute.cs index 45fc96f74..0d793ef7b 100644 --- a/System.Xml/System/Xml/Serialization/XmlTextAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlTextAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlTypeAttribute.cs b/System.Xml/System/Xml/Serialization/XmlTypeAttribute.cs index 59a472331..636194687 100644 --- a/System.Xml/System/Xml/Serialization/XmlTypeAttribute.cs +++ b/System.Xml/System/Xml/Serialization/XmlTypeAttribute.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/XmlTypeMapping.cs b/System.Xml/System/Xml/Serialization/XmlTypeMapping.cs index c8240f3a0..4466a5160 100644 --- a/System.Xml/System/Xml/Serialization/XmlTypeMapping.cs +++ b/System.Xml/System/Xml/Serialization/XmlTypeMapping.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/Xmlcustomformatter.cs b/System.Xml/System/Xml/Serialization/Xmlcustomformatter.cs index 2b288ef83..81244cfe3 100644 --- a/System.Xml/System/Xml/Serialization/Xmlcustomformatter.cs +++ b/System.Xml/System/Xml/Serialization/Xmlcustomformatter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/_Events.cs b/System.Xml/System/Xml/Serialization/_Events.cs index ec9b3e782..491828807 100644 --- a/System.Xml/System/Xml/Serialization/_Events.cs +++ b/System.Xml/System/Xml/Serialization/_Events.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/Serialization/indentedWriter.cs b/System.Xml/System/Xml/Serialization/indentedWriter.cs index 5c6867eaf..22dac15fd 100644 --- a/System.Xml/System/Xml/Serialization/indentedWriter.cs +++ b/System.Xml/System/Xml/Serialization/indentedWriter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Serialization { diff --git a/System.Xml/System/Xml/ValidateNames.cs b/System.Xml/System/Xml/ValidateNames.cs index bf034e162..34bc73279 100644 --- a/System.Xml/System/Xml/ValidateNames.cs +++ b/System.Xml/System/Xml/ValidateNames.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/XPath/Internal/AbsoluteQuery.cs b/System.Xml/System/Xml/XPath/Internal/AbsoluteQuery.cs index 1dc479fe5..7c126900c 100644 --- a/System.Xml/System/Xml/XPath/Internal/AbsoluteQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/AbsoluteQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/AttributeQuery.cs b/System.Xml/System/Xml/XPath/Internal/AttributeQuery.cs index 052dfbc45..93be02804 100644 --- a/System.Xml/System/Xml/XPath/Internal/AttributeQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/AttributeQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Axis.cs b/System.Xml/System/Xml/XPath/Internal/Axis.cs index c64fb4307..658c08c7b 100644 --- a/System.Xml/System/Xml/XPath/Internal/Axis.cs +++ b/System.Xml/System/Xml/XPath/Internal/Axis.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/BaseAxisQuery.cs b/System.Xml/System/Xml/XPath/Internal/BaseAxisQuery.cs index 91c37b719..83170d035 100644 --- a/System.Xml/System/Xml/XPath/Internal/BaseAxisQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/BaseAxisQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/BooleanExpr.cs b/System.Xml/System/Xml/XPath/Internal/BooleanExpr.cs index fb3b9f7be..a8af11f65 100644 --- a/System.Xml/System/Xml/XPath/Internal/BooleanExpr.cs +++ b/System.Xml/System/Xml/XPath/Internal/BooleanExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/BooleanFunctions.cs b/System.Xml/System/Xml/XPath/Internal/BooleanFunctions.cs index b18ef609c..4fa3553f2 100644 --- a/System.Xml/System/Xml/XPath/Internal/BooleanFunctions.cs +++ b/System.Xml/System/Xml/XPath/Internal/BooleanFunctions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/CacheAxisQuery.cs b/System.Xml/System/Xml/XPath/Internal/CacheAxisQuery.cs index 4a264f4e7..47dd13ee6 100644 --- a/System.Xml/System/Xml/XPath/Internal/CacheAxisQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/CacheAxisQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/CacheChildrenQuery.cs b/System.Xml/System/Xml/XPath/Internal/CacheChildrenQuery.cs index 3ad2a6fb2..53954396c 100644 --- a/System.Xml/System/Xml/XPath/Internal/CacheChildrenQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/CacheChildrenQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/CacheOutputQuery.cs b/System.Xml/System/Xml/XPath/Internal/CacheOutputQuery.cs index e6331502c..492358dbc 100644 --- a/System.Xml/System/Xml/XPath/Internal/CacheOutputQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/CacheOutputQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ChildrenQuery.cs b/System.Xml/System/Xml/XPath/Internal/ChildrenQuery.cs index 7784a5ff4..a088816ba 100644 --- a/System.Xml/System/Xml/XPath/Internal/ChildrenQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ChildrenQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ClonableStack.cs b/System.Xml/System/Xml/XPath/Internal/ClonableStack.cs index 6181cd0d5..b2bc17735 100644 --- a/System.Xml/System/Xml/XPath/Internal/ClonableStack.cs +++ b/System.Xml/System/Xml/XPath/Internal/ClonableStack.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/CompiledXPathExpr.cs b/System.Xml/System/Xml/XPath/Internal/CompiledXPathExpr.cs index 0f87cd367..f5fd38548 100644 --- a/System.Xml/System/Xml/XPath/Internal/CompiledXPathExpr.cs +++ b/System.Xml/System/Xml/XPath/Internal/CompiledXPathExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ContextQuery.cs b/System.Xml/System/Xml/XPath/Internal/ContextQuery.cs index 56d4661d7..98ccd0e78 100644 --- a/System.Xml/System/Xml/XPath/Internal/ContextQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ContextQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/DescendantBaseQuery.cs b/System.Xml/System/Xml/XPath/Internal/DescendantBaseQuery.cs index 3fa58383c..b05f45174 100644 --- a/System.Xml/System/Xml/XPath/Internal/DescendantBaseQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/DescendantBaseQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/DescendantQuery.cs b/System.Xml/System/Xml/XPath/Internal/DescendantQuery.cs index 317e0da51..309204697 100644 --- a/System.Xml/System/Xml/XPath/Internal/DescendantQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/DescendantQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/DescendantoverDescendantQuery.cs b/System.Xml/System/Xml/XPath/Internal/DescendantoverDescendantQuery.cs index 4cc0776e0..140f6afe0 100644 --- a/System.Xml/System/Xml/XPath/Internal/DescendantoverDescendantQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/DescendantoverDescendantQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/DocumentorderQuery.cs b/System.Xml/System/Xml/XPath/Internal/DocumentorderQuery.cs index 0093670b3..9f38f0c7f 100644 --- a/System.Xml/System/Xml/XPath/Internal/DocumentorderQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/DocumentorderQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/EmptyQuery.cs b/System.Xml/System/Xml/XPath/Internal/EmptyQuery.cs index 4469a732c..141206b5a 100644 --- a/System.Xml/System/Xml/XPath/Internal/EmptyQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/EmptyQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ExtensionQuery.cs b/System.Xml/System/Xml/XPath/Internal/ExtensionQuery.cs index 219afd68e..6069968f2 100644 --- a/System.Xml/System/Xml/XPath/Internal/ExtensionQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ExtensionQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Filter.cs b/System.Xml/System/Xml/XPath/Internal/Filter.cs index b30bce34c..4dd89f489 100644 --- a/System.Xml/System/Xml/XPath/Internal/Filter.cs +++ b/System.Xml/System/Xml/XPath/Internal/Filter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/FilterQuery.cs b/System.Xml/System/Xml/XPath/Internal/FilterQuery.cs index 04b9e7427..257d441e2 100644 --- a/System.Xml/System/Xml/XPath/Internal/FilterQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/FilterQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/FollowingQuery.cs b/System.Xml/System/Xml/XPath/Internal/FollowingQuery.cs index 38235ba79..f6e837988 100644 --- a/System.Xml/System/Xml/XPath/Internal/FollowingQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/FollowingQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/FollowingSibling.cs b/System.Xml/System/Xml/XPath/Internal/FollowingSibling.cs index c26df84de..a50814eff 100644 --- a/System.Xml/System/Xml/XPath/Internal/FollowingSibling.cs +++ b/System.Xml/System/Xml/XPath/Internal/FollowingSibling.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ForwardPositionQuery.cs b/System.Xml/System/Xml/XPath/Internal/ForwardPositionQuery.cs index 34f5664b6..eef25bcce 100644 --- a/System.Xml/System/Xml/XPath/Internal/ForwardPositionQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ForwardPositionQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Function.cs b/System.Xml/System/Xml/XPath/Internal/Function.cs index 027bc49f2..1233c7235 100644 --- a/System.Xml/System/Xml/XPath/Internal/Function.cs +++ b/System.Xml/System/Xml/XPath/Internal/Function.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/FunctionQuery.cs b/System.Xml/System/Xml/XPath/Internal/FunctionQuery.cs index 0a94d6efe..26fc0f7e0 100644 --- a/System.Xml/System/Xml/XPath/Internal/FunctionQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/FunctionQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { @@ -62,7 +62,7 @@ public override object Evaluate(XPathNodeIterator nodeIterator) { object[] argVals = new object[args.Count]; for (int i = 0; i < args.Count; i ++) { argVals[i] = args[i].Evaluate(nodeIterator); - if (argVals[i] is XPathNodeIterator) {// ForBack Compat. To protect our queries from users. + if (argVals[i] is XPathNodeIterator) {// ForBack Compat. To protect our queries from users. bug#372077 & 20006123 argVals[i] = new XPathSelectionIterator(nodeIterator.Current, args[i]); } } diff --git a/System.Xml/System/Xml/XPath/Internal/Group.cs b/System.Xml/System/Xml/XPath/Internal/Group.cs index 578826b68..454ffb263 100644 --- a/System.Xml/System/Xml/XPath/Internal/Group.cs +++ b/System.Xml/System/Xml/XPath/Internal/Group.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/GroupQuery.cs b/System.Xml/System/Xml/XPath/Internal/GroupQuery.cs index 087d3bafa..597f93966 100644 --- a/System.Xml/System/Xml/XPath/Internal/GroupQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/GroupQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/IdQuery.cs b/System.Xml/System/Xml/XPath/Internal/IdQuery.cs index 9f4c1589d..5a6e292fd 100644 --- a/System.Xml/System/Xml/XPath/Internal/IdQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/IdQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/IteratorFilter.cs b/System.Xml/System/Xml/XPath/Internal/IteratorFilter.cs index 09279e239..e0718275e 100644 --- a/System.Xml/System/Xml/XPath/Internal/IteratorFilter.cs +++ b/System.Xml/System/Xml/XPath/Internal/IteratorFilter.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/LogicalExpr.cs b/System.Xml/System/Xml/XPath/Internal/LogicalExpr.cs index a0438225c..8a59b0566 100644 --- a/System.Xml/System/Xml/XPath/Internal/LogicalExpr.cs +++ b/System.Xml/System/Xml/XPath/Internal/LogicalExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/MergeFilterQuery.cs b/System.Xml/System/Xml/XPath/Internal/MergeFilterQuery.cs index 741273921..0b354f536 100644 --- a/System.Xml/System/Xml/XPath/Internal/MergeFilterQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/MergeFilterQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/NamespaceQuery.cs b/System.Xml/System/Xml/XPath/Internal/NamespaceQuery.cs index f3ad00498..36fd3fc1e 100644 --- a/System.Xml/System/Xml/XPath/Internal/NamespaceQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/NamespaceQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/NodeFunctions.cs b/System.Xml/System/Xml/XPath/Internal/NodeFunctions.cs index cf9566dfd..e7607376b 100644 --- a/System.Xml/System/Xml/XPath/Internal/NodeFunctions.cs +++ b/System.Xml/System/Xml/XPath/Internal/NodeFunctions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/NumberFunctions.cs b/System.Xml/System/Xml/XPath/Internal/NumberFunctions.cs index 72c11f917..b824bca29 100644 --- a/System.Xml/System/Xml/XPath/Internal/NumberFunctions.cs +++ b/System.Xml/System/Xml/XPath/Internal/NumberFunctions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/NumericExpr.cs b/System.Xml/System/Xml/XPath/Internal/NumericExpr.cs index 4a2fd0da6..ee2878f77 100644 --- a/System.Xml/System/Xml/XPath/Internal/NumericExpr.cs +++ b/System.Xml/System/Xml/XPath/Internal/NumericExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Operand.cs b/System.Xml/System/Xml/XPath/Internal/Operand.cs index aebbd8ef7..6240de8ab 100644 --- a/System.Xml/System/Xml/XPath/Internal/Operand.cs +++ b/System.Xml/System/Xml/XPath/Internal/Operand.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/OperandQuery.cs b/System.Xml/System/Xml/XPath/Internal/OperandQuery.cs index b88525410..6cf3e30d8 100644 --- a/System.Xml/System/Xml/XPath/Internal/OperandQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/OperandQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Operator.cs b/System.Xml/System/Xml/XPath/Internal/Operator.cs index 9739fb127..c4d7481fc 100644 --- a/System.Xml/System/Xml/XPath/Internal/Operator.cs +++ b/System.Xml/System/Xml/XPath/Internal/Operator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ParentQuery.cs b/System.Xml/System/Xml/XPath/Internal/ParentQuery.cs index b755fa535..8a0a6deba 100644 --- a/System.Xml/System/Xml/XPath/Internal/ParentQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ParentQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/PrecedingQuery.cs b/System.Xml/System/Xml/XPath/Internal/PrecedingQuery.cs index bc925cc1c..d56cac2bf 100644 --- a/System.Xml/System/Xml/XPath/Internal/PrecedingQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/PrecedingQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/PrecedingSibling.cs b/System.Xml/System/Xml/XPath/Internal/PrecedingSibling.cs index f690049c7..75399c76a 100644 --- a/System.Xml/System/Xml/XPath/Internal/PrecedingSibling.cs +++ b/System.Xml/System/Xml/XPath/Internal/PrecedingSibling.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Query.cs b/System.Xml/System/Xml/XPath/Internal/Query.cs index a70822ac7..73eae5c5c 100644 --- a/System.Xml/System/Xml/XPath/Internal/Query.cs +++ b/System.Xml/System/Xml/XPath/Internal/Query.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/QueryBuilder.cs b/System.Xml/System/Xml/XPath/Internal/QueryBuilder.cs index 580491f0f..19a56067a 100644 --- a/System.Xml/System/Xml/XPath/Internal/QueryBuilder.cs +++ b/System.Xml/System/Xml/XPath/Internal/QueryBuilder.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ResetableIterator.cs b/System.Xml/System/Xml/XPath/Internal/ResetableIterator.cs index e48a28e36..9943abe24 100644 --- a/System.Xml/System/Xml/XPath/Internal/ResetableIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/ResetableIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ReversePositionQuery.cs b/System.Xml/System/Xml/XPath/Internal/ReversePositionQuery.cs index 35bd8eff2..406ed7e5b 100644 --- a/System.Xml/System/Xml/XPath/Internal/ReversePositionQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ReversePositionQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Root.cs b/System.Xml/System/Xml/XPath/Internal/Root.cs index ad0fa9c91..fbfee2646 100644 --- a/System.Xml/System/Xml/XPath/Internal/Root.cs +++ b/System.Xml/System/Xml/XPath/Internal/Root.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/SortQuery.cs b/System.Xml/System/Xml/XPath/Internal/SortQuery.cs index 4be9a067e..47e28a291 100644 --- a/System.Xml/System/Xml/XPath/Internal/SortQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/SortQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/StringFunctions.cs b/System.Xml/System/Xml/XPath/Internal/StringFunctions.cs index 8b477ecf7..1d545b5e5 100644 --- a/System.Xml/System/Xml/XPath/Internal/StringFunctions.cs +++ b/System.Xml/System/Xml/XPath/Internal/StringFunctions.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/UnionExpr.cs b/System.Xml/System/Xml/XPath/Internal/UnionExpr.cs index b14786fc6..79e24be6b 100644 --- a/System.Xml/System/Xml/XPath/Internal/UnionExpr.cs +++ b/System.Xml/System/Xml/XPath/Internal/UnionExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/ValueQuery.cs b/System.Xml/System/Xml/XPath/Internal/ValueQuery.cs index ee50b81b7..41aa2e087 100644 --- a/System.Xml/System/Xml/XPath/Internal/ValueQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/ValueQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/Variable.cs b/System.Xml/System/Xml/XPath/Internal/Variable.cs index 594b9c8ae..1d6f50cf1 100644 --- a/System.Xml/System/Xml/XPath/Internal/Variable.cs +++ b/System.Xml/System/Xml/XPath/Internal/Variable.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/VariableQuery.cs b/System.Xml/System/Xml/XPath/Internal/VariableQuery.cs index c2b6ee2e3..ce6b7132c 100644 --- a/System.Xml/System/Xml/XPath/Internal/VariableQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/VariableQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathAncestorIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathAncestorIterator.cs index d0709058b..5f839cdfe 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathAncestorIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathAncestorIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathAncestorQuery.cs b/System.Xml/System/Xml/XPath/Internal/XPathAncestorQuery.cs index 1d2f04cc8..503d1f600 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathAncestorQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathAncestorQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathArrayIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathArrayIterator.cs index 9f16db6db..724df0e32 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathArrayIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathArrayIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/XPath/Internal/XPathAxisIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathAxisIterator.cs index c0aeb7005..512e8618f 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathAxisIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathAxisIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathChildIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathChildIterator.cs index 2ea63b694..f87c9c761 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathChildIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathChildIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathDescendantIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathDescendantIterator.cs index 5879555df..2cf77bef2 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathDescendantIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathDescendantIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathEmptyIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathEmptyIterator.cs index 7970452a3..6fa40453c 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathEmptyIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathEmptyIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathMultyIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathMultyIterator.cs index ac2f1fbec..ef8cb5858 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathMultyIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathMultyIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathParser.cs b/System.Xml/System/Xml/XPath/Internal/XPathParser.cs index 0192d80a6..c6a07aaa5 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathParser.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathParser.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathScanner.cs b/System.Xml/System/Xml/XPath/Internal/XPathScanner.cs index 3b78f4fad..76e15142e 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathScanner.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathScanner.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathSelectionIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathSelectionIterator.cs index deb898114..f09f8acc0 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathSelectionIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathSelectionIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathSelfQuery.cs b/System.Xml/System/Xml/XPath/Internal/XPathSelfQuery.cs index 33f932c26..e15cacaf7 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathSelfQuery.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathSelfQuery.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/Internal/XPathSingletonIterator.cs b/System.Xml/System/Xml/XPath/Internal/XPathSingletonIterator.cs index 4528669ed..6e32451a8 100644 --- a/System.Xml/System/Xml/XPath/Internal/XPathSingletonIterator.cs +++ b/System.Xml/System/Xml/XPath/Internal/XPathSingletonIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace MS.Internal.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/XPathDocument.cs b/System.Xml/System/Xml/XPath/XPathDocument.cs index e1d9bbe8e..3bb8e8ad5 100644 --- a/System.Xml/System/Xml/XPath/XPathDocument.cs +++ b/System.Xml/System/Xml/XPath/XPathDocument.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; @@ -231,7 +231,7 @@ internal void LoadFromReader(XmlReader reader, XmlSpace space) { case XmlNodeType.Whitespace: // We intentionally ignore the reader.XmlSpace property here and blindly trust - // the reported node type. If the reported information is not in sync + // the reported node type. If the reported information is not in [....] // (in this case if the reader.XmlSpace == Preserve) then we make the choice // to trust the reported node type. Since we have no control over the input reader // we can't even assert here. diff --git a/System.Xml/System/Xml/XPath/XPathException.cs b/System.Xml/System/Xml/XPath/XPathException.cs index 8eb02788a..533518ac8 100644 --- a/System.Xml/System/Xml/XPath/XPathException.cs +++ b/System.Xml/System/Xml/XPath/XPathException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/XPathExpr.cs b/System.Xml/System/Xml/XPath/XPathExpr.cs index 195bf20b9..803907df7 100644 --- a/System.Xml/System/Xml/XPath/XPathExpr.cs +++ b/System.Xml/System/Xml/XPath/XPathExpr.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.XPath { diff --git a/System.Xml/System/Xml/XPath/XPathItem.cs b/System.Xml/System/Xml/XPath/XPathItem.cs index 85653c0dc..ea954b05d 100644 --- a/System.Xml/System/Xml/XPath/XPathItem.cs +++ b/System.Xml/System/Xml/XPath/XPathItem.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Collections; diff --git a/System.Xml/System/Xml/XPath/XPathNavigator.cs b/System.Xml/System/Xml/XPath/XPathNavigator.cs index a1900faf0..ae5ecbc9b 100644 --- a/System.Xml/System/Xml/XPath/XPathNavigator.cs +++ b/System.Xml/System/Xml/XPath/XPathNavigator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.ComponentModel; diff --git a/System.Xml/System/Xml/XPath/XPathNavigatorKeyComparer.cs b/System.Xml/System/Xml/XPath/XPathNavigatorKeyComparer.cs index f6c83e1a4..dc09acf20 100644 --- a/System.Xml/System/Xml/XPath/XPathNavigatorKeyComparer.cs +++ b/System.Xml/System/Xml/XPath/XPathNavigatorKeyComparer.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/XPath/XPathNavigatorReader.cs b/System.Xml/System/Xml/XPath/XPathNavigatorReader.cs index 12226d205..beab98822 100644 --- a/System.Xml/System/Xml/XPath/XPathNavigatorReader.cs +++ b/System.Xml/System/Xml/XPath/XPathNavigatorReader.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.IO; diff --git a/System.Xml/System/Xml/XPath/XPathNodeIterator.cs b/System.Xml/System/Xml/XPath/XPathNodeIterator.cs index 2d60c8544..3731627ed 100644 --- a/System.Xml/System/Xml/XPath/XPathNodeIterator.cs +++ b/System.Xml/System/Xml/XPath/XPathNodeIterator.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Xml/System/Xml/XmlCharType.cs b/System.Xml/System/Xml/XmlCharType.cs index 17946153f..46237198c 100644 --- a/System.Xml/System/Xml/XmlCharType.cs +++ b/System.Xml/System/Xml/XmlCharType.cs @@ -6,7 +6,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ //#define XMLCHARTYPE_USE_RESOURCE // load the character properties from resources (XmlCharType.bin must be linked to System.Xml.dll) diff --git a/System.Xml/System/Xml/XmlComplianceUtil.cs b/System.Xml/System/Xml/XmlComplianceUtil.cs index c30f7263e..3c204926d 100644 --- a/System.Xml/System/Xml/XmlComplianceUtil.cs +++ b/System.Xml/System/Xml/XmlComplianceUtil.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; diff --git a/System.Xml/System/Xml/XmlConvert.cs b/System.Xml/System/Xml/XmlConvert.cs index 6942060d9..e8bdbe639 100644 --- a/System.Xml/System/Xml/XmlConvert.cs +++ b/System.Xml/System/Xml/XmlConvert.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlDownloadManager.cs b/System.Xml/System/Xml/XmlDownloadManager.cs index e388818d1..305dee8b7 100644 --- a/System.Xml/System/Xml/XmlDownloadManager.cs +++ b/System.Xml/System/Xml/XmlDownloadManager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlEncoding.cs b/System.Xml/System/Xml/XmlEncoding.cs index 012e1523d..c896a2136 100644 --- a/System.Xml/System/Xml/XmlEncoding.cs +++ b/System.Xml/System/Xml/XmlEncoding.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Text; diff --git a/System.Xml/System/Xml/XmlException.cs b/System.Xml/System/Xml/XmlException.cs index 2873952c6..40594f747 100644 --- a/System.Xml/System/Xml/XmlException.cs +++ b/System.Xml/System/Xml/XmlException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlNamespacemanager.cs b/System.Xml/System/Xml/XmlNamespacemanager.cs index 7cab6b103..7c825a1f3 100644 --- a/System.Xml/System/Xml/XmlNamespacemanager.cs +++ b/System.Xml/System/Xml/XmlNamespacemanager.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlNullResolver.cs b/System.Xml/System/Xml/XmlNullResolver.cs index 620bdc1c7..14dc8ded5 100644 --- a/System.Xml/System/Xml/XmlNullResolver.cs +++ b/System.Xml/System/Xml/XmlNullResolver.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ #if !SILVERLIGHT diff --git a/System.Xml/System/Xml/XmlQualifiedName.cs b/System.Xml/System/Xml/XmlQualifiedName.cs index 6aa29802b..c96a6636d 100644 --- a/System.Xml/System/Xml/XmlQualifiedName.cs +++ b/System.Xml/System/Xml/XmlQualifiedName.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlResolver.cs b/System.Xml/System/Xml/XmlResolver.cs index 2245d76d2..0576f38a8 100644 --- a/System.Xml/System/Xml/XmlResolver.cs +++ b/System.Xml/System/Xml/XmlResolver.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml diff --git a/System.Xml/System/Xml/XmlSecureResolver.cs b/System.Xml/System/Xml/XmlSecureResolver.cs index 31f28d141..b5b795ca7 100644 --- a/System.Xml/System/Xml/XmlSecureResolver.cs +++ b/System.Xml/System/Xml/XmlSecureResolver.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml { diff --git a/System.Xml/System/Xml/XmlUrlResolver.cs b/System.Xml/System/Xml/XmlUrlResolver.cs index 7dc2e20af..e762f5e35 100644 --- a/System.Xml/System/Xml/XmlUrlResolver.cs +++ b/System.Xml/System/Xml/XmlUrlResolver.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Threading; diff --git a/System.Xml/System/Xml/Xslt/XslCompiledTransform.cs b/System.Xml/System/Xml/Xslt/XslCompiledTransform.cs index 455e8912a..dda069806 100644 --- a/System.Xml/System/Xml/Xslt/XslCompiledTransform.cs +++ b/System.Xml/System/Xml/Xslt/XslCompiledTransform.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // http://webdata/xml/specs/XslCompiledTransform.xml //------------------------------------------------------------------------------ diff --git a/System.Xml/System/Xml/Xslt/XslTransform.cs b/System.Xml/System/Xml/Xslt/XslTransform.cs index 16031994e..e116f05e3 100644 --- a/System.Xml/System/Xml/Xslt/XslTransform.cs +++ b/System.Xml/System/Xml/Xslt/XslTransform.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ namespace System.Xml.Xsl { diff --git a/System.Xml/System/Xml/Xslt/XsltArgumentList.cs b/System.Xml/System/Xml/Xslt/XsltArgumentList.cs index bc33f89cb..d8f0c98b2 100644 --- a/System.Xml/System/Xml/Xslt/XsltArgumentList.cs +++ b/System.Xml/System/Xml/Xslt/XsltArgumentList.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Xml/System/Xml/Xslt/XsltContext.cs b/System.Xml/System/Xml/Xslt/XsltContext.cs index ec37ade34..64bf74fbd 100644 --- a/System.Xml/System/Xml/Xslt/XsltContext.cs +++ b/System.Xml/System/Xml/Xslt/XsltContext.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Collections; diff --git a/System.Xml/System/Xml/Xslt/XsltException.cs b/System.Xml/System/Xml/Xslt/XsltException.cs index d724bcb10..1f4aaf2c6 100644 --- a/System.Xml/System/Xml/Xslt/XsltException.cs +++ b/System.Xml/System/Xml/Xslt/XsltException.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System.Globalization; diff --git a/System.Xml/System/Xml/Xslt/XsltSettings.cs b/System.Xml/System/Xml/Xslt/XsltSettings.cs index ba4e27607..fa0ad069f 100644 --- a/System.Xml/System/Xml/Xslt/XsltSettings.cs +++ b/System.Xml/System/Xml/Xslt/XsltSettings.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] // http://webdata/xml/specs/XslCompiledTransform.xml //------------------------------------------------------------------------------ diff --git a/System/InternalApis/Clr/inc/AppContextDefaultValues.cs b/System/InternalApis/Clr/inc/AppContextDefaultValues.cs index 124f9f45a..8a130a0f3 100644 --- a/System/InternalApis/Clr/inc/AppContextDefaultValues.cs +++ b/System/InternalApis/Clr/inc/AppContextDefaultValues.cs @@ -25,7 +25,6 @@ public static void PopulateDefaultValues() /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can /// more easily support this on other platforms. /// - [System.Security.SecuritySafeCritical] private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) { string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; diff --git a/System/compmod/microsoft/visualbasic/VBCodeProvider.cs b/System/compmod/microsoft/visualbasic/VBCodeProvider.cs index 6301ddf46..437a870ba 100644 --- a/System/compmod/microsoft/visualbasic/VBCodeProvider.cs +++ b/System/compmod/microsoft/visualbasic/VBCodeProvider.cs @@ -580,12 +580,12 @@ protected override string CmdArgsFromParameters(CompilerParameters options) { foreach (string s in options.ReferencedAssemblies) { - // Ignore any Microsoft.VisualBasic.dll, since Visual Basic implies it ( + // Ignore any Microsoft.VisualBasic.dll, since Visual Basic implies it (bug 72785) string fileName = Path.GetFileName(s); if (string.Compare(fileName, "Microsoft.VisualBasic.dll", StringComparison.OrdinalIgnoreCase) == 0) continue; - // Same deal for mscorlib ( + // Same deal for mscorlib (bug ASURT 81568) if (string.Compare(fileName, "mscorlib.dll", StringComparison.OrdinalIgnoreCase) == 0) continue; diff --git a/System/compmod/microsoft/win32/UnsafeNativeMethods.cs b/System/compmod/microsoft/win32/UnsafeNativeMethods.cs index 9fed6e3d6..a1911293b 100644 --- a/System/compmod/microsoft/win32/UnsafeNativeMethods.cs +++ b/System/compmod/microsoft/win32/UnsafeNativeMethods.cs @@ -338,19 +338,19 @@ public static extern bool ReportEvent(SafeHandle hEventLog, short type, ushort c [DllImport(ExternDll.Advapi32, CharSet=System.Runtime.InteropServices.CharSet.Unicode, SetLastError=true)] [ResourceExposure(ResourceScope.None)] [return: MarshalAs(UnmanagedType.Bool)] - [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "Microsoft: EventLog is protected by EventLogPermission")] + [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "[....]: EventLog is protected by EventLogPermission")] public static extern bool GetOldestEventLogRecord(SafeHandle hEventLog, out int number); [DllImport(ExternDll.Advapi32, CharSet=System.Runtime.InteropServices.CharSet.Unicode, SetLastError=true)] [ResourceExposure(ResourceScope.Machine)] [return: MarshalAs(UnmanagedType.Bool)] - [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "Microsoft: EventLog is protected by EventLogPermission")] + [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "[....]: EventLog is protected by EventLogPermission")] public static extern bool ReadEventLog(SafeHandle hEventLog, int dwReadFlags, int dwRecordOffset, byte[] buffer, int numberOfBytesToRead, out int bytesRead, out int minNumOfBytesNeeded); [DllImport(ExternDll.Advapi32, CharSet=System.Runtime.InteropServices.CharSet.Unicode, SetLastError=true)] [ResourceExposure(ResourceScope.None)] [return: MarshalAs(UnmanagedType.Bool)] - [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "Microsoft: EventLog is protected by EventLogPermission")] + [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "[....]: EventLog is protected by EventLogPermission")] public static extern bool NotifyChangeEventLog(SafeHandle hEventLog, SafeWaitHandle hEvent); [DllImport(ExternDll.Kernel32, EntryPoint="ReadDirectoryChangesW", CharSet=System.Runtime.InteropServices.CharSet.Auto, SetLastError=true)] diff --git a/System/compmod/microsoft/win32/safehandles/SafeEventLogReadHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeEventLogReadHandle.cs index 9aa313096..56dad7b9e 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeEventLogReadHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeEventLogReadHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeEventLogReadHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for event log handles ** diff --git a/System/compmod/microsoft/win32/safehandles/SafeEventLogWriteHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeEventLogWriteHandle.cs index 060594b0c..55d5f8ed7 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeEventLogWriteHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeEventLogWriteHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeEventLogWriteHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for event log handles ** diff --git a/System/compmod/microsoft/win32/safehandles/SafeFileMapViewHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeFileMapViewHandle.cs index 72e064091..ba6ca911f 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeFileMapViewHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeFileMapViewHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeFileMapViewHandle ** -** Author: Brian Grunkemeyer (Microsoft) +** Author: Brian Grunkemeyer ([....]) ** ** A wrapper for handles returned from MapViewOfFile, used ** for shared memory. diff --git a/System/compmod/microsoft/win32/safehandles/SafeFileMappingHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeFileMappingHandle.cs index 6a7db6b15..35568910b 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeFileMappingHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeFileMappingHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeFileMappingHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for handle to file mappings, returned by ** CreateFileMapping and OpenFileMapping. Used for shared diff --git a/System/compmod/microsoft/win32/safehandles/SafeLibraryHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeLibraryHandle.cs index 55dc02ab9..ef4a1bb60 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeLibraryHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeLibraryHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeLibraryHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for a library handles ** diff --git a/System/compmod/microsoft/win32/safehandles/SafeLocalMemHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeLocalMemHandle.cs index 8f2c8f513..86df5599a 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeLocalMemHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeLocalMemHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeLocalMemHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for handle to local memory ** diff --git a/System/compmod/microsoft/win32/safehandles/SafeTimerHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeTimerHandle.cs index 68abca846..65b3a0a10 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeTimerHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeTimerHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeTimerHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for a timer handle ** diff --git a/System/compmod/microsoft/win32/safehandles/SafeUserTokenHandle.cs b/System/compmod/microsoft/win32/safehandles/SafeUserTokenHandle.cs index f21aea760..25fb6d62d 100644 --- a/System/compmod/microsoft/win32/safehandles/SafeUserTokenHandle.cs +++ b/System/compmod/microsoft/win32/safehandles/SafeUserTokenHandle.cs @@ -7,7 +7,7 @@ ** ** Class: SafeUserTokenHandle ** -** Author: David Gutierrez (Microsoft) +** Author: David Gutierrez ([....]) ** ** A wrapper for a user token handle ** diff --git a/System/compmod/system/codedom/CodeArgumentReferenceExpression.cs b/System/compmod/system/codedom/CodeArgumentReferenceExpression.cs index 7b074e028..66eb9d755 100644 --- a/System/compmod/system/codedom/CodeArgumentReferenceExpression.cs +++ b/System/compmod/system/codedom/CodeArgumentReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeArrayCreateExpression.cs b/System/compmod/system/codedom/CodeArrayCreateExpression.cs index 63e9b54e1..e4517f1be 100644 --- a/System/compmod/system/codedom/CodeArrayCreateExpression.cs +++ b/System/compmod/system/codedom/CodeArrayCreateExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeArrayIndexerExpression.cs b/System/compmod/system/codedom/CodeArrayIndexerExpression.cs index 85e979746..efacd8e4e 100644 --- a/System/compmod/system/codedom/CodeArrayIndexerExpression.cs +++ b/System/compmod/system/codedom/CodeArrayIndexerExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAssignStatement.cs b/System/compmod/system/codedom/CodeAssignStatement.cs index 2a5ccbe4c..1337fc719 100644 --- a/System/compmod/system/codedom/CodeAssignStatement.cs +++ b/System/compmod/system/codedom/CodeAssignStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAttachEventStatement.cs b/System/compmod/system/codedom/CodeAttachEventStatement.cs index f3098a1a6..78003316f 100644 --- a/System/compmod/system/codedom/CodeAttachEventStatement.cs +++ b/System/compmod/system/codedom/CodeAttachEventStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAttributeArgument.cs b/System/compmod/system/codedom/CodeAttributeArgument.cs index 218ff75b4..278ba1db5 100644 --- a/System/compmod/system/codedom/CodeAttributeArgument.cs +++ b/System/compmod/system/codedom/CodeAttributeArgument.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAttributeArgumentCollection.cs b/System/compmod/system/codedom/CodeAttributeArgumentCollection.cs index 242803b58..a7426cdfd 100644 --- a/System/compmod/system/codedom/CodeAttributeArgumentCollection.cs +++ b/System/compmod/system/codedom/CodeAttributeArgumentCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAttributeDeclaration.cs b/System/compmod/system/codedom/CodeAttributeDeclaration.cs index b10284664..4216987dc 100644 --- a/System/compmod/system/codedom/CodeAttributeDeclaration.cs +++ b/System/compmod/system/codedom/CodeAttributeDeclaration.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeAttributeDeclarationCollection.cs b/System/compmod/system/codedom/CodeAttributeDeclarationCollection.cs index e7a6baed5..2c14d7893 100644 --- a/System/compmod/system/codedom/CodeAttributeDeclarationCollection.cs +++ b/System/compmod/system/codedom/CodeAttributeDeclarationCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeBinaryOperatorExpression.cs b/System/compmod/system/codedom/CodeBinaryOperatorExpression.cs index e0c524343..ee21644fb 100644 --- a/System/compmod/system/codedom/CodeBinaryOperatorExpression.cs +++ b/System/compmod/system/codedom/CodeBinaryOperatorExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCastExpression.cs b/System/compmod/system/codedom/CodeCastExpression.cs index f136ff617..c001c5806 100644 --- a/System/compmod/system/codedom/CodeCastExpression.cs +++ b/System/compmod/system/codedom/CodeCastExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCatchClause.cs b/System/compmod/system/codedom/CodeCatchClause.cs index 6f8034806..15ab8de22 100644 --- a/System/compmod/system/codedom/CodeCatchClause.cs +++ b/System/compmod/system/codedom/CodeCatchClause.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCatchClauseCollection.cs b/System/compmod/system/codedom/CodeCatchClauseCollection.cs index 4d8b0b35c..ceb3e70ea 100644 --- a/System/compmod/system/codedom/CodeCatchClauseCollection.cs +++ b/System/compmod/system/codedom/CodeCatchClauseCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeChecksumPragma.cs b/System/compmod/system/codedom/CodeChecksumPragma.cs index b18cb50f6..a272b59d0 100644 --- a/System/compmod/system/codedom/CodeChecksumPragma.cs +++ b/System/compmod/system/codedom/CodeChecksumPragma.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeComment.cs b/System/compmod/system/codedom/CodeComment.cs index 2b04dec59..e639c3776 100644 --- a/System/compmod/system/codedom/CodeComment.cs +++ b/System/compmod/system/codedom/CodeComment.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCommentStatement.cs b/System/compmod/system/codedom/CodeCommentStatement.cs index 7872eaf03..bd7598eb8 100644 --- a/System/compmod/system/codedom/CodeCommentStatement.cs +++ b/System/compmod/system/codedom/CodeCommentStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCommentStatementCollection.cs b/System/compmod/system/codedom/CodeCommentStatementCollection.cs index f2360b564..9d0936dbf 100644 --- a/System/compmod/system/codedom/CodeCommentStatementCollection.cs +++ b/System/compmod/system/codedom/CodeCommentStatementCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeCompileUnit.cs b/System/compmod/system/codedom/CodeCompileUnit.cs index 24c0823e6..7a4102e62 100644 --- a/System/compmod/system/codedom/CodeCompileUnit.cs +++ b/System/compmod/system/codedom/CodeCompileUnit.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeConditionStatement.cs b/System/compmod/system/codedom/CodeConditionStatement.cs index 65cf684d8..f71df7145 100644 --- a/System/compmod/system/codedom/CodeConditionStatement.cs +++ b/System/compmod/system/codedom/CodeConditionStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeConstructor.cs b/System/compmod/system/codedom/CodeConstructor.cs index 0a29e5959..79a4e9906 100644 --- a/System/compmod/system/codedom/CodeConstructor.cs +++ b/System/compmod/system/codedom/CodeConstructor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeDefaultValueExpression.cs b/System/compmod/system/codedom/CodeDefaultValueExpression.cs index d41abec56..7ab33e6ba 100644 --- a/System/compmod/system/codedom/CodeDefaultValueExpression.cs +++ b/System/compmod/system/codedom/CodeDefaultValueExpression.cs @@ -1,4 +1,4 @@ -// Microsoft +// [....] namespace System.CodeDom { using System.Diagnostics; diff --git a/System/compmod/system/codedom/CodeDelegateCreateExpression.cs b/System/compmod/system/codedom/CodeDelegateCreateExpression.cs index ada4bf15b..d5f19dc78 100644 --- a/System/compmod/system/codedom/CodeDelegateCreateExpression.cs +++ b/System/compmod/system/codedom/CodeDelegateCreateExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeDelegateInvokeExpression.cs b/System/compmod/system/codedom/CodeDelegateInvokeExpression.cs index c46bdf91e..ccc099fba 100644 --- a/System/compmod/system/codedom/CodeDelegateInvokeExpression.cs +++ b/System/compmod/system/codedom/CodeDelegateInvokeExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeDirectionExpression.cs b/System/compmod/system/codedom/CodeDirectionExpression.cs index b6dcdc64d..12288ac59 100644 --- a/System/compmod/system/codedom/CodeDirectionExpression.cs +++ b/System/compmod/system/codedom/CodeDirectionExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeDirectiveCollection.cs b/System/compmod/system/codedom/CodeDirectiveCollection.cs index c7f7b5a7a..4a1decc69 100644 --- a/System/compmod/system/codedom/CodeDirectiveCollection.cs +++ b/System/compmod/system/codedom/CodeDirectiveCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeEntryPointMethod.cs b/System/compmod/system/codedom/CodeEntryPointMethod.cs index aa6541619..74575ca3e 100644 --- a/System/compmod/system/codedom/CodeEntryPointMethod.cs +++ b/System/compmod/system/codedom/CodeEntryPointMethod.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeEventReferenceExpression.cs b/System/compmod/system/codedom/CodeEventReferenceExpression.cs index 3eadd89bf..1a34b90ca 100644 --- a/System/compmod/system/codedom/CodeEventReferenceExpression.cs +++ b/System/compmod/system/codedom/CodeEventReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeExpressionCollection.cs b/System/compmod/system/codedom/CodeExpressionCollection.cs index 6c0b04414..1af19ae87 100644 --- a/System/compmod/system/codedom/CodeExpressionCollection.cs +++ b/System/compmod/system/codedom/CodeExpressionCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeExpressionStatement.cs b/System/compmod/system/codedom/CodeExpressionStatement.cs index 7fa7f8bae..676ed9870 100644 --- a/System/compmod/system/codedom/CodeExpressionStatement.cs +++ b/System/compmod/system/codedom/CodeExpressionStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeFieldReferenceExpression.cs b/System/compmod/system/codedom/CodeFieldReferenceExpression.cs index 279a2b27b..52ad0e101 100644 --- a/System/compmod/system/codedom/CodeFieldReferenceExpression.cs +++ b/System/compmod/system/codedom/CodeFieldReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeGotoStatement.cs b/System/compmod/system/codedom/CodeGotoStatement.cs index fa1e7c963..a8b06a1ad 100644 --- a/System/compmod/system/codedom/CodeGotoStatement.cs +++ b/System/compmod/system/codedom/CodeGotoStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeIndexerExpression.cs b/System/compmod/system/codedom/CodeIndexerExpression.cs index bd71984b7..cb41ce728 100644 --- a/System/compmod/system/codedom/CodeIndexerExpression.cs +++ b/System/compmod/system/codedom/CodeIndexerExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeIterationStatement.cs b/System/compmod/system/codedom/CodeIterationStatement.cs index bcabe1bee..65d988ada 100644 --- a/System/compmod/system/codedom/CodeIterationStatement.cs +++ b/System/compmod/system/codedom/CodeIterationStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeLabeledStatement.cs b/System/compmod/system/codedom/CodeLabeledStatement.cs index d378c4041..e9d0a4d67 100644 --- a/System/compmod/system/codedom/CodeLabeledStatement.cs +++ b/System/compmod/system/codedom/CodeLabeledStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeLinePragma.cs b/System/compmod/system/codedom/CodeLinePragma.cs index 96064829f..e83322d76 100644 --- a/System/compmod/system/codedom/CodeLinePragma.cs +++ b/System/compmod/system/codedom/CodeLinePragma.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMemberEvent.cs b/System/compmod/system/codedom/CodeMemberEvent.cs index e7a05f69b..d8ed1cc15 100644 --- a/System/compmod/system/codedom/CodeMemberEvent.cs +++ b/System/compmod/system/codedom/CodeMemberEvent.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMemberField.cs b/System/compmod/system/codedom/CodeMemberField.cs index 0a6d89bcf..a2d2877fc 100644 --- a/System/compmod/system/codedom/CodeMemberField.cs +++ b/System/compmod/system/codedom/CodeMemberField.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMemberMethod.cs b/System/compmod/system/codedom/CodeMemberMethod.cs index 1be222144..e7632f7ff 100644 --- a/System/compmod/system/codedom/CodeMemberMethod.cs +++ b/System/compmod/system/codedom/CodeMemberMethod.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMemberProperty.cs b/System/compmod/system/codedom/CodeMemberProperty.cs index 8eded2271..c07ce9643 100644 --- a/System/compmod/system/codedom/CodeMemberProperty.cs +++ b/System/compmod/system/codedom/CodeMemberProperty.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMethodInvokeExpression.cs b/System/compmod/system/codedom/CodeMethodInvokeExpression.cs index b941059ea..d1d5fe7eb 100644 --- a/System/compmod/system/codedom/CodeMethodInvokeExpression.cs +++ b/System/compmod/system/codedom/CodeMethodInvokeExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeMethodReturnStatement.cs b/System/compmod/system/codedom/CodeMethodReturnStatement.cs index 3769a3a70..6bcb6a1ab 100644 --- a/System/compmod/system/codedom/CodeMethodReturnStatement.cs +++ b/System/compmod/system/codedom/CodeMethodReturnStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeNamespace.cs b/System/compmod/system/codedom/CodeNamespace.cs index 6bef7fdfc..9feea179f 100644 --- a/System/compmod/system/codedom/CodeNamespace.cs +++ b/System/compmod/system/codedom/CodeNamespace.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeNamespaceCollection.cs b/System/compmod/system/codedom/CodeNamespaceCollection.cs index 654eb1f8d..81b5d1199 100644 --- a/System/compmod/system/codedom/CodeNamespaceCollection.cs +++ b/System/compmod/system/codedom/CodeNamespaceCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeNamespaceImport.cs b/System/compmod/system/codedom/CodeNamespaceImport.cs index 21fb016d0..aed07620b 100644 --- a/System/compmod/system/codedom/CodeNamespaceImport.cs +++ b/System/compmod/system/codedom/CodeNamespaceImport.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeNamespaceImportCollection.cs b/System/compmod/system/codedom/CodeNamespaceImportCollection.cs index e4b8c72df..9015a63bc 100644 --- a/System/compmod/system/codedom/CodeNamespaceImportCollection.cs +++ b/System/compmod/system/codedom/CodeNamespaceImportCollection.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeObject.cs b/System/compmod/system/codedom/CodeObject.cs index 97813e052..f8f0993c5 100644 --- a/System/compmod/system/codedom/CodeObject.cs +++ b/System/compmod/system/codedom/CodeObject.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeObjectCreateExpression.cs b/System/compmod/system/codedom/CodeObjectCreateExpression.cs index 6a09707e5..9604e90ba 100644 --- a/System/compmod/system/codedom/CodeObjectCreateExpression.cs +++ b/System/compmod/system/codedom/CodeObjectCreateExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeParameterDeclarationExpression.cs b/System/compmod/system/codedom/CodeParameterDeclarationExpression.cs index 5c3c1d58d..9e9703409 100644 --- a/System/compmod/system/codedom/CodeParameterDeclarationExpression.cs +++ b/System/compmod/system/codedom/CodeParameterDeclarationExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeParameterDeclarationExpressionCollection.cs b/System/compmod/system/codedom/CodeParameterDeclarationExpressionCollection.cs index dad8668f1..2bc781bae 100644 --- a/System/compmod/system/codedom/CodeParameterDeclarationExpressionCollection.cs +++ b/System/compmod/system/codedom/CodeParameterDeclarationExpressionCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodePrimitiveExpression.cs b/System/compmod/system/codedom/CodePrimitiveExpression.cs index e8cb3b0f5..b64496141 100644 --- a/System/compmod/system/codedom/CodePrimitiveExpression.cs +++ b/System/compmod/system/codedom/CodePrimitiveExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodePropertyReferenceExpression.cs b/System/compmod/system/codedom/CodePropertyReferenceExpression.cs index 97b3f36b8..28d511744 100644 --- a/System/compmod/system/codedom/CodePropertyReferenceExpression.cs +++ b/System/compmod/system/codedom/CodePropertyReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeRegionDirective.cs b/System/compmod/system/codedom/CodeRegionDirective.cs index 058c64b23..1ecfe2e9b 100644 --- a/System/compmod/system/codedom/CodeRegionDirective.cs +++ b/System/compmod/system/codedom/CodeRegionDirective.cs @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// Microsoft +// [....] // // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/System/compmod/system/codedom/CodeRemoveEventStatement.cs b/System/compmod/system/codedom/CodeRemoveEventStatement.cs index 0f0c0f671..c767800ae 100644 --- a/System/compmod/system/codedom/CodeRemoveEventStatement.cs +++ b/System/compmod/system/codedom/CodeRemoveEventStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeSnippetCompileUnit.cs b/System/compmod/system/codedom/CodeSnippetCompileUnit.cs index df0b7eb0a..bdf6f35b0 100644 --- a/System/compmod/system/codedom/CodeSnippetCompileUnit.cs +++ b/System/compmod/system/codedom/CodeSnippetCompileUnit.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeSnippetExpression.cs b/System/compmod/system/codedom/CodeSnippetExpression.cs index 18e87f7c6..2e759abc8 100644 --- a/System/compmod/system/codedom/CodeSnippetExpression.cs +++ b/System/compmod/system/codedom/CodeSnippetExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeSnippetStatement.cs b/System/compmod/system/codedom/CodeSnippetStatement.cs index 8c0387fe4..4190a8876 100644 --- a/System/compmod/system/codedom/CodeSnippetStatement.cs +++ b/System/compmod/system/codedom/CodeSnippetStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeSnippetTypeMember.cs b/System/compmod/system/codedom/CodeSnippetTypeMember.cs index a07dfa68a..a2ae40489 100644 --- a/System/compmod/system/codedom/CodeSnippetTypeMember.cs +++ b/System/compmod/system/codedom/CodeSnippetTypeMember.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeStatement.cs b/System/compmod/system/codedom/CodeStatement.cs index 3cdbebdc8..cb56cfc08 100644 --- a/System/compmod/system/codedom/CodeStatement.cs +++ b/System/compmod/system/codedom/CodeStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeStatementCollection.cs b/System/compmod/system/codedom/CodeStatementCollection.cs index d475921f4..b9ee3df11 100644 --- a/System/compmod/system/codedom/CodeStatementCollection.cs +++ b/System/compmod/system/codedom/CodeStatementCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeThrowExceptionStatement.cs b/System/compmod/system/codedom/CodeThrowExceptionStatement.cs index f763c517c..59a9b44aa 100644 --- a/System/compmod/system/codedom/CodeThrowExceptionStatement.cs +++ b/System/compmod/system/codedom/CodeThrowExceptionStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTryCatchFinallyStatement.cs b/System/compmod/system/codedom/CodeTryCatchFinallyStatement.cs index d79ff52b3..132691227 100644 --- a/System/compmod/system/codedom/CodeTryCatchFinallyStatement.cs +++ b/System/compmod/system/codedom/CodeTryCatchFinallyStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeConstructor.cs b/System/compmod/system/codedom/CodeTypeConstructor.cs index c9dd7346b..d2f737e9b 100644 --- a/System/compmod/system/codedom/CodeTypeConstructor.cs +++ b/System/compmod/system/codedom/CodeTypeConstructor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeDeclaration.cs b/System/compmod/system/codedom/CodeTypeDeclaration.cs index c9c0c3769..a4c498834 100644 --- a/System/compmod/system/codedom/CodeTypeDeclaration.cs +++ b/System/compmod/system/codedom/CodeTypeDeclaration.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeDeclarationCollection.cs b/System/compmod/system/codedom/CodeTypeDeclarationCollection.cs index 638ba5ff6..4d47a5afe 100644 --- a/System/compmod/system/codedom/CodeTypeDeclarationCollection.cs +++ b/System/compmod/system/codedom/CodeTypeDeclarationCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeDelegate.cs b/System/compmod/system/codedom/CodeTypeDelegate.cs index f0ad8368f..a96b3b224 100644 --- a/System/compmod/system/codedom/CodeTypeDelegate.cs +++ b/System/compmod/system/codedom/CodeTypeDelegate.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeMember.cs b/System/compmod/system/codedom/CodeTypeMember.cs index 38f0c0d1c..060d76d8c 100644 --- a/System/compmod/system/codedom/CodeTypeMember.cs +++ b/System/compmod/system/codedom/CodeTypeMember.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeMemberCollection.cs b/System/compmod/system/codedom/CodeTypeMemberCollection.cs index b4fe0211f..58acc0bb1 100644 --- a/System/compmod/system/codedom/CodeTypeMemberCollection.cs +++ b/System/compmod/system/codedom/CodeTypeMemberCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeOfExpression.cs b/System/compmod/system/codedom/CodeTypeOfExpression.cs index dbd3498f7..a2ba738e4 100644 --- a/System/compmod/system/codedom/CodeTypeOfExpression.cs +++ b/System/compmod/system/codedom/CodeTypeOfExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeParameter.cs b/System/compmod/system/codedom/CodeTypeParameter.cs index fd5e1164b..d3acfd8c7 100644 --- a/System/compmod/system/codedom/CodeTypeParameter.cs +++ b/System/compmod/system/codedom/CodeTypeParameter.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeParameterCollection.cs b/System/compmod/system/codedom/CodeTypeParameterCollection.cs index 9c03b81ab..42290c07b 100644 --- a/System/compmod/system/codedom/CodeTypeParameterCollection.cs +++ b/System/compmod/system/codedom/CodeTypeParameterCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeReference.cs b/System/compmod/system/codedom/CodeTypeReference.cs index 3ba435d53..ad8389d7e 100644 --- a/System/compmod/system/codedom/CodeTypeReference.cs +++ b/System/compmod/system/codedom/CodeTypeReference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeReferenceCollection.cs b/System/compmod/system/codedom/CodeTypeReferenceCollection.cs index 0324aff52..4787c56ac 100644 --- a/System/compmod/system/codedom/CodeTypeReferenceCollection.cs +++ b/System/compmod/system/codedom/CodeTypeReferenceCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeTypeReferenceExpression.cs b/System/compmod/system/codedom/CodeTypeReferenceExpression.cs index 3fdc0ebfc..267323a8d 100644 --- a/System/compmod/system/codedom/CodeTypeReferenceExpression.cs +++ b/System/compmod/system/codedom/CodeTypeReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeVariableDeclarationStatement.cs b/System/compmod/system/codedom/CodeVariableDeclarationStatement.cs index 958a3386a..2569c3895 100644 --- a/System/compmod/system/codedom/CodeVariableDeclarationStatement.cs +++ b/System/compmod/system/codedom/CodeVariableDeclarationStatement.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/CodeVariableReferenceExpression.cs b/System/compmod/system/codedom/CodeVariableReferenceExpression.cs index 83bd33d4b..8ce716469 100644 --- a/System/compmod/system/codedom/CodeVariableReferenceExpression.cs +++ b/System/compmod/system/codedom/CodeVariableReferenceExpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/codemethodreferenceexpression.cs b/System/compmod/system/codedom/codemethodreferenceexpression.cs index 1b8c54a77..96adf47cb 100644 --- a/System/compmod/system/codedom/codemethodreferenceexpression.cs +++ b/System/compmod/system/codedom/codemethodreferenceexpression.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CodeCompiler.cs b/System/compmod/system/codedom/compiler/CodeCompiler.cs index 45fb83a1e..7eaaa9aab 100644 --- a/System/compmod/system/codedom/compiler/CodeCompiler.cs +++ b/System/compmod/system/codedom/compiler/CodeCompiler.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CodeDOMProvider.cs b/System/compmod/system/codedom/compiler/CodeDOMProvider.cs index ff2004130..7fb7adce0 100644 --- a/System/compmod/system/codedom/compiler/CodeDOMProvider.cs +++ b/System/compmod/system/codedom/compiler/CodeDOMProvider.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CodeDomConfigurationHandler.cs b/System/compmod/system/codedom/compiler/CodeDomConfigurationHandler.cs index e1633cc92..b72b1a989 100644 --- a/System/compmod/system/codedom/compiler/CodeDomConfigurationHandler.cs +++ b/System/compmod/system/codedom/compiler/CodeDomConfigurationHandler.cs @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// Microsoft +// [....] // // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/System/compmod/system/codedom/compiler/CodeGenerator.cs b/System/compmod/system/codedom/compiler/CodeGenerator.cs index 0e7062b0b..60cde1f27 100644 --- a/System/compmod/system/codedom/compiler/CodeGenerator.cs +++ b/System/compmod/system/codedom/compiler/CodeGenerator.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CodeGeneratorOptions.cs b/System/compmod/system/codedom/compiler/CodeGeneratorOptions.cs index 80f6a3ba5..d3a8dfb85 100644 --- a/System/compmod/system/codedom/compiler/CodeGeneratorOptions.cs +++ b/System/compmod/system/codedom/compiler/CodeGeneratorOptions.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CodeValidator.cs b/System/compmod/system/codedom/compiler/CodeValidator.cs index 5164c804f..6abf4c89d 100644 --- a/System/compmod/system/codedom/compiler/CodeValidator.cs +++ b/System/compmod/system/codedom/compiler/CodeValidator.cs @@ -1,5 +1,5 @@ //------------------------------------------------------------------------------ -// Microsoft +// [....] // // // Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/System/compmod/system/codedom/compiler/CompilerError.cs b/System/compmod/system/codedom/compiler/CompilerError.cs index c5c2661e3..0e4f0a3bb 100644 --- a/System/compmod/system/codedom/compiler/CompilerError.cs +++ b/System/compmod/system/codedom/compiler/CompilerError.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CompilerErrorCollection.cs b/System/compmod/system/codedom/compiler/CompilerErrorCollection.cs index f35d185fc..7b191fd9e 100644 --- a/System/compmod/system/codedom/compiler/CompilerErrorCollection.cs +++ b/System/compmod/system/codedom/compiler/CompilerErrorCollection.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // // ------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CompilerInfo.cs b/System/compmod/system/codedom/compiler/CompilerInfo.cs index 0cd93987b..5e695adac 100644 --- a/System/compmod/system/codedom/compiler/CompilerInfo.cs +++ b/System/compmod/system/codedom/compiler/CompilerInfo.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CompilerParameters.cs b/System/compmod/system/codedom/compiler/CompilerParameters.cs index 4a3f826fc..f3b701998 100644 --- a/System/compmod/system/codedom/compiler/CompilerParameters.cs +++ b/System/compmod/system/codedom/compiler/CompilerParameters.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/CompilerResults.cs b/System/compmod/system/codedom/compiler/CompilerResults.cs index d2b7c231b..5168410e5 100644 --- a/System/compmod/system/codedom/compiler/CompilerResults.cs +++ b/System/compmod/system/codedom/compiler/CompilerResults.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/Executor.cs b/System/compmod/system/codedom/compiler/Executor.cs index 5fac36c6a..e9a97dad1 100644 --- a/System/compmod/system/codedom/compiler/Executor.cs +++ b/System/compmod/system/codedom/compiler/Executor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/GeneratedCodeAttribute.cs b/System/compmod/system/codedom/compiler/GeneratedCodeAttribute.cs index fd30ac50c..0066e7363 100644 --- a/System/compmod/system/codedom/compiler/GeneratedCodeAttribute.cs +++ b/System/compmod/system/codedom/compiler/GeneratedCodeAttribute.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/IndentTextWriter.cs b/System/compmod/system/codedom/compiler/IndentTextWriter.cs index be86a9c17..0d6d57942 100644 --- a/System/compmod/system/codedom/compiler/IndentTextWriter.cs +++ b/System/compmod/system/codedom/compiler/IndentTextWriter.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/RedistVersionInfo.cs b/System/compmod/system/codedom/compiler/RedistVersionInfo.cs index c3c0e970c..bf8e4bf87 100644 --- a/System/compmod/system/codedom/compiler/RedistVersionInfo.cs +++ b/System/compmod/system/codedom/compiler/RedistVersionInfo.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/codedom/compiler/TempFiles.cs b/System/compmod/system/codedom/compiler/TempFiles.cs index f966f2684..da6925a11 100644 --- a/System/compmod/system/codedom/compiler/TempFiles.cs +++ b/System/compmod/system/codedom/compiler/TempFiles.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // -// Microsoft +// [....] // Copyright (c) Microsoft Corporation. All rights reserved. // //------------------------------------------------------------------------------ diff --git a/System/compmod/system/collections/generic/stack.cs b/System/compmod/system/collections/generic/stack.cs index 086926ce9..eb8d46d66 100644 --- a/System/compmod/system/collections/generic/stack.cs +++ b/System/compmod/system/collections/generic/stack.cs @@ -32,7 +32,7 @@ public class Stack : IEnumerable, IReadOnlyCollection { private T[] _array; // Storage for stack elements private int _size; // Number of items in the stack. - private int _version; // Used to keep enumerator in sync w/ collection. + private int _version; // Used to keep enumerator in [....] w/ collection. #if !SILVERLIGHT [NonSerialized] #endif diff --git a/System/compmod/system/collections/objectmodel/observablecollection.cs b/System/compmod/system/collections/objectmodel/observablecollection.cs index 02e10f2d1..69f8a5c19 100644 --- a/System/compmod/system/collections/objectmodel/observablecollection.cs +++ b/System/compmod/system/collections/objectmodel/observablecollection.cs @@ -11,7 +11,7 @@ // See spec at http://avalon/connecteddata/Specs/Collection%20Interfaces.mht // // History: -// 11/22/2004 : Microsoft - created +// 11/22/2004 : [....] - created // //--------------------------------------------------------------------------- @@ -60,11 +60,11 @@ public ObservableCollection() : base() { } public ObservableCollection(List list) : base((list != null) ? new List(list.Count) : list) { - // Workaround for VSWhidbey - - - - + // Workaround for VSWhidbey bug 562681 (tracked by Windows bug 1369339). + // We should be able to simply call the base(list) ctor. But Collection + // doesn't copy the list (contrary to the documentation) - it uses the + // list directly as its storage. So we do the copying here. + // CopyFrom(list); } diff --git a/System/compmod/system/collections/specialized/marshalinghelpers.cs b/System/compmod/system/collections/specialized/marshalinghelpers.cs index ed7120718..3bfa0b837 100644 --- a/System/compmod/system/collections/specialized/marshalinghelpers.cs +++ b/System/compmod/system/collections/specialized/marshalinghelpers.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] using System.Security; using System.Collections; diff --git a/System/compmod/system/collections/specialized/stringdictionary.cs b/System/compmod/system/collections/specialized/stringdictionary.cs index 44067722d..88f41bd59 100644 --- a/System/compmod/system/collections/specialized/stringdictionary.cs +++ b/System/compmod/system/collections/specialized/stringdictionary.cs @@ -192,7 +192,7 @@ internal IDictionary AsGenericDictionary() { #region GenericAdapter // // This class is used to make StringDictionary implement IDictionary indirectly. - // This is done to prevent StringDictionary be serialized as IDictionary and break its serialization by DataContractSerializer due to a + // This is done to prevent StringDictionary be serialized as IDictionary and break its serialization by DataContractSerializer due to a bug in the serialization code. private class GenericAdapter : IDictionary { diff --git a/System/compmod/system/componentmodel/AsyncOperation.cs b/System/compmod/system/componentmodel/AsyncOperation.cs index 7d596a07f..d3679b06a 100644 --- a/System/compmod/system/componentmodel/AsyncOperation.cs +++ b/System/compmod/system/componentmodel/AsyncOperation.cs @@ -29,7 +29,7 @@ private AsyncOperation(object userSuppliedState, SynchronizationContext syncCont } /// - /// Destructor. Guarantees that sync context will always get notified of completion. + /// Destructor. Guarantees that [....] context will always get notified of completion. /// ~AsyncOperation() { diff --git a/System/compmod/system/componentmodel/InstallerTypeAttribute.cs b/System/compmod/system/componentmodel/InstallerTypeAttribute.cs index 882760b5d..421817151 100644 --- a/System/compmod/system/componentmodel/InstallerTypeAttribute.cs +++ b/System/compmod/system/componentmodel/InstallerTypeAttribute.cs @@ -7,7 +7,7 @@ /* */ -// SECREVIEW: Remove this attribute once +// SECREVIEW: Remove this attribute once bug#411889 is fixed. [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2113:SecureLateBindingMethods", Scope="member", Target="System.ComponentModel.InstallerTypeAttribute.get_InstallerType():System.Type")] namespace System.ComponentModel { diff --git a/System/compmod/system/componentmodel/LicenseProviderAttribute.cs b/System/compmod/system/componentmodel/LicenseProviderAttribute.cs index 788ca33a9..c65c71b4e 100644 --- a/System/compmod/system/componentmodel/LicenseProviderAttribute.cs +++ b/System/compmod/system/componentmodel/LicenseProviderAttribute.cs @@ -57,7 +57,7 @@ public LicenseProviderAttribute(Type type) { /// Gets the license provider to use with the associated class. /// public Type LicenseProvider { - // SECREVIEW: Remove this attribute once + // SECREVIEW: Remove this attribute once bug#411910 is fixed. [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2113:SecureLateBindingMethods")] get { if (licenseProviderType == null && licenseProviderName != null) { diff --git a/System/compmod/system/componentmodel/MemberDescriptor.cs b/System/compmod/system/componentmodel/MemberDescriptor.cs index 5ab73da20..c16486800 100644 --- a/System/compmod/system/componentmodel/MemberDescriptor.cs +++ b/System/compmod/system/componentmodel/MemberDescriptor.cs @@ -434,7 +434,7 @@ protected static MethodInfo FindMethod(Type componentClass, string name, Type[] } /// - /// Try to keep this reasonable in sync with Equals(). Specifically, + /// Try to keep this reasonable in [....] with Equals(). Specifically, /// if A.Equals(B) returns true, A & B should have the same hash code. /// public override int GetHashCode() { diff --git a/System/compmod/system/componentmodel/PropertyDescriptor.cs b/System/compmod/system/componentmodel/PropertyDescriptor.cs index 9915bcf85..ecfb46bc0 100644 --- a/System/compmod/system/componentmodel/PropertyDescriptor.cs +++ b/System/compmod/system/componentmodel/PropertyDescriptor.cs @@ -347,7 +347,7 @@ public virtual object GetEditor(Type editorBaseType) { } /// - /// Try to keep this reasonable in sync with Equals(). Specifically, + /// Try to keep this reasonable in [....] with Equals(). Specifically, /// if A.Equals(B) returns true, A & B should have the same hash code. /// public override int GetHashCode() { diff --git a/System/compmod/system/componentmodel/design/DesignerVerb.cs b/System/compmod/system/componentmodel/design/DesignerVerb.cs index b10a8255a..d9840075c 100644 --- a/System/compmod/system/componentmodel/design/DesignerVerb.cs +++ b/System/compmod/system/componentmodel/design/DesignerVerb.cs @@ -30,7 +30,7 @@ public class DesignerVerb : MenuCommand { /// [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public DesignerVerb(string text, EventHandler handler) : base(handler, StandardCommands.VerbFirst) { - // NOTICE!!! When you changed the regex here, please change it in Designer\Microsoft\System\Microsoft\Design\TableLayoutPanelDesigner.cs + // NOTICE!!! When you changed the regex here, please change it in Designer\[....]\System\[....]\Design\TableLayoutPanelDesigner.cs // method "TrimText", too. Properties["Text"] = text == null ? null : Regex.Replace(text, @"\(\&.\)", ""); // VSWHIDBEY 485835 } diff --git a/System/compmod/system/componentmodel/design/DesigntimeLicenseContextSerializer.cs b/System/compmod/system/componentmodel/design/DesigntimeLicenseContextSerializer.cs index f497bba73..c4454a566 100644 --- a/System/compmod/system/componentmodel/design/DesigntimeLicenseContextSerializer.cs +++ b/System/compmod/system/componentmodel/design/DesigntimeLicenseContextSerializer.cs @@ -44,7 +44,7 @@ public static void Serialize(Stream o, string cryptoKey, DesigntimeLicenseContex formatter.Serialize(o, new object[] {cryptoKey, context.savedLicenseKeys}); } - [SuppressMessage("Microsoft.Security", "CA2107:ReviewDenyAndPermitOnlyUsage")] // Use of PermitOnly here is appropriate. This was a previous war-approved security + [SuppressMessage("Microsoft.Security", "CA2107:ReviewDenyAndPermitOnlyUsage")] // Use of PermitOnly here is appropriate. This was a previous war-approved security bug fix. internal static void Deserialize(Stream o, string cryptoKey, RuntimeLicenseContext context) { IFormatter formatter = new BinaryFormatter(); diff --git a/System/compmod/system/componentmodel/design/PropertyTabAttribute.cs b/System/compmod/system/componentmodel/design/PropertyTabAttribute.cs index 4a6058522..2f1562d7d 100644 --- a/System/compmod/system/componentmodel/design/PropertyTabAttribute.cs +++ b/System/compmod/system/componentmodel/design/PropertyTabAttribute.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -// SECREVIEW: Remove this attribute once +// SECREVIEW: Remove this attribute once bug#411903 is fixed. [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2113:SecureLateBindingMethods", Scope="member", Target="System.ComponentModel.PropertyTabAttribute.get_TabClasses():System.Type[]")] namespace System.ComponentModel { diff --git a/System/compmod/system/componentmodel/design/ToolboxItemAttribute.cs b/System/compmod/system/componentmodel/design/ToolboxItemAttribute.cs index ab2ae3a4c..0cbf2f24f 100644 --- a/System/compmod/system/componentmodel/design/ToolboxItemAttribute.cs +++ b/System/compmod/system/componentmodel/design/ToolboxItemAttribute.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -// SECREVIEW: remove this attribute once +// SECREVIEW: remove this attribute once bug#411883 is fixed. [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2113:SecureLateBindingMethods", Scope="member", Target="System.ComponentModel.ToolboxItemAttribute.get_ToolboxItemType():System.Type")] namespace System.ComponentModel { diff --git a/System/compmod/system/diagnostics/XmlWriterTraceListener.cs b/System/compmod/system/diagnostics/XmlWriterTraceListener.cs index c95cb34bf..93a2e7102 100644 --- a/System/compmod/system/diagnostics/XmlWriterTraceListener.cs +++ b/System/compmod/system/diagnostics/XmlWriterTraceListener.cs @@ -23,9 +23,9 @@ public class XmlWriterTraceListener : TextWriterTraceListener { private StringBuilder strBldr = null; private XmlTextWriter xmlBlobWriter = null; - // Previously we had a - - + // Previously we had a bug where TraceTransfer did not respect the filter set on this listener. We're fixing this + // bug, but only for cases where the filter was set via config. In the next side by side release, we'll remove + // this and always respect the filter for TraceTransfer events. internal bool shouldRespectFilterOnTraceTransfer; public XmlWriterTraceListener(Stream stream) : base(stream){ } diff --git a/System/compmod/system/diagnostics/assertwrapper.cs b/System/compmod/system/diagnostics/assertwrapper.cs index e6938156e..c6f638567 100644 --- a/System/compmod/system/diagnostics/assertwrapper.cs +++ b/System/compmod/system/diagnostics/assertwrapper.cs @@ -61,9 +61,9 @@ private static void ShowVsAssert(string stackTrace, StackFrame frame, string mes [DllImport(ExternDll.Fxassert, CharSet=System.Runtime.InteropServices.CharSet.Ansi, BestFitMapping=true)] [ResourceExposure(ResourceScope.None)] - [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="0", Justification="Microsoft: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] - [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="1", Justification="Microsoft: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] - [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="2", Justification="Microsoft: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] + [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="0", Justification="[....]: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] + [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="1", Justification="[....]: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] + [SuppressMessage("Microsoft.Globalization","CA2101:SpecifyMarshalingForPInvokeStringArguments", MessageId="2", Justification="[....]: VsAssert isn't making a security decision here and they don't provide Unicode versions, also it is internal to MS")] public static extern int VsAssert(string message, string assert, string file, int line, [In, Out]int[] pfDisable); [ResourceExposure(ResourceScope.None)] @@ -203,7 +203,7 @@ private static void ShowCFUserNotificationDisplayAlertAssert(string stackTrace, [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] #endif [SecuritySafeCritical] - [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "Microsoft.Win32.UnsafeNativeMethods.ReleaseDC(System.IntPtr,System.IntPtr)", Justification = "Microsoft: If the DC is not released there's not much we can do.")] + [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "Microsoft.Win32.UnsafeNativeMethods.ReleaseDC(System.IntPtr,System.IntPtr)", Justification = "[....]: If the DC is not released there's not much we can do.")] private static string TruncateMessageToFitScreen(string message) { const int MaxCharsPerLine = 80; diff --git a/System/misc/ClientUtils.cs b/System/misc/ClientUtils.cs index d42c1cdf6..d350b64b6 100644 --- a/System/misc/ClientUtils.cs +++ b/System/misc/ClientUtils.cs @@ -6,11 +6,11 @@ /* */ -#if Microsoft_NAMESPACE +#if WINFORMS_NAMESPACE namespace System.Windows.Forms #elif DRAWING_NAMESPACE namespace System.Drawing -#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY +#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY namespace System.Internal #elif SYSTEM_NAMESPACE namespace System @@ -274,7 +274,7 @@ private static void Debug_NonSequentialEnumIsDefinedCheck(System.Enum value, int /// ----------------------------------------------------------------- /// /// -#if Microsoft_NAMESPACE || Microsoft_PUBLIC_GRAPHICS_LIBRARY || DRAWING_NAMESPACE +#if WINFORMS_NAMESPACE || WINFORMS_PUBLIC_GRAPHICS_LIBRARY || DRAWING_NAMESPACE internal class WeakRefCollection : IList { private int refCheckThreshold = Int32.MaxValue; // this means this is disabled by default. private ArrayList _innerList; diff --git a/System/misc/SecurityUtils.cs b/System/misc/SecurityUtils.cs index 159dedbb6..76e02fafb 100644 --- a/System/misc/SecurityUtils.cs +++ b/System/misc/SecurityUtils.cs @@ -8,11 +8,11 @@ */ -#if Microsoft_NAMESPACE +#if WINFORMS_NAMESPACE namespace System.Windows.Forms #elif DRAWING_NAMESPACE namespace System.Drawing -#elif Microsoft_PUBLIC_GRAPHICS_LIBRARY +#elif WINFORMS_PUBLIC_GRAPHICS_LIBRARY namespace System.Internal #elif SYSTEM_NAMESPACE namespace System @@ -127,7 +127,7 @@ internal static object SecureCreateInstance(Type type, object[] args, bool allow return Activator.CreateInstance(type, flags, null, args, null); } -#if (!Microsoft_NAMESPACE) +#if (!WINFORMS_NAMESPACE) /// /// This helper method provides safe access to Activator.CreateInstance. diff --git a/System/net/System/Net/Cache/HttpRequestCacheValidator.cs b/System/net/System/Net/Cache/HttpRequestCacheValidator.cs index 973e6b621..92dafc1f5 100644 --- a/System/net/System/Net/Cache/HttpRequestCacheValidator.cs +++ b/System/net/System/Net/Cache/HttpRequestCacheValidator.cs @@ -902,7 +902,7 @@ private unsafe void FetchCacheControl(string s, bool forCache) { // These if-else are two logically identical blocks that differ only in the way of how text search is done. // The text search is done differently for 32 and X-bits platforms. - // ATTN: You are responsible for keeping the rest of the logic in sync. + // ATTN: You are responsible for keeping the rest of the logic in [....]. if (IntPtr.Size == 4) { // We are on 32-bits platform diff --git a/System/net/System/Net/Cache/IERequestCache.cs b/System/net/System/Net/Cache/IERequestCache.cs index d7421af8e..fb4467486 100644 --- a/System/net/System/Net/Cache/IERequestCache.cs +++ b/System/net/System/Net/Cache/IERequestCache.cs @@ -51,7 +51,7 @@ internal WinInetCache(bool isPrivateCache, bool canWrite, bool async): base (isP ***********/ // Per VsWhidbey#88276 it was decided to not enforce any cache metadata limits for WinInet cache provider. - // (Microsoft 7/17 made this a const to avoid threading issues) + // ([....] 7/17 made this a const to avoid threading issues) //_MaximumResponseHeadersLength = Int32.MaxValue; this.async = async; diff --git a/System/net/System/Net/Cache/RequestCachePolicy.cs b/System/net/System/Net/Cache/RequestCachePolicy.cs index 704589af7..f66806904 100644 --- a/System/net/System/Net/Cache/RequestCachePolicy.cs +++ b/System/net/System/Net/Cache/RequestCachePolicy.cs @@ -32,7 +32,7 @@ public enum RequestCacheLevel BypassCache = 1, // Only serve requests from cache, an exception is thrown if not found CacheOnly = 2, - // Serve from the cache, but will sync up with the server if not found + // Serve from the cache, but will [....] up with the server if not found CacheIfAvailable = 3, // Attempt to revalidate cache with the server, reload if unable to Revalidate = 4, @@ -105,7 +105,7 @@ public enum HttpRequestCacheLevel BypassCache = 1, // Only serve requests from cache, an exception is thrown if not found CacheOnly = 2, - // Serve from the cache, but will sync up with the server if not found + // Serve from the cache, but will [....] up with the server if not found CacheIfAvailable = 3, // Validate cached data with the server even if it looks fresh Revalidate = 4, diff --git a/System/net/System/Net/Cache/WinInetCache.cs b/System/net/System/Net/Cache/WinInetCache.cs index 6618a1f00..513c848ee 100644 --- a/System/net/System/Net/Cache/WinInetCache.cs +++ b/System/net/System/Net/Cache/WinInetCache.cs @@ -546,8 +546,8 @@ private static unsafe Status GetEntryHeaders(Entry entry, EntryBuffer* bufferPtr int bufferCharLength = bufferPtr->HeaderInfoChars + ((int)(bufferPtr->_OffsetHeaderInfo))/c_CharSz; if (bufferCharLength*c_CharSz > entry.MaxBufferBytes) { - // WinInet - + // WinInet bug? They may report offset+HeaderInfoChars as a greater value than MaxBufferBytes as total buffer size. + // Actually, the last one seems to be accurate based on the data we have provided for Commit. bufferCharLength = entry.MaxBufferBytes/c_CharSz; } //WinInet may put terminating nulls at the end of the buffer, remove them. @@ -579,46 +579,46 @@ private static unsafe Status GetEntryHeaders(Entry entry, EntryBuffer* bufferPtr } int bufferCharLength = bufferPtr->HeaderInfoChars + ((int)(bufferPtr->_OffsetHeaderInfo))/c_CharSz; if (bufferCharLength*c_CharSz > entry.MaxBufferBytes) { - // WinInet - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + // WinInet bug? They may report offset+HeaderInfoChars as a greater value than total buffer size. + // Actually, the last one seems to be accurate based on the data we have provided for Commit. + bufferCharLength = entry.MaxBufferBytes/c_CharSz; + } + while (true) { + int totalLength = 0; + DataParseStatus status = WebHeaderCollection.ParseHeaders(collection, false, buffer, bufferCharLength, + ref offset, + ref totalLength, + entry.MaxBufferBytes/c_CharSz); + + if (status != DataParseStatus.Done) { + if (status == DataParseStatus.NeedMoreData) { + //WinInet puts terminating null at the end of the buffer, accept that as a "normal" case. + if ((offset+1 == bufferCharLength) && charPtr[offset] == 0) { + // accept as the last metainfo block + if (collection.Count != 0) { + result.Add(collection); + } + break; + } + } + entry.Error = Status.CorruptedHeaders; + //throw new InvalidOperationException("Cannot convert Cache Entry metadata into a NameValueCollection instance"); + break; + } -*/ + result.Add(collection); + // do we have more meta data? + if (offset >= bufferCharLength) { + break; + } + // continue parsing next collection + collection = new NameValueCollection(); + } + entry.MetaInfo = (result.Count == 0? null: (NameValueCollection[])result.ToArray(typeof(NameValueCollection))); + return entry.Error; + } +*********************/ #if DEBUG /* diff --git a/System/net/System/Net/Configuration/DefaultProxySection.cs b/System/net/System/Net/Configuration/DefaultProxySection.cs index deb439b59..13b735ef5 100644 --- a/System/net/System/Net/Configuration/DefaultProxySection.cs +++ b/System/net/System/Net/Configuration/DefaultProxySection.cs @@ -118,7 +118,7 @@ public bool UseDefaultCredentials // This allows us to prevent parent settings (machine.config) from propegating to higher config (app.config), unless // the higher config doesn't contain the section at all. That is, overriding defaultProxy is all-or-nothing. - // Template from Microsoft. + // Template from [....]. protected override void Reset(ConfigurationElement parentElement) { // Ignore the parentElement parameter by changing it to the default settings diff --git a/System/net/System/Net/Configuration/TimeoutValidationAttribute.cs b/System/net/System/Net/Configuration/TimeoutValidationAttribute.cs index 0bc729b6a..472273d81 100644 --- a/System/net/System/Net/Configuration/TimeoutValidationAttribute.cs +++ b/System/net/System/Net/Configuration/TimeoutValidationAttribute.cs @@ -3,7 +3,7 @@ namespace System.Net { using System.Configuration; using System.ComponentModel; - // NOTE [Microsoft]: The old validation attribute was removed from System.ll and is + // NOTE [[....]]: The old validation attribute was removed from System.ll and is // replaced by more flexible and robust validation/conversion design. // The change bellow is a simple fix to make things work with the least possible change ( it is an integration break ) // However, we already have a built-in support for configuration properties that store @@ -32,7 +32,7 @@ public override void Validate( object value ) { return; if (timeout <= 0 && timeout != System.Threading.Timeout.Infinite) { - // Note [Microsoft] : This is a lab integration fix. Old code did not have any error message at this point + // Note [[....]] : This is a lab integration fix. Old code did not have any error message at this point // This code change accomplishes the same result. However its highly reccomended that a specific error message is givven // to the user so they know what exaclty is the problem ( i.e. the value must be a positive integer or be Infinite ) // To accomplish this - an exception with the specific error message could be thrown ( ArgumentException is prefferred ) diff --git a/System/net/System/Net/FtpWebRequest.cs b/System/net/System/Net/FtpWebRequest.cs index 5ccb1aca1..8d6ae247f 100644 --- a/System/net/System/Net/FtpWebRequest.cs +++ b/System/net/System/Net/FtpWebRequest.cs @@ -618,7 +618,7 @@ public override WebResponse GetResponse() statusCode = GetStatusCode(webException); throw webException; } - // Catch added to address + // Catch added to address Bug # 545645 catch (InvalidOperationException invalidOpException) { SetException(invalidOpException); @@ -1320,7 +1320,7 @@ private void CheckError() { } } - // Return null only on Sync (if we're on the Sync thread). Otherwise throw if no context is available. + // Return null only on [....] (if we're on the [....] thread). Otherwise throw if no context is available. // // @@ -1331,7 +1331,7 @@ internal override ContextAwareResult GetWritingContext() else if (m_WriteAsyncResult != null) return m_WriteAsyncResult; - // Sync. + // [....]. GlobalLog.ThreadContract(ThreadKinds.User | ThreadKinds.Sync, "FtpWebRequest#" + ValidationHelper.HashString(this) + "::GetWritingContext"); return null; } @@ -1339,7 +1339,7 @@ internal override ContextAwareResult GetWritingContext() // // Provides an abstract way of having Async code callback into the request (saves a delegate) // - // ATTN this method is also called on sync path when either command or data stream gets closed + // ATTN this method is also called on [....] path when either command or data stream gets closed // Consider: Revisit the design of ftp streams // internal override void RequestCallback(object obj) @@ -1350,7 +1350,7 @@ internal override void RequestCallback(object obj) SyncRequestCallback(obj); } // - // Only executed for Sync requests when the pipline is completed + // Only executed for [....] requests when the pipline is completed // private void SyncRequestCallback(object obj) { @@ -1389,7 +1389,7 @@ private void SyncRequestCallback(object obj) isRevalidatedOrRetried =!m_CacheDone && (CacheProtocol.ProtocolStatus == CacheValidationStatus.Continue || CacheProtocol.ProtocolStatus == CacheValidationStatus.RetryResponseFromServer); - // This is for sync Upload commands that do not get chance hit GetResponse loop + // This is for [....] Upload commands that do not get chance hit GetResponse loop if (m_MethodInfo.IsUpload) { CheckCacheRetrieveOnResponse(); diff --git a/System/net/System/Net/HttpListener.cs b/System/net/System/Net/HttpListener.cs index 829540fab..c7d9b1d7a 100644 --- a/System/net/System/Net/HttpListener.cs +++ b/System/net/System/Net/HttpListener.cs @@ -285,14 +285,14 @@ public sealed unsafe class HttpListener : IDisposable private static readonly int RequestChannelBindStatusSize = Marshal.SizeOf(typeof(UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_CHANNEL_BIND_STATUS)); - // Win8# 559317 fixed a - - - - - - - + // Win8# 559317 fixed a bug in Http.sys's HttpReceiveClientCertificate method. + // Without this fix IOCP callbacks were not being called although ERROR_IO_PENDING was + // returned from HttpReceiveClientCertificate when using the + // FileCompletionNotificationModes.SkipCompletionPortOnSuccess flag. + // This bug was only hit when the buffer passed into HttpReceiveClientCertificate + // (1500 bytes initially) is tool small for the certificate. + // Due to this bug in downlevel operating systems the FileCompletionNotificationModes.SkipCompletionPortOnSuccess + // flag is only used on Win8 and later. internal static readonly bool SkipIOCPCallbackOnSuccess = ComNetOS.IsWin8orLater; // Mitigate potential DOS attacks by limiting the number of unknown headers we accept. Numerous header names @@ -1564,8 +1564,8 @@ internal HttpListenerContext HandleAuthentication(RequestContextBase memoryBlob, outBlob = context.GetOutgoingDigestBlob(inBlob, verb, null, Realm, false, false, out statusCodeNew); GlobalLog.Print("HttpListener#" + ValidationHelper.HashString(this) + "::HandleAuthentication() GetOutgoingDigestBlob() returned IsCompleted:" + context.IsCompleted + " statusCodeNew:" + statusCodeNew + " outBlob:[" + outBlob + "]"); - // WDigest - + // WDigest bug: sometimes when AcceptSecurityContext returns success, it provides a bogus, empty 4k buffer. + // Ignore it. (Should find out what's going on here from WDigest people.) if (statusCodeNew == SecurityStatus.OK) { outBlob = null; @@ -1654,9 +1654,9 @@ internal HttpListenerContext HandleAuthentication(RequestContextBase memoryBlob, error = !context.IsValidContext; if (error) { - // - - + // Bug #474228: SSPI Workaround + // If a client sends up a blob on the initial request, Negotiate returns SEC_E_INVALID_HANDLE + // when it should return SEC_E_INVALID_TOKEN. if (statusCodeNew == SecurityStatus.InvalidHandle && oldContext == null && bytes != null && bytes.Length > 0) { statusCodeNew = SecurityStatus.InvalidToken; diff --git a/System/net/System/Net/HttpListenerRequest.cs b/System/net/System/Net/HttpListenerRequest.cs index 2600cfdab..320e1d69f 100644 --- a/System/net/System/Net/HttpListenerRequest.cs +++ b/System/net/System/Net/HttpListenerRequest.cs @@ -7,6 +7,7 @@ namespace System.Net { using System; using System.Collections; + using System.Collections.Generic; using System.Collections.Specialized; using System.IO; using System.Net.Sockets; @@ -98,9 +99,9 @@ private static unsafe void IOCompleted(ListenerClientCertAsyncResult asyncResult try { if (errorCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_MORE_DATA) { - //There is a - - + //There is a bug that has existed in http.sys since w2k3. Bytesreceived will only + //return the size of the inital cert structure. To get the full size, + //we need to add the certificate encoding size as well. UnsafeNclNativeMethods.HttpApi.HTTP_SSL_CLIENT_CERT_INFO* pClientCertInfo = asyncResult.RequestBlob; asyncResult.Reset(numBytes + pClientCertInfo->CertEncodedSize); @@ -235,6 +236,9 @@ public sealed unsafe class HttpListenerRequest/* BaseHttpRequest, */ { private bool m_IsDisposed = false; internal const uint CertBoblSize = 1500; private string m_ServiceName; + private object m_Lock = new object(); + private List m_TokenBindings = null; + private int m_TokenBindingVerifyMessageStatus = 0; private enum SslStatus : byte { @@ -1009,6 +1013,126 @@ internal ChannelBinding GetChannelBinding() return HttpListenerContext.Listener.GetChannelBindingFromTls(m_ConnectionId); } + internal IEnumerable GetTlsTokenBindings() { + + // Try to get the token binding if not created. + if (Volatile.Read(ref m_TokenBindings) == null) + { + lock (m_Lock) + { + if (Volatile.Read(ref m_TokenBindings) == null) + { + // If token binding is supported on the machine get it else create empty list. + if (UnsafeNclNativeMethods.TokenBindingOSHelper.SupportsTokenBinding) + { + ProcessTlsTokenBindings(); + } + else + { + m_TokenBindings = new List(); + } + } + } + } + + // If the cached status is not success throw exception, else return the token binding + if (0 != m_TokenBindingVerifyMessageStatus) + { + throw new HttpListenerException(m_TokenBindingVerifyMessageStatus); + } + else + { + return m_TokenBindings.AsReadOnly(); + } + } + + /// + /// Process the token binding information in the request and populate m_TokenBindings + /// This method should be called once only as token binding information is cached in m_TokenBindings for further use. + /// + private void ProcessTlsTokenBindings() { + + Debug.Assert(m_TokenBindings == null); + + if (m_TokenBindings != null) + { + return; + } + + m_TokenBindings = new List(); + + UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_TOKEN_BINDING_INFO* pTokenBindingInfo = GetTlsTokenBindingRequestInfo(); + + if (pTokenBindingInfo == null) + { + // The current request isn't over TLS or the client or server doesn't support the token binding + // protocol. This isn't an error; just return "nothing here". + return; + } + + UnsafeNclNativeMethods.HttpApi.HeapAllocHandle handle = null; + m_TokenBindingVerifyMessageStatus = -1; + m_TokenBindingVerifyMessageStatus = UnsafeNclNativeMethods.HttpApi.TokenBindingVerifyMessage( + pTokenBindingInfo->TokenBinding, + pTokenBindingInfo->TokenBindingSize, + pTokenBindingInfo->KeyType, + pTokenBindingInfo->TlsUnique, + pTokenBindingInfo->TlsUniqueSize, + out handle); + + if (m_TokenBindingVerifyMessageStatus != 0) + { + throw new HttpListenerException(m_TokenBindingVerifyMessageStatus); + } + + Debug.Assert(handle != null); + Debug.Assert(!handle.IsInvalid); + + using (handle) + { + UnsafeNclNativeMethods.HttpApi.TOKENBINDING_RESULT_LIST* pResultList = (UnsafeNclNativeMethods.HttpApi.TOKENBINDING_RESULT_LIST*)handle.DangerousGetHandle(); + for (int i = 0; i < pResultList->resultCount; i++) + { + UnsafeNclNativeMethods.HttpApi.TOKENBINDING_RESULT_DATA* pThisResultData = &pResultList->resultData[i]; + + if (pThisResultData != null) + { + // Per http://tools.ietf.org/html/draft-ietf-tokbind-protocol-00, Sec. 4, + // We'll strip off the token binding type and return the remainder as an opaque blob. + Debug.Assert((long)(&pThisResultData->identifierData->hashAlgorithm) == (long)(pThisResultData->identifierData) + 1); + byte[] retVal = new byte[pThisResultData->identifierSize - 1]; + Marshal.Copy((IntPtr)(&pThisResultData->identifierData->hashAlgorithm), retVal, 0, retVal.Length); + + if (pThisResultData->identifierData->bindingType == UnsafeNclNativeMethods.HttpApi.TOKENBINDING_TYPE.TOKENBINDING_TYPE_PROVIDED) + { + m_TokenBindings.Add(new TokenBinding(TokenBindingType.Provided, retVal)); + } + else if (pThisResultData->identifierData->bindingType == UnsafeNclNativeMethods.HttpApi.TOKENBINDING_TYPE.TOKENBINDING_TYPE_REFERRED) + { + m_TokenBindings.Add(new TokenBinding(TokenBindingType.Referred, retVal)); + } + } + } + } + } + + private UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_TOKEN_BINDING_INFO* GetTlsTokenBindingRequestInfo() { + fixed (byte* pMemoryBlob = RequestBuffer) + { + UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_V2* request = (UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_V2*)pMemoryBlob; + + for (int i = 0; i < request->RequestInfoCount; i++) + { + UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_INFO* pThisInfo = &request->pRequestInfo[i]; + if (pThisInfo != null && pThisInfo->InfoType == UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_INFO_TYPE.HttpRequestInfoTypeSslTokenBinding) + { + return (UnsafeNclNativeMethods.HttpApi.HTTP_REQUEST_TOKEN_BINDING_INFO*)pThisInfo->pInfo; + } + } + } + return null; + } + internal void CheckDisposed() { if (m_IsDisposed) { throw new ObjectDisposedException(this.GetType().FullName); diff --git a/System/net/System/Net/HttpWebRequest.cs b/System/net/System/Net/HttpWebRequest.cs index 76e37ecea..7fe34ea43 100644 --- a/System/net/System/Net/HttpWebRequest.cs +++ b/System/net/System/Net/HttpWebRequest.cs @@ -153,7 +153,7 @@ private enum Booleans : uint { // Used by our Connection to block on being able to Read from our Connection private LazyAsyncResult _ConnectionReaderAResult; - // Once set, the Request either works Async or Sync internally + // Once set, the Request either works Async or [....] internally private TriState _RequestIsAsync; // Delegate that can be called on Continue Response @@ -406,7 +406,7 @@ internal bool NtlmKeepAlive { } } - // Sync code path only. + // [....] code path only. // True if ProcessWriteCallDone Should read for an additional response. // False if the 100Continue code will do the read in WriteHeaders. internal bool NeedsToReadForResponse { @@ -792,7 +792,7 @@ internal LazyAsyncResult ConnectionReaderAsyncResult { } // True, if the EndGetRequestStream or GetRequestStream call returned - // codereview: Used ONLY by Sync code + // codereview: Used ONLY by [....] code internal bool UserRetrievedWriteStream { get { return _WriteAResult != null && _WriteAResult.InternalPeekCompleted; @@ -1555,7 +1555,7 @@ public Stream GetRequestStream(out TransportContext context) { CurrentMethod = _OriginVerb; // Submit the Request, causes us to queue ourselves to a Connection and may block - // It has happened that Sync path uses this loop the Retry memeber for handling resubmissions. + // It has happened that [....] path uses this loop the Retry memeber for handling resubmissions. while (m_Retry && !_WriteAResult.InternalPeekCompleted) { _OldSubmitWriteStream = null; _SubmitWriteStream = null; @@ -1825,7 +1825,7 @@ private HttpProcessingResult DoSubmitRequestProcessing(ref Exception exception) { GlobalLog.Print("HttpWebRequest#" + ValidationHelper.HashString(this) + "::DoSubmitRequestProcessing() resubmiting this request."); - // Here is a little hack for sync looping through BeginSubmitRequest. + // Here is a little hack for [....] looping through BeginSubmitRequest. // We want to unlock cache protocol only if this is NOT a retry. if (CacheProtocol != null && _HttpResponse != null) CacheProtocol.Reset(); @@ -1856,7 +1856,7 @@ private HttpProcessingResult DoSubmitRequestProcessing(ref Exception exception) SubmitRequest(servicePoint); } else { - // under sync conditions, we let GetResponse() loop calling BeginSubmitRequest() until we're done + // under [....] conditions, we let GetResponse() loop calling BeginSubmitRequest() until we're done m_Retry = true; } result = HttpProcessingResult.WriteWait; @@ -2181,7 +2181,7 @@ public override WebResponse GetResponse() { Async = false; - // Since we don't really allow switching between sync and async, if the request is already async, this needs to + // Since we don't really allow switching between [....] and async, if the request is already async, this needs to // capture context for use in the ongoing async operations as if it were BeginGetResponse(). if (Async) { @@ -2206,7 +2206,7 @@ public override WebResponse GetResponse() { if (!gotResponse) { - //The previous call may have been async. If we are now doing a sync call, we should + //The previous call may have been async. If we are now doing a [....] call, we should //use the timeout if (_Timer == null) { _Timer = TimerQueue.CreateTimer(s_TimeoutCallback, this); @@ -3369,7 +3369,7 @@ internal void SetRequestSubmitDone(ConnectStream submitStream) { // // This line is needed ONLY if we got a connect failure (Abort can still happen at random time) // CallDone will check for the write side response processing and this is what we want. - // Note that Sync case already has a separate path to check for the response + // Note that [....] case already has a separate path to check for the response // if (Async && _CoreResponse != null && (object)_CoreResponse != (object)DBNull.Value) { @@ -3489,7 +3489,7 @@ internal void OpenWriteSideResponseWindow() // internal void CheckWriteSideResponseProcessing() { - // In Sync case never close the write side window + // In [....] case never close the write side window // Definitions of _CoreResponse: // - DBNull.Value - Uploading headers/body is in progress, but we haven't yet received a response. @@ -3595,7 +3595,7 @@ internal void SetAndOrProcessResponse(object responseOrException) { GlobalLog.Print("HttpWebRequest#" + ValidationHelper.HashString(this) + "::SetAndOrProcessResponse() - Write Thread will procees the response."); // - // Note for a sync request a write side window is always open + // Note for a [....] request a write side window is always open // if (!Async) { @@ -3991,7 +3991,7 @@ private bool IdentityRequired } } - // Return null only on Sync (if we're on the Sync thread). Otherwise throw if no context is available. + // Return null only on [....] (if we're on the [....] thread). Otherwise throw if no context is available. internal override ContextAwareResult GetConnectingContext() { if (!Async) @@ -4014,7 +4014,7 @@ internal override ContextAwareResult GetConnectingContext() return context; } - // Return null only on Sync (if we're on the Sync thread). Otherwise throw if no context is available. + // Return null only on [....] (if we're on the [....] thread). Otherwise throw if no context is available. internal override ContextAwareResult GetWritingContext() { if (!Async) @@ -4039,7 +4039,7 @@ internal override ContextAwareResult GetWritingContext() return context; } - // Return null only on Sync (if we're on the Sync thread). Otherwise throw if no context is available. + // Return null only on [....] (if we're on the [....] thread). Otherwise throw if no context is available. internal override ContextAwareResult GetReadingContext() { if (!Async) @@ -6025,12 +6025,12 @@ private void ClearRequestForResubmit(bool ntlmFollowupRequest) { // The second NTLM request is required to use the same connection, don't close it if (ntlmFollowupRequest) { - // We only want CallDone to do a sync read now if 100Continue won't later + // We only want CallDone to do a [....] read now if 100Continue won't later NeedsToReadForResponse = !ShouldWaitFor100Continue(); _SubmitWriteStream.CallDone(); } else if (!AllowWriteStreamBuffering) { - // We only want CloseInternal to do a sync read now if 100Continue won't later + // We only want CloseInternal to do a [....] read now if 100Continue won't later NeedsToReadForResponse = !ShouldWaitFor100Continue(); _SubmitWriteStream.CloseInternal(true); } @@ -6094,7 +6094,7 @@ private void FinishRequest(HttpWebResponse response, Exception errorException) // Never throws // private Stream MakeMemoryStream(Stream stream) { - // GlobalLog.ThreadContract(ThreadKinds.Sync, "HttpWebRequest#" + ValidationHelper.HashString(this) + "::MakeMemoryStream"); + // GlobalLog.ThreadContract(ThreadKinds.[....], "HttpWebRequest#" + ValidationHelper.HashString(this) + "::MakeMemoryStream"); if (stream == null || stream is SyncMemoryStream) return stream; diff --git a/System/net/System/Net/HttpWebResponse.cs b/System/net/System/Net/HttpWebResponse.cs index ed107f8d4..b0690e863 100644 --- a/System/net/System/Net/HttpWebResponse.cs +++ b/System/net/System/Net/HttpWebResponse.cs @@ -335,19 +335,19 @@ public Version ProtocolVersion { internal bool KeepAlive { get { // - // QFE - DevDiv - - - - - - - - - - - - + // QFE - DevDiv bug: 37757 + // If there is proxy involved, independen of the Http Version, we should honor the + // proxy indicated Proxy-Connection header value. + // This header value is not RFC mandated, but is a legacy from Netscape documentations. + // It indicates that the proxy wants to keep the connection. + // Functionally it is equivalent of a Keep-Alive AND/OR Connection header. + // + // The absence of this check will result in HTTP/1.0 responsen be considered to be not + // Keeping the connection alive. + // + // This will result in a state mismatch between the connection pool and HttpWebRequest object + // when the decision to drain the connection and putting it back to the idle pool is made. + // if (m_UsesProxySemantics) { string proxyConnectionHeader = Headers[HttpKnownHeaderNames.ProxyConnection]; diff --git a/System/net/System/Net/Internal.cs b/System/net/System/Net/Internal.cs index 110dcf95c..cc9012469 100644 --- a/System/net/System/Net/Internal.cs +++ b/System/net/System/Net/Internal.cs @@ -422,7 +422,7 @@ internal static class NclConstants } // - // A simple sync point, useful for deferring work. Just an int value with helper methods. + // A simple [....] point, useful for deferring work. Just an int value with helper methods. // This is used by HttpWebRequest to syncronize Reads/Writes while waiting for a 100-Continue response. // internal struct InterlockedGate diff --git a/System/net/System/Net/SecureProtocols/NegotiateStream.cs b/System/net/System/Net/SecureProtocols/NegotiateStream.cs index 511cae21a..4cd3b3833 100644 --- a/System/net/System/Net/SecureProtocols/NegotiateStream.cs +++ b/System/net/System/Net/SecureProtocols/NegotiateStream.cs @@ -93,7 +93,7 @@ public virtual void AuthenticateAsClient(NetworkCredential credential, TokenImpersonationLevel allowedImpersonationLevel) { #if DEBUG - using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { + using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.[....])) { #endif _NegoState.ValidateCreateContext(_Package, false, credential, targetName, binding, requiredProtectionLevel, allowedImpersonationLevel); _NegoState.ProcessAuthentication(null); @@ -199,7 +199,7 @@ public virtual void AuthenticateAsServer(NetworkCredential credential, TokenImpersonationLevel requiredImpersonationLevel) { #if DEBUG - using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { + using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.[....])) { #endif _NegoState.ValidateCreateContext(_Package, credential, string.Empty, policy, requiredProtectionLevel, requiredImpersonationLevel); @@ -503,7 +503,7 @@ public override long Seek(long offset, SeekOrigin origin) { // Should this not block? public override void Flush() { #if DEBUG - using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { + using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.[....])) { #endif InnerStream.Flush(); #if DEBUG @@ -531,7 +531,7 @@ protected override void Dispose(bool disposing) { public override int Read(byte[] buffer, int offset, int count) { #if DEBUG - using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { + using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.[....])) { #endif _NegoState.CheckThrow(true); @@ -548,7 +548,7 @@ public override int Read(byte[] buffer, int offset, int count) public override void Write(byte[] buffer, int offset, int count) { #if DEBUG - using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { + using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.[....])) { #endif _NegoState.CheckThrow(true); diff --git a/System/net/System/Net/SecureProtocols/_FixedSizeReader.cs b/System/net/System/Net/SecureProtocols/_FixedSizeReader.cs index 2d676f9fa..db9d6aff1 100644 --- a/System/net/System/Net/SecureProtocols/_FixedSizeReader.cs +++ b/System/net/System/Net/SecureProtocols/_FixedSizeReader.cs @@ -8,7 +8,7 @@ Abstract: The class is a simple wrapper on top of a read stream. It will read the exact number of bytes requested. - It operates either sync or async. + It operates either [....] or async. Author: @@ -76,7 +76,7 @@ public void AsyncReadPacket(AsyncProtocolRequest request) StartReading(); } // - // Loops while subsequest completions are sync + // Loops while subsequest completions are [....] // private void StartReading() { diff --git a/System/net/System/Net/SecureProtocols/_NegoStream.cs b/System/net/System/Net/SecureProtocols/_NegoStream.cs index 91311238e..b8e698f07 100644 --- a/System/net/System/Net/SecureProtocols/_NegoStream.cs +++ b/System/net/System/Net/SecureProtocols/_NegoStream.cs @@ -117,7 +117,7 @@ private void ValidateParameters(byte[] buffer, int offset, int count) throw new ArgumentOutOfRangeException("count", SR.GetString(SR.net_offset_plus_count)); } // - // Combined sync/async write method. For sync requet asyncRequest==null + // Combined [....]/async write method. For [....] requet asyncRequest==null // private void ProcessWrite(byte[] buffer, int offset, int count, AsyncProtocolRequest asyncRequest) { @@ -198,9 +198,9 @@ private void StartWriting(byte[] buffer, int offset, int count, AsyncProtocolReq } } // - // Combined sync/async read method. For sync requet asyncRequest==null - // There is a little overheader because we need to pass buffer/offset/count used only in sync. - // Still the benefit is that we have a common sync/async code path. + // Combined [....]/async read method. For [....] requet asyncRequest==null + // There is a little overheader because we need to pass buffer/offset/count used only in [....]. + // Still the benefit is that we have a common [....]/async code path. // private int ProcessRead(byte[] buffer, int offset, int count, AsyncProtocolRequest asyncRequest) { @@ -240,7 +240,7 @@ private int ProcessRead(byte[] buffer, int offset, int count, AsyncProtocolReque } finally { - // if sync request or exception + // if [....] request or exception if (asyncRequest == null || failed) { _NestedRead = 0; @@ -330,7 +330,7 @@ private int StartFrameBody(int readBytes, byte[] buffer, int offset, int count, } readBytes = asyncRequest.Result; } - else //Sync + else //[....] { readBytes = _FrameReader.ReadPacket(InternalBuffer, 0, readBytes); } diff --git a/System/net/System/Net/SecureProtocols/_SslState.cs b/System/net/System/Net/SecureProtocols/_SslState.cs index 37aa1ac00..257492c82 100644 --- a/System/net/System/Net/SecureProtocols/_SslState.cs +++ b/System/net/System/Net/SecureProtocols/_SslState.cs @@ -133,7 +133,7 @@ internal void ValidateCreateContext(bool isServer, string targetHost, SslProtoco // // We don;t support SSL alerts right now, hence any exception is fatal and cannot be retried - // Consider: make use if SSL alerts to re-sync SslStream on both sides for retrying. + // Consider: make use if SSL alerts to re-[....] SslStream on both sides for retrying. // if (_Exception != null && !_CanRetryAuthentication) { throw _Exception; @@ -623,7 +623,7 @@ private void ForceAuthentication(bool receiveFirst, byte[] buffer, AsyncProtocol // Async handshake is enqueued and will resume later return; } - // Either Sync handshake is ready to go or async handshake won the ---- over write. + // Either [....] handshake is ready to go or async handshake won the ---- over write. // This will tell that we don't know the framing yet (what SSL version is) _Framing = Framing.None; @@ -1288,7 +1288,7 @@ internal void FinishWrite() _QueuedWriteStateRequest = null; if (obj is LazyAsyncResult) { - // sync handshake is waiting on other thread. + // [....] handshake is waiting on other thread. ((LazyAsyncResult)obj).InvokeCallback(); } else @@ -1364,7 +1364,7 @@ private void FinishHandshake(Exception e, AsyncProtocolRequest asyncRequest) if (obj is LazyAsyncResult) { - // sync write is waiting on other thread. + // [....] write is waiting on other thread. ((LazyAsyncResult)obj).InvokeCallback(); } else diff --git a/System/net/System/Net/SecureProtocols/_SslStream.cs b/System/net/System/Net/SecureProtocols/_SslStream.cs index ef8b41bfc..6bb6bd71e 100644 --- a/System/net/System/Net/SecureProtocols/_SslStream.cs +++ b/System/net/System/Net/SecureProtocols/_SslStream.cs @@ -315,7 +315,7 @@ private void ValidateParameters(byte[] buffer, int offset, int count) throw new ArgumentOutOfRangeException("count", SR.GetString(SR.net_offset_plus_count)); } // - // Combined sync/async write method. For sync case asyncRequest==null + // Combined [....]/async write method. For [....] case asyncRequest==null // private void ProcessWrite(BufferOffsetSize[] buffers, SplitWriteAsyncProtocolRequest asyncRequest) { @@ -357,7 +357,7 @@ private void ProcessWrite(BufferOffsetSize[] buffers, SplitWriteAsyncProtocolReq } } // - // Combined sync/async write method. For sync case asyncRequest==null + // Combined [....]/async write method. For [....] case asyncRequest==null // private void ProcessWrite(byte[] buffer, int offset, int count, AsyncProtocolRequest asyncRequest) { @@ -634,9 +634,9 @@ private void StartWriting(byte[] buffer, int offset, int count, AsyncProtocolReq } // - // Combined sync/async read method. For sync requet asyncRequest==null - // There is a little overheader because we need to pass buffer/offset/count used only in sync. - // Still the benefit is that we have a common sync/async code path. + // Combined [....]/async read method. For [....] requet asyncRequest==null + // There is a little overheader because we need to pass buffer/offset/count used only in [....]. + // Still the benefit is that we have a common [....]/async code path. // private int ProcessRead(byte[] buffer, int offset, int count, AsyncProtocolRequest asyncRequest) { @@ -678,7 +678,7 @@ private int ProcessRead(byte[] buffer, int offset, int count, AsyncProtocolReque } finally { - // if sync request or exception + // if [....] request or exception if (asyncRequest == null || failed) { _NestedRead = 0; @@ -793,7 +793,7 @@ private int StartFrameBody(int readBytes, byte[] buffer, int offset, int count, } readBytes = asyncRequest.Result; } - else //Sync + else //[....] { readBytes = _Reader.ReadPacket(InternalBuffer, SecureChannel.ReadHeaderSize, readBytes); } diff --git a/System/net/System/Net/ServicePoint.cs b/System/net/System/Net/ServicePoint.cs index 89f94e570..7f71c4ba8 100644 --- a/System/net/System/Net/ServicePoint.cs +++ b/System/net/System/Net/ServicePoint.cs @@ -251,7 +251,7 @@ internal Socket GetConnection(PooledStream PooledStream, object owner, bool asyn abortSocket6 = socket6; // - // Setup socket timeouts for sync requests + // Setup socket timeouts for [....] requests // // diff --git a/System/net/System/Net/Sockets/NetworkStream.cs b/System/net/System/Net/Sockets/NetworkStream.cs index cf21e9bfb..7f46157be 100644 --- a/System/net/System/Net/Sockets/NetworkStream.cs +++ b/System/net/System/Net/Sockets/NetworkStream.cs @@ -483,7 +483,7 @@ public override int Read([In, Out] byte[] buffer, int offset, int size) { #if DEBUG using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { #endif - bool canRead = CanRead; // Prevent ---- with Dispose. + bool canRead = CanRead; // Prevent race with Dispose. if (m_CleanedUp){ throw new ObjectDisposedException(this.GetType().FullName); } @@ -557,7 +557,7 @@ public override void Write(byte[] buffer, int offset, int size) { #if DEBUG using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Sync)) { #endif - bool canWrite = CanWrite; // Prevent ---- with Dispose. + bool canWrite = CanWrite; // Prevent race with Dispose. if (m_CleanedUp){ throw new ObjectDisposedException(this.GetType().FullName); } @@ -717,7 +717,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int size, Asyn #if DEBUG using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Async)) { #endif - bool canRead = CanRead; // Prevent ---- with Dispose. + bool canRead = CanRead; // Prevent race with Dispose. if (m_CleanedUp){ throw new ObjectDisposedException(this.GetType().FullName); } @@ -772,7 +772,7 @@ public override IAsyncResult BeginRead(byte[] buffer, int offset, int size, Asyn internal virtual IAsyncResult UnsafeBeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, Object state) { - bool canRead = CanRead; // Prevent ---- with Dispose. + bool canRead = CanRead; // Prevent race with Dispose. if (m_CleanedUp) { throw new ObjectDisposedException(GetType().FullName); @@ -902,7 +902,7 @@ public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, Asy #if DEBUG using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Async)) { #endif - bool canWrite = CanWrite; // Prevent ---- with Dispose. + bool canWrite = CanWrite; // Prevent race with Dispose. if (m_CleanedUp){ throw new ObjectDisposedException(this.GetType().FullName); } @@ -964,7 +964,7 @@ internal virtual IAsyncResult UnsafeBeginWrite(byte[] buffer, int offset, int si #if DEBUG using (GlobalLog.SetThreadKind(ThreadKinds.User | ThreadKinds.Async)) { #endif - bool canWrite = CanWrite; // Prevent ---- with Dispose. + bool canWrite = CanWrite; // Prevent race with Dispose. if (m_CleanedUp){ throw new ObjectDisposedException(this.GetType().FullName); } @@ -1061,7 +1061,7 @@ public override void EndWrite(IAsyncResult asyncResult) { /// /// - /// Performs a sync Write of an array of buffers. + /// Performs a [....] Write of an array of buffers. /// /// internal virtual void MultipleWrite(BufferOffsetSize[] buffers) diff --git a/System/net/System/Net/Sockets/Socket.cs b/System/net/System/Net/Sockets/Socket.cs index 141f8f198..1d92faa54 100644 --- a/System/net/System/Net/Sockets/Socket.cs +++ b/System/net/System/Net/Sockets/Socket.cs @@ -64,7 +64,7 @@ public class Socket : IDisposable private SocketType socketType; private ProtocolType protocolType; - // These caches are one degree off of Socket since they're not used in the sync case/when disabled in config. + // These caches are one degree off of Socket since they're not used in the [....] case/when disabled in config. private CacheSet m_Caches; private class CacheSet @@ -2621,8 +2621,8 @@ public static void Select(IList checkRead, IList checkWrite, IList checkError, i // // Negative microsecond values that weren't exactly (-1) were originally successfully // converted to a timeval struct containing unsigned non-zero integers. This code - // retains that behavior so that any app working around the original - + // retains that behavior so that any app working around the original bug with, + // for example, (-2) specified for microseconds, will continue to get the same behavior. int socketCount; @@ -6408,7 +6408,7 @@ internal unsafe void SetSocketOption(SocketOptionLevel optionLevel, SocketOption throw; } - // Keep the internal state in sync if the user manually resets this + // Keep the internal state in [....] if the user manually resets this if (optionName == SocketOptionName.PacketInformation && optionValue == 0 && errorCode == SocketError.Success) { @@ -6851,9 +6851,9 @@ private IAsyncResult BeginConnectEx(EndPoint remoteEP, bool flowContext, AsyncCa catch { // - // - - + // Bug 152350: If ConnectEx throws we need to unpin the socketAddress buffer. + // m_RightEndPoint will always equal oldEndPoint anyways... + // asyncResult.InternalCleanup(); m_RightEndPoint = oldEndPoint; throw; @@ -7634,7 +7634,7 @@ public bool AcceptAsync(SocketAsyncEventArgs e) { e.StartOperationAccept(); BindToCompletionPort(); - // Local variables for sync completion. + // Local variables for [....] completion. int bytesTransferred; SocketError socketError = SocketError.Success; @@ -7899,7 +7899,7 @@ public bool ReceiveAsync(SocketAsyncEventArgs e) { e.StartOperationReceive(); BindToCompletionPort(); - // Local vars for sync completion of native call. + // Local vars for [....] completion of native call. SocketFlags flags = e.m_SocketFlags; int bytesTransferred; SocketError socketError; @@ -8142,7 +8142,7 @@ public bool SendAsync(SocketAsyncEventArgs e) { BindToCompletionPort(); - // Local vars for sync completion of native call. + // Local vars for [....] completion of native call. int bytesTransferred; SocketError socketError; @@ -8826,7 +8826,7 @@ private void SetBufferInternal(byte [] buffer, int offset, int count) { - // Method to update internal state after sync or async completion. + // Method to update internal state after [....] or async completion. internal void SetResults(SocketError socketError, int bytesTransferred, SocketFlags flags) { m_SocketError = socketError; m_ConnectByNameError = null; diff --git a/System/net/System/Net/Sockets/UDPClient.cs b/System/net/System/Net/Sockets/UDPClient.cs index 51a82e895..f46c79318 100644 --- a/System/net/System/Net/Sockets/UDPClient.cs +++ b/System/net/System/Net/Sockets/UDPClient.cs @@ -616,7 +616,7 @@ public IAsyncResult BeginSend(byte[] datagram, int bytes, IPEndPoint endPoint, A throw new ArgumentNullException("datagram"); } - if (bytes > datagram.Length) { + if (bytes > datagram.Length || bytes < 0) { throw new ArgumentOutOfRangeException("bytes"); } diff --git a/System/net/System/Net/TransportContext.cs b/System/net/System/Net/TransportContext.cs index 63ee7a729..1d84d2f13 100644 --- a/System/net/System/Net/TransportContext.cs +++ b/System/net/System/Net/TransportContext.cs @@ -4,6 +4,7 @@ // //------------------------------------------------------------------------------ +using System.Collections.Generic; using System.Net.Security; using System.Security.Authentication.ExtendedProtection; @@ -12,6 +13,10 @@ namespace System.Net public abstract class TransportContext { public abstract ChannelBinding GetChannelBinding(ChannelBindingKind kind); + public virtual IEnumerable GetTlsTokenBindings() + { + throw new NotSupportedException(); + } } internal class ConnectStreamContext : TransportContext @@ -64,6 +69,11 @@ public override ChannelBinding GetChannelBinding(ChannelBindingKind kind) return request.GetChannelBinding(); } + public override IEnumerable GetTlsTokenBindings() + { + return request.GetTlsTokenBindings(); + } + private HttpListenerRequest request; } diff --git a/System/net/System/Net/UnsafeNativeMethods.cs b/System/net/System/Net/UnsafeNativeMethods.cs index a5f20f278..7cf970ed0 100644 --- a/System/net/System/Net/UnsafeNativeMethods.cs +++ b/System/net/System/Net/UnsafeNativeMethods.cs @@ -20,6 +20,7 @@ namespace System.Net { using System.Diagnostics.CodeAnalysis; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; + using System.IO; [System.Security.SuppressUnmanagedCodeSecurityAttribute()] internal static class UnsafeNclNativeMethods { @@ -67,6 +68,7 @@ internal static class UnsafeNclNativeMethods { private const string WINHTTP = "winhttp.dll"; private const string BCRYPT = "bcrypt.dll"; private const string USER32 = "user32.dll"; + private const string TOKENBINDING = "tokenbinding.dll"; #if !FEATURE_PAL private const string OLE32 = "ole32.dll"; @@ -115,6 +117,16 @@ internal static class NTStatus [DllImport(KERNEL32, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] internal static unsafe extern bool SetFileCompletionNotificationModes(CriticalHandle handle, FileCompletionNotificationModes modes); + [DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)] + internal static extern IntPtr GetProcessHeap(); + + [DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)] + internal static extern bool HeapFree([In] IntPtr hHeap, [In] uint dwFlags, [In] IntPtr lpMem); + + [System.Security.SecurityCritical] + [DllImport(KERNEL32, CallingConvention = CallingConvention.Winapi, SetLastError = true)] + internal extern static IntPtr GetProcAddress(SafeLoadLibrary hModule, string entryPoint); + [Flags] internal enum FileCompletionNotificationModes : byte { @@ -2171,6 +2183,33 @@ internal static unsafe class HttpApi { [DllImport(HTTPAPI, ExactSpelling = true, CallingConvention = CallingConvention.StdCall, SetLastError = true)] internal static extern uint HttpCloseUrlGroup(ulong urlGroupId); + [SuppressMessage("Microsoft.Security", "CA2118:ReviewSuppressUnmanagedCodeSecurityUsage", Justification = "Implementation requires unmanaged code usage")] + [DllImport(TOKENBINDING, CharSet = CharSet.Unicode, CallingConvention = CallingConvention.StdCall)] + public static extern int TokenBindingVerifyMessage( + [In] byte* tokenBindingMessage, + [In] uint tokenBindingMessageSize, + [In] IntPtr keyType, + [In] byte* tlsUnique, + [In] uint tlsUniqueSize, + [Out] out HeapAllocHandle resultList); + + internal sealed class HeapAllocHandle : SafeHandleZeroOrMinusOneIsInvalid + { + private static readonly IntPtr ProcessHeap = GetProcessHeap(); + + // Called by P/Invoke when returning SafeHandles. + private HeapAllocHandle() + : base(ownsHandle: true) + { + } + + // Do not provide a finalizer - SafeHandle's critical finalizer will call ReleaseHandle for you. + protected override bool ReleaseHandle() + { + return HeapFree(ProcessHeap, 0, handle); + } + } + internal enum HTTP_API_VERSION { Invalid, Version10, @@ -2192,12 +2231,12 @@ internal enum HTTP_SERVER_PROPERTY { HttpServerChannelBindProperty, HttpServerProtectionLevelProperty, } - - // - // Currently only one request info type is supported but the enum is for future extensibility. - // + internal enum HTTP_REQUEST_INFO_TYPE { HttpRequestInfoTypeAuth, + HttpRequestInfoTypeChannelBind, + HttpRequestInfoTypeSslProtocol, + HttpRequestInfoTypeSslTokenBinding } internal enum HTTP_RESPONSE_INFO_TYPE { @@ -2519,6 +2558,12 @@ internal struct HTTP_REQUEST { internal HTTP_DATA_CHUNK* pEntityChunks; internal ulong RawConnectionId; internal HTTP_SSL_INFO* pSslInfo; + } + + [StructLayout(LayoutKind.Sequential)] + internal struct HTTP_REQUEST_V2 + { + internal HTTP_REQUEST RequestV1; internal ushort RequestInfoCount; internal HTTP_REQUEST_INFO* pRequestInfo; } @@ -2540,6 +2585,63 @@ internal struct HTTP_BINDING_INFO { internal IntPtr RequestQueueHandle; } + [StructLayout(LayoutKind.Sequential)] + internal unsafe struct HTTP_REQUEST_TOKEN_BINDING_INFO + { + public byte* TokenBinding; + public uint TokenBindingSize; + public byte* TlsUnique; + public uint TlsUniqueSize; + public IntPtr KeyType; + } + + internal enum TOKENBINDING_HASH_ALGORITHM : byte + { + TOKENBINDING_HASH_ALGORITHM_SHA256 = 4, + } + + internal enum TOKENBINDING_SIGNATURE_ALGORITHM : byte + { + TOKENBINDING_SIGNATURE_ALGORITHM_RSA = 1, + TOKENBINDING_SIGNATURE_ALGORITHM_ECDSAP256 = 3, + } + + internal enum TOKENBINDING_TYPE : byte + { + TOKENBINDING_TYPE_PROVIDED = 0, + TOKENBINDING_TYPE_REFERRED = 1, + } + + internal enum TOKENBINDING_EXTENSION_FORMAT + { + TOKENBINDING_EXTENSION_FORMAT_UNDEFINED = 0, + } + + [StructLayout(LayoutKind.Sequential)] + internal struct TOKENBINDING_IDENTIFIER + { + public TOKENBINDING_TYPE bindingType; + public TOKENBINDING_HASH_ALGORITHM hashAlgorithm; + public TOKENBINDING_SIGNATURE_ALGORITHM signatureAlgorithm; + } + + [StructLayout(LayoutKind.Sequential)] + internal unsafe struct TOKENBINDING_RESULT_DATA + { + public uint identifierSize; + public TOKENBINDING_IDENTIFIER* identifierData; + public TOKENBINDING_EXTENSION_FORMAT extensionFormat; + public uint extensionSize; + public IntPtr extensionData; + } + + [StructLayout(LayoutKind.Sequential)] + internal unsafe struct TOKENBINDING_RESULT_LIST + { + public uint resultCount; + public TOKENBINDING_RESULT_DATA* resultData; + } + // see http.w for definitions [Flags] internal enum HTTP_FLAGS : uint { @@ -3245,5 +3347,66 @@ private struct GuiThreadInfo public int bottom; } } + + /// + /// Determines whether Token binding is supported on the machine or not + /// This class is thread safe. + /// The static method EnsureTokenBindingOSHelperInitialized is used to get that information. + /// It calls the load library and caches the result under proper locks to make sure it is thread safe and only one call is made to load library. + /// + internal static class TokenBindingOSHelper + { + private static bool s_supportsTokenBinding = false; + private static object s_Lock = new object(); + private static volatile bool s_Initialized = false; + + // + // + // + // + // + [System.Security.SecurityCritical] + private static void EnsureTokenBindingOSHelperInitialized() + { + if (s_Initialized) + { + return; + } + lock (s_Lock) + { + if (s_Initialized) + { + return; + } + try + { + // if tokenbinding.dll is not available, TOKENBINDING is not supported + string dllFileName = Path.Combine(Environment.SystemDirectory, TOKENBINDING); + SafeLoadLibrary s_TokenBindingLibrary = SafeLoadLibrary.LoadLibraryEx(dllFileName); + if (!s_TokenBindingLibrary.IsInvalid) + { + s_supportsTokenBinding = s_TokenBindingLibrary.HasFunction("TokenBindingVerifyMessage"); + } + s_Initialized = true; + } + catch (Exception e) + { + if (NclUtilities.IsFatal(e)) + { + throw; + } + } + } + } + + internal static bool SupportsTokenBinding + { + get + { + EnsureTokenBindingOSHelperInitialized(); + return s_supportsTokenBinding; + } + } + } } } diff --git a/System/net/System/Net/WebRequest.cs b/System/net/System/Net/WebRequest.cs index da5d0ed5f..1135be089 100644 --- a/System/net/System/Net/WebRequest.cs +++ b/System/net/System/Net/WebRequest.cs @@ -981,7 +981,7 @@ public AuthenticationLevel AuthenticationLevel { // GetRequestStream() and the reading phase to GetResponse(), but if there's no request body, both phases // may happen inside GetResponse(). // - // Return null only on Sync (if we're on the Sync thread). Otherwise throw if no context is available. + // Return null only on [....] (if we're on the [....] thread). Otherwise throw if no context is available. internal virtual ContextAwareResult GetConnectingContext() { throw ExceptionHelper.MethodNotImplementedException; diff --git a/System/net/System/Net/WebSockets/WebSocketHttpListenerDuplexStream.cs b/System/net/System/Net/WebSockets/WebSocketHttpListenerDuplexStream.cs index 9fd21d9ce..da0acfe79 100644 --- a/System/net/System/Net/WebSockets/WebSocketHttpListenerDuplexStream.cs +++ b/System/net/System/Net/WebSockets/WebSocketHttpListenerDuplexStream.cs @@ -203,8 +203,8 @@ private async Task ReadAsyncCore(byte[] buffer, int offset, int count, Canc return bytesRead; } - // return value indicates sync vs async completion - // false: sync completion + // return value indicates [....] vs async completion + // false: [....] completion // true: async completion private unsafe bool ReadAsyncFast(HttpListenerAsyncEventArgs eventArgs) { @@ -480,8 +480,8 @@ private async Task WriteAsyncCore(byte[] buffer, int offset, int count, Cancella } } - // return value indicates sync vs async completion - // false: sync completion + // return value indicates [....] vs async completion + // false: [....] completion // true: async completion private bool WriteAsyncFast(HttpListenerAsyncEventArgs eventArgs) { @@ -649,7 +649,7 @@ public async Task CloseNetworkConnectionAsync(CancellationToken cancellationToke } // throw OperationCancelledException when canceled by the caller - // otherwise swallow the exception + // otherwise ---- the exception cancellationToken.ThrowIfCancellationRequested(); } finally @@ -863,12 +863,22 @@ internal class HttpListenerAsyncEventArgs : EventArgs, IDisposable private readonly WebSocketBase m_WebSocket; private readonly WebSocketHttpListenerDuplexStream m_CurrentStream; + // With this flag enabled, Overlapped objects are allocated/pinned before each operation and released/unpinned when the operation ends. + // This eliminates the need to keep an Overlapped object in-memory all the time for the generally short-lived write operation. + // It also allows the GC to better compact the heap due to the frequent unpinning of the (read and write) Overlapped objects. + private readonly bool m_AllocateOverlappedOnDemand; + public HttpListenerAsyncEventArgs(WebSocketBase webSocket, WebSocketHttpListenerDuplexStream stream) : base() { m_WebSocket = webSocket; m_CurrentStream = stream; - InitializeOverlapped(); + m_AllocateOverlappedOnDemand = LocalAppContextSwitches.AllocateOverlappedOnDemand; + + if (!m_AllocateOverlappedOnDemand) + { + InitializeOverlapped(); + } } public int BytesTransferred @@ -890,11 +900,11 @@ public IList> BufferList set { Contract.Assert(!m_ShouldCloseOutput, "'m_ShouldCloseOutput' MUST be 'false' at this point."); - Contract.Assert(value == null || m_Buffer == null, + Contract.Assert(value == null || m_Buffer == null, "Either 'm_Buffer' or 'm_BufferList' MUST be NULL."); - Contract.Assert(m_Operating == Free, + Contract.Assert(m_Operating == Free, "This property can only be modified if no IO operation is outstanding."); - Contract.Assert(value == null || value.Count == 2, + Contract.Assert(value == null || value.Count == 2, "This list can only be 'NULL' or MUST have exactly '2' items."); m_BufferList = value; } @@ -996,9 +1006,12 @@ public void Dispose() return; } - // OK to dispose now. - // Free native overlapped data. - FreeOverlapped(false); + if (!m_AllocateOverlappedOnDemand) + { + // OK to dispose now. + // Free native overlapped data. + FreeOverlapped(false); + } // Don't bother finalizing later. GC.SuppressFinalize(this); @@ -1007,7 +1020,10 @@ public void Dispose() // Finalizer ~HttpListenerAsyncEventArgs() { - FreeOverlapped(true); + if (!m_AllocateOverlappedOnDemand) + { + FreeOverlapped(true); + } } private unsafe void InitializeOverlapped() @@ -1030,6 +1046,10 @@ private void FreeOverlapped(bool checkForShutdown) if (m_DataChunksGCHandle.IsAllocated) { m_DataChunksGCHandle.Free(); + if (m_AllocateOverlappedOnDemand) + { + m_DataChunks = null; + } } } } @@ -1039,7 +1059,7 @@ private void FreeOverlapped(bool checkForShutdown) internal void StartOperationCommon(WebSocketHttpListenerDuplexStream currentStream) { // Change status to "in-use". - if(Interlocked.CompareExchange(ref m_Operating, InProgress, Free) != Free) + if (Interlocked.CompareExchange(ref m_Operating, InProgress, Free) != Free) { // If it was already "in-use" check if Dispose was called. if (m_DisposeCalled) @@ -1057,7 +1077,16 @@ internal void StartOperationCommon(WebSocketHttpListenerDuplexStream currentStre // is not IntPtr.Zero, so we have to reset this field because we are reusing the Overlapped. // When using the IAsyncResult based approach of HttpListenerResponseStream the Overlapped is reinitialized // for each operation by the CLR when returned from the OverlappedDataCache. - NativeOverlapped.ReinitializeNativeOverlapped(); + + if (m_AllocateOverlappedOnDemand) + { + InitializeOverlapped(); + } + else + { + NativeOverlapped.ReinitializeNativeOverlapped(); + } + m_Exception = null; m_BytesTransferred = 0; } @@ -1099,7 +1128,7 @@ private unsafe void UpdateDataChunk() Contract.Assert(m_Buffer == null || m_BufferList == null, "Either 'm_Buffer' or 'm_BufferList' MUST be NULL."); Contract.Assert(m_ShouldCloseOutput || m_Buffer != null || m_BufferList != null, "Either 'm_Buffer' or 'm_BufferList' MUST NOT be NULL."); - + // The underlying byte[] m_Buffer or each m_BufferList[].Array are pinned already if (m_Buffer != null) { @@ -1137,7 +1166,7 @@ private unsafe void UpdateDataChunk(int index, byte[] buffer, int offset, int co } else { - m_DataChunks[index].pBuffer = + m_DataChunks[index].pBuffer = (byte*)m_WebSocket.InternalBuffer.ConvertPinnedSendPayloadToNative(buffer, offset, count); } @@ -1148,8 +1177,17 @@ private unsafe void UpdateDataChunk(int index, byte[] buffer, int offset, int co // Will also execute a Dispose deferred because I/O was in progress. internal void Complete() { - // Mark as not in-use - m_Operating = Free; + if (m_AllocateOverlappedOnDemand) + { + FreeOverlapped(false); + // Mark as not in-use + Interlocked.Exchange(ref m_Operating, Free); + } + else + { + // Mark as not in-use + m_Operating = Free; + } // Check for deferred Dispose(). // The deferred Dispose is not guaranteed if Dispose is called while an operation is in progress. @@ -1160,7 +1198,7 @@ internal void Complete() } } - // Method to update internal state after sync or async completion. + // Method to update internal state after [....] or async completion. private void SetResults(Exception exception, int bytesTransferred) { m_Exception = exception; @@ -1173,7 +1211,7 @@ internal void FinishOperationFailure(Exception exception, bool syncCompletion) if (WebSocketBase.LoggingEnabled) { - Logging.PrintError(Logging.WebSockets, m_CurrentStream, + Logging.PrintError(Logging.WebSockets, m_CurrentStream, m_CompletedOperation == HttpListenerAsyncOperation.Receive ? Methods.ReadAsyncFast : Methods.WriteAsyncFast, exception.ToString()); } @@ -1216,7 +1254,7 @@ internal void FinishOperationSuccess(int bytesTransferred, bool syncCompletion) { m_CurrentStream.m_OutputStream.SetClosedFlag(); } - + // Complete the operation and raise completion event. Complete(); OnCompleted(this); diff --git a/System/net/System/Net/WebUtility.cs b/System/net/System/Net/WebUtility.cs index 57731e3d2..5c11e3efa 100644 --- a/System/net/System/Net/WebUtility.cs +++ b/System/net/System/Net/WebUtility.cs @@ -330,7 +330,7 @@ private static UnicodeDecodingConformance HtmlDecodeConformance { catch { // DevDiv: 642025 // ASP.NET uses own ConfigurationManager which can throw in more situations than config errors (i.e. BadRequest) - // It's ok to swallow the exception here and continue using the default value + // It's ok to ---- the exception here and continue using the default value // Try to initialize again the next time return defaultDecodeConformance; } @@ -369,7 +369,7 @@ private static UnicodeEncodingConformance HtmlEncodeConformance { catch { // DevDiv: 642025 // ASP.NET uses own ConfigurationManager which can throw in more situations than config errors (i.e. BadRequest) - // It's ok to swallow the exception here and continue using the default value + // It's ok to ---- the exception here and continue using the default value // Try to initialize again the next time return defaultEncodeConformance; } diff --git a/System/net/System/Net/_AuthenticationState.cs b/System/net/System/Net/_AuthenticationState.cs index f019dd018..0c79291da 100644 --- a/System/net/System/Net/_AuthenticationState.cs +++ b/System/net/System/Net/_AuthenticationState.cs @@ -325,7 +325,7 @@ internal void ClearAuthReq(HttpWebRequest httpWebRequest) { internal void Update(HttpWebRequest httpWebRequest) { // // RAID#86753 - // Microsoft: this is just a fix for redirection & kerberos. + // [....]: this is just a fix for redirection & kerberos. // we need to close the Context and call ISC() again with the final // blob returned from the server. to do this in general // we would probably need to change the IAuthenticationMdule interface and diff --git a/System/net/System/Net/_AutoWebProxyScriptEngine.cs b/System/net/System/Net/_AutoWebProxyScriptEngine.cs index e2278a9eb..c37b50aa2 100644 --- a/System/net/System/Net/_AutoWebProxyScriptEngine.cs +++ b/System/net/System/Net/_AutoWebProxyScriptEngine.cs @@ -258,7 +258,7 @@ internal bool GetProxies(Uri destination, out IList proxyList, ref int s internal WebProxyData GetWebProxyData() { - // PS DevDiv + // PS DevDiv bug #217205 / TFS Dev10 #588370: use winhttp.WinhttpGetIEProxyConfigForCurrentUser WebProxyDataBuilder builder = null; if (ComNetOS.IsWin7orLater) diff --git a/System/net/System/Net/_AutoWebProxyScriptHelper.cs b/System/net/System/Net/_AutoWebProxyScriptHelper.cs index af1cbad4c..051e8fc93 100644 --- a/System/net/System/Net/_AutoWebProxyScriptHelper.cs +++ b/System/net/System/Net/_AutoWebProxyScriptHelper.cs @@ -413,7 +413,7 @@ public bool isInNet(string host, string pattern, string mask) { return true; } - // See + // See bug 87334 for details on the implementation. public bool shExpMatch(string host, string pattern) { GlobalLog.Print("WebProxyScriptHelper::shExpMatch() host:" + ValidationHelper.ToString(host) + " pattern:" + ValidationHelper.ToString(pattern)); if (host==null) { diff --git a/System/net/System/Net/_AutoWebProxyScriptWrapper.cs b/System/net/System/Net/_AutoWebProxyScriptWrapper.cs index eb2154db4..a111964b7 100644 --- a/System/net/System/Net/_AutoWebProxyScriptWrapper.cs +++ b/System/net/System/Net/_AutoWebProxyScriptWrapper.cs @@ -671,15 +671,15 @@ internal void Close() GC.SuppressFinalize(this); } - // - - - - - - - - + // Bug 434828 + // + // It's very hard to guarantee cleanup of an AppDomain. They aren't garbage collected, and Unload() is synchronous and + // can't be called from the finalizer thread. So we must have a finalizer that uses another thread, in this case the + // TimerThread, to unload the domain. + // + // A case this will come up is if the user replaces the DefaultWebProxy. The old one will be GC'd - there's no chance to + // clean it up properly. If the user wants to avoid the TimerThread being spun up for that purpose, they should save the + // existing DefaultWebProxy in a static before replacing it. ~AutoWebProxyScriptWrapper() { if (!NclUtilities.HasShutdownStarted && scriptDomain != null) diff --git a/System/net/System/Net/_ChunkParser.cs b/System/net/System/Net/_ChunkParser.cs index 47b3d4604..8b48cb8ca 100644 --- a/System/net/System/Net/_ChunkParser.cs +++ b/System/net/System/Net/_ChunkParser.cs @@ -12,7 +12,7 @@ namespace System.Net { - // This class is a helper for parsing chunked HTTP responses. Usage is to either call Read() (sync) or ReadAsync() + // This class is a helper for parsing chunked HTTP responses. Usage is to either call Read() ([....]) or ReadAsync() // (async) methods to retrieve the response payload (without chunk metadata). // The buffer passed to the .ctor is owned by the ChunkParser until the whole response is read (i.e. Read/ // ReadAsync return 0 bytes) or an error occurs. diff --git a/System/net/System/Net/_CommandStream.cs b/System/net/System/Net/_CommandStream.cs index b98c090f2..859f87646 100644 --- a/System/net/System/Net/_CommandStream.cs +++ b/System/net/System/Net/_CommandStream.cs @@ -271,7 +271,7 @@ private bool PostSendCommandProcessing(ref Stream stream) ** I don;t see how this code can be still relevant, remove it of no problems observed ** // - // This is a general race condition in Sync mode, if the server returns an error + // This is a general race condition in [....] mode, if the server returns an error // after we open the data connection, we will be off reading the data connection, // and not the control connection. The best we can do is try to poll, and in the // the worst case, we will timeout on establishing the data connection. @@ -300,7 +300,7 @@ private bool PostSendCommandProcessing(ref Stream stream) } catch { // If we get an exception on the QUIT command (which is // always the last command), ignore the final exception - // and continue with the pipeline regardlss of sync/async + // and continue with the pipeline regardlss of [....]/async if (index < 0 || index >= commands.Length || commands[index].Command != "QUIT\r\n") throw; @@ -423,7 +423,7 @@ protected virtual PipelineInstruction PipelineCallback(PipelineEntry entry, Resp // /// - /// Provides a wrapper for the async operations, so that the code can be shared with sync + /// Provides a wrapper for the async operations, so that the code can be shared with [....] /// private static void ReadCallback(IAsyncResult asyncResult) { ReceiveState state = (ReceiveState)asyncResult.AsyncState; @@ -502,7 +502,7 @@ protected virtual bool CheckValid(ResponseDescription response, ref int validThr } /// - /// Kicks off an asynchronous or sync request to receive a response from the server. + /// Kicks off an asynchronous or [....] request to receive a response from the server. /// Uses the Encoding encoding to transform the bytes received into a string to be /// returned in the GeneralResponseDescription's StatusDescription field. /// diff --git a/System/net/System/Net/_ConnectStream.cs b/System/net/System/Net/_ConnectStream.cs index 8ecd19cc4..0b06f9343 100644 --- a/System/net/System/Net/_ConnectStream.cs +++ b/System/net/System/Net/_ConnectStream.cs @@ -101,7 +101,7 @@ private ScatterGatherBuffers private const string responseDrainTimeoutAppSetting = "responseDrainTimeout"; // - // Timeout - timeout in ms for sync reads & writes, passed in HttpWebRequest + // Timeout - timeout in ms for [....] reads & writes, passed in HttpWebRequest // public override bool CanTimeout { @@ -430,7 +430,7 @@ internal void ProcessWriteCallDone(ConnectionReturnResult returnResult) if (returnResult == null) { m_Connection.WriteStartNextRequest(m_Request, ref returnResult); - // If the request is Sync, then we do our Read here for data + // If the request is [....], then we do our Read here for data if (!m_Request.Async) { object syncReaderResult = m_Request.ConnectionReaderAsyncResult.InternalWaitForCompletion(); @@ -439,7 +439,7 @@ internal void ProcessWriteCallDone(ConnectionReturnResult returnResult) //via poll when we handed back the request stream if (syncReaderResult == null && m_Request.NeedsToReadForResponse) #if DEBUG - // Remove once mixed sync/async requests are supported. + // Remove once mixed [....]/async requests are supported. using (GlobalLog.SetThreadKind(ThreadKinds.Sync)) #endif { @@ -891,7 +891,7 @@ public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, Asy } // - // Handles either async or sync Writing for *public* stream API + // Handles either async or [....] Writing for *public* stream API // private IAsyncResult InternalWrite(bool async, byte[] buffer, int offset, int size, AsyncCallback callback, object state ) { // @@ -952,7 +952,7 @@ private IAsyncResult InternalWrite(bool async, byte[] buffer, int offset, int si m_BytesLeftToWrite -= size; } - GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() ----ing: size==0 || BufferOnly || IgnoreSocketErrors= " + (size==0) + BufferOnly + IgnoreSocketErrors); + GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() swallowing: size==0 || BufferOnly || IgnoreSocketErrors= " + (size==0) + BufferOnly + IgnoreSocketErrors); if (async) { asyncResult = new LazyAsyncResult(this, state, callback); completeSync = true; @@ -1006,7 +1006,7 @@ private IAsyncResult InternalWrite(bool async, byte[] buffer, int offset, int si // IgnoreSocketErrors can be set at any time - need to check it again. if (IgnoreSocketErrors && !NclUtilities.IsFatal(exception)) { - GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() ----ing: IgnoreSocketErrors set after throw."); + GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() swallowing: IgnoreSocketErrors set after throw."); if (async) { completeSync = true; @@ -1109,7 +1109,7 @@ private IAsyncResult InternalWrite(bool async, byte[] buffer, int offset, int si // IgnoreSocketErrors can be set at any time - need to check it again. if (IgnoreSocketErrors && !NclUtilities.IsFatal(exception)) { - GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() ----ing: IgnoreSocketErrors set after throw."); + GlobalLog.Print("ConnectStream#" + ValidationHelper.HashString(this) + "::InternalWrite() swallowing: IgnoreSocketErrors set after throw."); if (async) { completeSync = true; @@ -1577,7 +1577,7 @@ private int ReadWithoutValidation([In, Out] byte[] buffer, int offset, int size, GlobalLog.Print("m_ReadBytes = "+m_ReadBytes); if (m_ReadBytes < 0) - throw new InternalException(); // + throw new InternalException(); // TODO consider changing on Assert or a user exception when stress gets stable-stable } @@ -2596,7 +2596,7 @@ private void CloseInternal(bool internalCall, bool aborting) { SafeSetSocketTimeout(SocketShutdown.Send); #if DEBUG - // Until there is an async version of this, we have to assert Sync privileges here. + // Until there is an async version of this, we have to assert [....] privileges here. using (GlobalLog.SetThreadKind(ThreadKinds.Sync)) { #endif m_Connection.Write(NclConstants.ChunkTerminator, 0, NclConstants.ChunkTerminator.Length); diff --git a/System/net/System/Net/_Connection.cs b/System/net/System/Net/_Connection.cs index 7b32af35d..b3e49c940 100644 --- a/System/net/System/Net/_Connection.cs +++ b/System/net/System/Net/_Connection.cs @@ -702,7 +702,7 @@ internal bool SubmitRequest(HttpWebRequest request, bool forcedsubmit) if (startRequestResult != TriState.Unspecified) { CompleteStartRequest(true, request, startRequestResult); } - // On Sync, we wait for the Connection to be come availble here, + // On [....], we wait for the Connection to be come availble here, if (!request.Async) { object responseObject = request.ConnectionAsyncResult.InternalWaitForCompletion(); @@ -912,7 +912,7 @@ private void CompleteStartRequest(bool onSubmitThread, HttpWebRequest request, T // // From now on the request.SetRequestSubmitDone must be called or it may hang - // For a sync request the write side reponse windowwas opened in HttpWebRequest.SubmitRequest + // For a [....] request the write side reponse windowwas opened in HttpWebRequest.SubmitRequest if (request.Async) request.OpenWriteSideResponseWindow(); @@ -1078,7 +1078,7 @@ private void CompleteConnection(bool async, HttpWebRequest request) WebExceptionStatus ws = WebExceptionStatus.ConnectFailure; // // From now on the request.SetRequestSubmitDone must be called or it may hang - // For a sync request the write side reponse windowwas opened in HttpWebRequest.SubmitRequest + // For a [....] request the write side reponse windowwas opened in HttpWebRequest.SubmitRequest if (request.Async) request.OpenWriteSideResponseWindow(); @@ -1372,7 +1372,7 @@ internal void ReadStartNextRequest(WebRequest currentRequest, ref ConnectionRetu if (nextRequest != null ) { // We cannot have HeadersCompleted on the request that was not placed yet on the write list - if(nextRequest.HeadersCompleted) // + if(nextRequest.HeadersCompleted) // TODO: change to be Assert but only when stress got stable-stable throw new InternalException(); // This codepath doesn't handle the case where the server has closed the @@ -2124,7 +2124,7 @@ private long ProcessHeaderData(ref bool fHaveChunked, HttpWebRequest request, ou // IIS6 does not close the connection on 403 so all subsequent requests will fail to be authorized on THAT connection. //----------------------------------------------------------------------------------------------- //5/15/2006 - //Microsoft + //[....] //The DTS Issue 595216 claims that we are unnecessarily closing the //connection on 403 - even if it is a non SSL request. It seems //that the original intention is to close the request for SSL requests @@ -2153,7 +2153,7 @@ private long ProcessHeaderData(ref bool fHaveChunked, HttpWebRequest request, ou else { //QFE: 4599. - //Author: Microsoft + //Author: [....] //in v2.0, in case of SSL Requests through proxy that require NTLM authentication, //we are not honoring the Proxy-Connection: Keep-Alive header and //closing the connection. @@ -2928,7 +2928,7 @@ private void PrepareCloseConnectionSocket(ref ConnectionReturnResult returnResul { if (m_Error == WebExceptionStatus.Success) { - throw new InternalException(); // + throw new InternalException(); // TODO: replace it with a generic error for the product bits //m_Error = WebExceptionStatus.UnknownError; } @@ -3163,7 +3163,7 @@ internal void PollAndRead(HttpWebRequest request, bool userRetrievedStream) { } } // - // Peforms a Sync Read and calls the ReadComplete to process the result + // Peforms a [....] Read and calls the ReadComplete to process the result // The reads are done iteratively, until the Request has received enough // data to contruct a response, or a 100-Continue is read, allowing the HttpWebRequest // to return a write stream @@ -3272,7 +3272,7 @@ internal void SyncRead(HttpWebRequest request, bool userRetrievedStream, bool pr if (probeRead) { - // Sync 100-Continue wait only + // [....] 100-Continue wait only request.FinishContinueWait(); if (pollSuccess) { @@ -3468,7 +3468,7 @@ private bool ReadComplete(int bytesRead, WebExceptionStatus errorStatus) } // // Any exception is processed by HandleError() and ----ed to avoid throwing on a thread pool - // In the sync case the HandleError() will abort the request so the caller will pick up the result. + // In the [....] case the HandleError() will abort the request so the caller will pick up the result. // catch (Exception exception) { if (NclUtilities.IsFatal(exception)) throw; diff --git a/System/net/System/Net/_ContextAwareResult.cs b/System/net/System/Net/_ContextAwareResult.cs index b94e26e43..c5c5dc428 100644 --- a/System/net/System/Net/_ContextAwareResult.cs +++ b/System/net/System/Net/_ContextAwareResult.cs @@ -359,7 +359,7 @@ protected override void Cleanup() // to avoid flowing context. Even if the operation completes before this call, the callback won't have been // called. // - // Returns whether the operation completed sync or not. + // Returns whether the operation completed [....] or not. // private bool CaptureOrComplete(ref ExecutionContext cachedContext, bool returnContext) { diff --git a/System/net/System/Net/_DigestClient.cs b/System/net/System/Net/_DigestClient.cs index ae4d78026..04cf4ffdf 100644 --- a/System/net/System/Net/_DigestClient.cs +++ b/System/net/System/Net/_DigestClient.cs @@ -28,7 +28,7 @@ internal class DigestClient : ISessionAuthenticationModule { private static PrefixLookup challengeCache = new PrefixLookup(); private static readonly char[] singleSpaceArray = new char[]{' '}; - // Microsoft: make sure WDigest fixes these bugs before we + // [....]: make sure WDigest fixes these bugs before we // enable this code ("Windows OS" Product Studio database): // // 921024 1 Wdigest should support MD5, at least for explicit (non-default) credentials. diff --git a/System/net/System/Net/_HTTPDateParse.cs b/System/net/System/Net/_HTTPDateParse.cs index 425f24222..666ccf9a3 100644 --- a/System/net/System/Net/_HTTPDateParse.cs +++ b/System/net/System/Net/_HTTPDateParse.cs @@ -42,7 +42,7 @@ internal static class HttpDateParse { private const int DATE_TOKEN_JANUARY = 1; private const int DATE_TOKEN_FEBRUARY = 2; - private const int DATE_TOKEN_Microsoft = 3; + private const int DATE_TOKEN_MARCH = 3; private const int DATE_TOKEN_APRIL = 4; private const int DATE_TOKEN_MAY = 5; private const int DATE_TOKEN_JUNE = 6; @@ -148,7 +148,7 @@ int index case 'A': switch (MAKE_UPPER(lpszDay[index+2])) { case 'R': - return DATE_TOKEN_Microsoft; + return DATE_TOKEN_MARCH; case 'Y': return DATE_TOKEN_MAY; } diff --git a/System/net/System/Net/_LazyAsyncResult.cs b/System/net/System/Net/_LazyAsyncResult.cs index 17bd85e03..bbf9ab822 100644 --- a/System/net/System/Net/_LazyAsyncResult.cs +++ b/System/net/System/Net/_LazyAsyncResult.cs @@ -18,7 +18,7 @@ internal class LazyAsyncResult : IAsyncResult private const int c_ForceAsyncCount = 50; #if !NET_PERF - // This is to avoid user mistakes when they queue another async op from a callback the completes sync. + // This is to avoid user mistakes when they queue another async op from a callback the completes [....]. [ThreadStatic] private static ThreadContext t_ThreadContext; diff --git a/System/net/System/Net/_ListenerResponseStream.cs b/System/net/System/Net/_ListenerResponseStream.cs index db4ba258c..61c5adc6f 100644 --- a/System/net/System/Net/_ListenerResponseStream.cs +++ b/System/net/System/Net/_ListenerResponseStream.cs @@ -463,7 +463,7 @@ internal void SwitchToOpaqueMode() } // The final Content-Length async write can only be cancelled by CancelIoEx. - // Sync can only be cancelled by CancelSynchronousIo, but we don't attempt this right now. + // [....] can only be cancelled by CancelSynchronousIo, but we don't attempt this right now. [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", Justification = "It is safe to ignore the return value on a cancel operation because the connection is being closed")] internal void CancelLastWrite(CriticalHandle requestQueueHandle) diff --git a/System/net/System/Net/_SafeNetHandles.cs b/System/net/System/Net/_SafeNetHandles.cs index 1b5dc0258..2a7463906 100644 --- a/System/net/System/Net/_SafeNetHandles.cs +++ b/System/net/System/Net/_SafeNetHandles.cs @@ -781,6 +781,12 @@ public unsafe static SafeLoadLibrary LoadLibraryEx(string library) { return result; } + public unsafe bool HasFunction(string functionName) + { + IntPtr ret = UnsafeNclNativeMethods.GetProcAddress(this, functionName); + return (ret != IntPtr.Zero); + } + protected override bool ReleaseHandle() { return UnsafeNclNativeMethods.SafeNetHandles.FreeLibrary(handle); } diff --git a/System/net/System/Net/_SecureChannel.cs b/System/net/System/Net/_SecureChannel.cs index 39e94ae58..0879e4f52 100644 --- a/System/net/System/Net/_SecureChannel.cs +++ b/System/net/System/Net/_SecureChannel.cs @@ -464,16 +464,17 @@ private string[] GetIssuers() uint count = issuerList.cIssuers; issuers = new string[issuerList.cIssuers]; _CERT_CHAIN_ELEMENT* pIL = (_CERT_CHAIN_ELEMENT*)issuerList.aIssuers.DangerousGetHandle(); - for (int i =0; icbSize; byte* ptr = (byte*)(pIL2->pCertContext); byte[] x = new byte[size]; - for (int j=0; j 1) { - // It was a real sync handshake (now completed) and another IO came in. + // It was a real [....] handshake (now completed) and another IO came in. // It's now waiting on us so resume. ThreadPool.QueueUserWorkItem(new WaitCallback(StartWakeupPendingIO), null); } @@ -496,7 +496,7 @@ internal bool ProcessAuthentication(LazyAsyncResult result) } else if (isSyncCall) { - GlobalLog.Assert(result != null, "TlsStream::ProcessAuthentication() this is a Sync call and it did not started the handshake hence null result must be wrapped into LazyAsyncResult"); + GlobalLog.Assert(result != null, "TlsStream::ProcessAuthentication() this is a [....] call and it did not started the handshake hence null result must be wrapped into LazyAsyncResult"); Exception e = result.InternalWaitForCompletion() as Exception; if (e != null) throw e; @@ -516,7 +516,7 @@ internal bool ProcessAuthentication(LazyAsyncResult result) } // Here in the async case a user IO has been queued (and may be already completed) - // For sync case it does not matter since the caller will resume IO upon return + // For [....] case it does not matter since the caller will resume IO upon return return true; } // @@ -581,7 +581,7 @@ private void WakeupPendingIO(IAsyncResult ar) } else { - //resume sync IO waiting on other thread or signal waiting async handshake result. + //resume [....] IO waiting on other thread or signal waiting async handshake result. try { lazyResult.InvokeCallback(exception); } diff --git a/System/net/System/Net/_TimerThread.cs b/System/net/System/Net/_TimerThread.cs index 2d11591eb..059e88d5b 100644 --- a/System/net/System/Net/_TimerThread.cs +++ b/System/net/System/Net/_TimerThread.cs @@ -13,7 +13,7 @@ namespace System.Net { using System.Runtime.InteropServices; /// - /// Acts as countdown timer, used to measure elapsed time over a sync operation. + /// Acts as countdown timer, used to measure elapsed time over a [....] operation. /// internal static class TimerThread { /// diff --git a/System/net/System/Net/mail/MailHeaderInfo.cs b/System/net/System/Net/mail/MailHeaderInfo.cs index eabb5954e..cde8b0b45 100644 --- a/System/net/System/Net/mail/MailHeaderInfo.cs +++ b/System/net/System/Net/mail/MailHeaderInfo.cs @@ -67,7 +67,7 @@ public HeaderInfo(MailHeaderID id, string name, bool isSingleton, bool isUserSet // Table of well-known mail headers. - // Keep the initializers in sync with the enum above. + // Keep the initializers in [....] with the enum above. private static readonly HeaderInfo[] m_HeaderInfo = { // ID NormalizedString IsSingleton IsUserSettable AllowsUnicode new HeaderInfo(MailHeaderID.Bcc, "Bcc", true, false, true), @@ -110,10 +110,10 @@ public HeaderInfo(MailHeaderID id, string name, bool isSingleton, bool isUserSet static MailHeaderInfo() { #if DEBUG - // Check that enum and header info array are in sync + // Check that enum and header info array are in [....] for(int i = 0; i < m_HeaderInfo.Length; i++) { if((int)m_HeaderInfo[i].ID != i) { - throw new Exception("Header info data structures are not in sync"); + throw new Exception("Header info data structures are not in [....]"); } } #endif diff --git a/System/net/System/Net/mail/SmtpClient.cs b/System/net/System/Net/mail/SmtpClient.cs index d1632685a..38ccf0a7f 100644 --- a/System/net/System/Net/mail/SmtpClient.cs +++ b/System/net/System/Net/mail/SmtpClient.cs @@ -872,7 +872,7 @@ void SendMailCallback(IAsyncResult result) { try { writer = transport.EndSendMail(result); // If some recipients failed but not others, send the e-mail anyways, but then return the - // "Non-fatal" exception reporting the failures. The sync code path does it this way. + // "Non-fatal" exception reporting the failures. The [....] code path does it this way. // Fatal exceptions would have thrown above at transport.EndSendMail(...) SendMailAsyncResult sendResult = (SendMailAsyncResult)result; // Save these and throw them later in SendMessageCallback, after the message has sent. diff --git a/System/net/System/Net/mail/SmtpTransport.cs b/System/net/System/Net/mail/SmtpTransport.cs index a6333e70e..99c36b866 100644 --- a/System/net/System/Net/mail/SmtpTransport.cs +++ b/System/net/System/Net/mail/SmtpTransport.cs @@ -235,7 +235,7 @@ internal IAsyncResult BeginGetConnection(ServicePoint servicePoint, ContextAware catch(Exception innerException){ throw new SmtpException(SR.GetString(SR.MailHostNotFound), innerException); } - GlobalLog.Leave("SmtpTransport#" + ValidationHelper.HashString(this) + "::BeginConnect Sync Completion"); + GlobalLog.Leave("SmtpTransport#" + ValidationHelper.HashString(this) + "::BeginConnect [....] Completion"); return result; } diff --git a/System/net/System/Net/mail/smtpconnection.cs b/System/net/System/Net/mail/smtpconnection.cs index ff9bddc77..a553312e2 100644 --- a/System/net/System/Net/mail/smtpconnection.cs +++ b/System/net/System/Net/mail/smtpconnection.cs @@ -417,7 +417,7 @@ internal void GetConnection(ServicePoint servicePoint) for (int i = 0; i < authenticationModules.Length; i++) { - //only authenticate if the auth protocol is supported - Microsoft + //only authenticate if the auth protocol is supported - [....] if (!AuthSupported(authenticationModules[i])) { continue; } @@ -650,7 +650,7 @@ internal static void End(IAsyncResult result) internal void GetConnection(bool synchronous) { - GlobalLog.Enter("ConnectAndHandshakeAsyncResult#" + ValidationHelper.HashString(this) + "::Connect: sync=" + (synchronous ? "true" : "false")); + GlobalLog.Enter("ConnectAndHandshakeAsyncResult#" + ValidationHelper.HashString(this) + "::Connect: [....]=" + (synchronous ? "true" : "false")); if (connection.isConnected) { throw new InvalidOperationException(SR.GetString(SR.SmtpAlreadyConnected)); diff --git a/System/net/System/URI.cs b/System/net/System/URI.cs index 76a5f3330..4e565d324 100644 --- a/System/net/System/URI.cs +++ b/System/net/System/URI.cs @@ -2057,7 +2057,7 @@ private unsafe ParsingError PrivateParseMinimal() ++length; } - // Microsoft codereview: + // [....] codereview: // Old Uri parser tries to figure out on a DosPath in all cases. // Hence http://c:/ is treated as as DosPath without the host while it should be a host "c", port 80 // @@ -2376,7 +2376,7 @@ private unsafe void CreateUriInfo(Flags cF) { // Note we already checked on general port syntax in ParseMinimal() // If iri parsing is on with unicode chars then the end of parsed host - // points to m_orig string and not m_String + // points to m_[....] string and not m_String bool UseOrigUnicodeStrOffset = ((cF& Flags.UseOrigUncdStrOffset) != 0); // This should happen only once. Reset it @@ -2555,7 +2555,7 @@ private static string CreateHostStringHelper(string str, ushort idx, ushort end, break; case Flags.IPv6HostType: - //Microsoft codereview + //[....] codereview // The helper will return [...] string that is not suited for Dns.Resolve() host = IPv6AddressHelper.ParseCanonicalName(str, idx, ref loopback, ref scopeId); break; @@ -2593,7 +2593,7 @@ private static string CreateHostStringHelper(string str, ushort idx, ushort end, host = string.Empty; break; - default: //it's a + default: //it's a bug throw GetException(ParsingError.BadHostName); } @@ -2698,7 +2698,7 @@ internal string GetParts(UriComponents uriParts, UriFormat formatAs) // private string GetEscapedParts(UriComponents uriParts) { // Which Uri parts are not escaped canonically ? - // Notice that public UriPart and private Flags must me in Sync so below code can work + // Notice that public UriPart and private Flags must me in [....] so below code can work // ushort nonCanonical = (ushort)(((ushort)m_Flags & ((ushort)Flags.CannotDisplayCanonical<<7)) >> 6); if (InFact(Flags.SchemeNotCanonical)) { @@ -2728,7 +2728,7 @@ private string GetEscapedParts(UriComponents uriParts) { private string GetUnescapedParts(UriComponents uriParts, UriFormat formatAs) { // Which Uri parts are not escaped canonically ? - // Notice that public UriComponents and private Uri.Flags must me in Sync so below code can work + // Notice that public UriComponents and private Uri.Flags must me in [....] so below code can work // ushort nonCanonical = (ushort)((ushort)m_Flags & (ushort)Flags.CannotDisplayCanonical); @@ -3269,7 +3269,7 @@ private unsafe void ParseRemaining() { cF |= Flags.SchemeNotCanonical; } // For an authority Uri only // after the scheme would be canonical - // (compatibility + // (compatibility bug http:\\host) if (((m_Flags & Flags.AuthorityFound) != 0) && (idx + i + 3 >= length || str[idx + i + 1] != '/' || str[idx + i + 2] != '/')) { @@ -3309,7 +3309,7 @@ private unsafe void ParseRemaining() { // Parsing the Path if any // - // For iri parsing if we found unicode the idx has offset into m_orig string.. + // For iri parsing if we found unicode the idx has offset into m_[....] string.. // so restart parsing from there and make m_Info.Offset.Path as m_string.length idx = m_Info.Offset.Path; @@ -4145,8 +4145,8 @@ private unsafe ushort CheckAuthorityHelper( char* pString, ushort idx, ushort le { //No user info for a Basic hostname flags &= ~Flags.HasUserInfo; - // Some schemes do not allow HostType = Basic (plus V1 almost never understands this cause of a - + // Some schemes do not allow HostType = Basic (plus V1 almost never understands this cause of a bug) + // if(syntax.InFact(UriSyntaxFlags.AllowAnyOtherHost)) { flags |= Flags.BasicHostType; @@ -4192,7 +4192,7 @@ private unsafe ushort CheckAuthorityHelper( char* pString, ushort idx, ushort le if (iriParsing && hasUnicode && StaticNotAny(flags, Flags.HostUnicodeNormalized)){ // Normalize any other host - String user = new string(pString, startOtherHost, startOtherHost - end); + String user = new string(pString, startOtherHost, end - startOtherHost); try { newHost += user.Normalize(NormalizationForm.FormC); @@ -4546,8 +4546,8 @@ private unsafe char[] GetCanonicalPath(char[] dest, ref int pos, UriFormat forma int dosPathIdx = SecuredPathIndex; // Note that unescaping and then escapig back is not transitive hence not safe. - // We are vulnerable due to the way the UserEscaped flag is processed (see NDPWhidbey#10612 - + // We are vulnerable due to the way the UserEscaped flag is processed (see NDPWhidbey#10612 bug). + // Try to unescape only needed chars. if (formatAs == UriFormat.UriEscaped) { if (InFact(Flags.ShouldBeCompressed)) @@ -5287,7 +5287,7 @@ public string MakeRelative(Uri toUri) [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual void Parse() { - // Microsoft cr: In V1-Everett this method if suppressed by the derived class + // [....] cr: In V1-Everett this method if suppressed by the derived class // would lead to an unconstructed Uri instance. // It does not make any sense and violates Fxcop on calling a virtual method in the ctor. // Should be deprecated and removed asap. @@ -5296,7 +5296,7 @@ protected virtual void Parse() [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual void Canonicalize() { - // Microsoft cr: In V1-Everett this method if suppressed by the derived class + // [....] cr: In V1-Everett this method if suppressed by the derived class // would lead to supressing of a path compression // It does not make much sense and violates Fxcop on calling a virtual method in the ctor. // Should be deprecated and removed asap. @@ -5305,7 +5305,7 @@ protected virtual void Canonicalize() [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual void Escape() { - // Microsoft cr: In V1-Everett this method if suppressed by the derived class + // [....] cr: In V1-Everett this method if suppressed by the derived class // would lead to the same effect as dontEscape=true. // It does not make much sense and violates Fxcop on calling a virtual method in the ctor. // Should be deprecated and removed asap. @@ -5321,7 +5321,7 @@ protected virtual void Escape() [Obsolete("The method has been deprecated. Please use GetComponents() or static UnescapeDataString() to unescape a Uri component or a string. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual string Unescape(string path) { - // Microsoft cr: This method is dangerous since it gives path unescaping control + // [....] cr: This method is dangerous since it gives path unescaping control // to the derived class without any permission demand. // Should be deprecated and removed asap. @@ -5335,7 +5335,7 @@ protected virtual string Unescape(string path) { [Obsolete("The method has been deprecated. Please use GetComponents() or static EscapeUriString() to escape a Uri component or a string. http://go.microsoft.com/fwlink/?linkid=14202")] protected static string EscapeString(string str) { - // Microsoft cr: This method just does not make sense sa protected + // [....] cr: This method just does not make sense sa protected // It should go public static asap if ((object)str == null) { @@ -5358,7 +5358,7 @@ protected static string EscapeString(string str) { [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual void CheckSecurity() { - // Microsoft cr: This method just does not make sense + // [....] cr: This method just does not make sense // Should be deprecated and removed asap. if (Scheme == "telnet") { @@ -5382,7 +5382,7 @@ protected virtual void CheckSecurity() { [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual bool IsReservedCharacter(char character) { - // Microsoft cr: This method just does not make sense as virtual protected + // [....] cr: This method just does not make sense as virtual protected // It should go public static asap return (character == ';') @@ -5410,7 +5410,7 @@ protected virtual bool IsReservedCharacter(char character) { [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected static bool IsExcludedCharacter(char character) { - // Microsoft cr: This method just does not make sense sa protected + // [....] cr: This method just does not make sense sa protected // It should go public static asap // @@ -5453,7 +5453,7 @@ protected static bool IsExcludedCharacter(char character) { [Obsolete("The method has been deprecated. It is not used by the system. http://go.microsoft.com/fwlink/?linkid=14202")] protected virtual bool IsBadFileSystemCharacter(char character) { - // Microsoft cr: This method just does not make sense sa protected virtual + // [....] cr: This method just does not make sense sa protected virtual // It should go public static asap return (character < 0x20) diff --git a/System/net/System/_UriSyntax.cs b/System/net/System/_UriSyntax.cs index d0b35ecf6..fc878fbdd 100644 --- a/System/net/System/_UriSyntax.cs +++ b/System/net/System/_UriSyntax.cs @@ -422,8 +422,8 @@ internal bool InternalIsWellFormedOriginalString(Uri thisUri) UriSyntaxFlags.AllowEmptyHost | UriSyntaxFlags.AllowUncHost | // UriSyntaxFlags.AllowAnInternetHost | - // UriSyntaxFlags.AllowAnyOtherHost | // V1.1 has a - + // UriSyntaxFlags.AllowAnyOtherHost | // V1.1 has a bug and so does not support this case + // UriSyntaxFlags.PathIsRooted | UriSyntaxFlags.AllowDOSPath | // UriSyntaxFlags.ConvertPathSlashes | // V1 compat, it will always convert backslashes diff --git a/System/regex/system/text/regularexpressions/Regex.cs b/System/regex/system/text/regularexpressions/Regex.cs index a91adaa0f..59c93a47a 100644 --- a/System/regex/system/text/regularexpressions/Regex.cs +++ b/System/regex/system/text/regularexpressions/Regex.cs @@ -436,7 +436,7 @@ public static String Escape(String str) { /// Unescapes any escaped characters in the input string. /// /// - [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="Unescape", Justification="Microsoft: already shipped since v1 - can't fix without causing a breaking change")] + [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="Unescape", Justification="[....]: already shipped since v1 - can't fix without causing a breaking change")] public static String Unescape(String str) { if (str==null) throw new ArgumentNullException("str"); @@ -1189,7 +1189,7 @@ public String[] Split(String input, int count, int startat) { [HostProtection(MayLeakOnAbort=true)] [ResourceExposure(ResourceScope.Machine)] // The AssemblyName is interesting. [ResourceConsumption(ResourceScope.Machine)] - [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="Microsoft: already shipped since v1 - can't fix without causing a breaking change")] + [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="[....]: already shipped since v1 - can't fix without causing a breaking change")] public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname) { CompileToAssemblyInternal(regexinfos, assemblyname, null, null); @@ -1200,7 +1200,7 @@ public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, Assembly [HostProtection(MayLeakOnAbort=true)] [ResourceExposure(ResourceScope.Machine)] // The AssemblyName is interesting. [ResourceConsumption(ResourceScope.Machine)] - [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="Microsoft: already shipped since v1 - can't fix without causing a breaking change")] + [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="[....]: already shipped since v1 - can't fix without causing a breaking change")] public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes) { CompileToAssemblyInternal(regexinfos, assemblyname, attributes, null); } @@ -1208,7 +1208,7 @@ public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, Assembly [HostProtection(MayLeakOnAbort=true)] [ResourceExposure(ResourceScope.Machine)] [ResourceConsumption(ResourceScope.Machine)] - [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="Microsoft: already shipped since v1 - can't fix without causing a breaking change")] + [SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId="assemblyname", Justification="[....]: already shipped since v1 - can't fix without causing a breaking change")] public static void CompileToAssembly(RegexCompilationInfo[] regexinfos, AssemblyName assemblyname, CustomAttributeBuilder[] attributes, String resourceFile) { CompileToAssemblyInternal(regexinfos, assemblyname, attributes, resourceFile); } diff --git a/System/regex/system/text/regularexpressions/RegexCompiler.cs b/System/regex/system/text/regularexpressions/RegexCompiler.cs index d987a1181..20be01664 100644 --- a/System/regex/system/text/regularexpressions/RegexCompiler.cs +++ b/System/regex/system/text/regularexpressions/RegexCompiler.cs @@ -208,7 +208,7 @@ internal static RegexRunnerFactory Compile(RegexCode code, RegexOptions options) */ [ResourceExposure(ResourceScope.Machine)] [ResourceConsumption(ResourceScope.Machine)] - [SuppressMessage("Microsoft.Security","CA2106:SecureAsserts", Justification="Microsoft: SECREVIEW : Regex only generates string manipulation, so this is OK")] + [SuppressMessage("Microsoft.Security","CA2106:SecureAsserts", Justification="[....]: SECREVIEW : Regex only generates string manipulation, so this is OK")] internal static void CompileToAssembly(RegexCompilationInfo[] regexes, AssemblyName an, CustomAttributeBuilder[] attribs, String resourceFile) { RegexTypeCompiler c = new RegexTypeCompiler(an, attribs, resourceFile); @@ -3024,7 +3024,7 @@ internal class RegexTypeCompiler : RegexCompiler { [ResourceExposure(ResourceScope.Machine)] [ResourceConsumption(ResourceScope.Machine)] - [SuppressMessage("Microsoft.Security","CA2106:SecureAsserts", Justification="Microsoft: SECREVIEW : Regex only generates string manipulation, so this is OK")] + [SuppressMessage("Microsoft.Security","CA2106:SecureAsserts", Justification="[....]: SECREVIEW : Regex only generates string manipulation, so this is OK")] internal RegexTypeCompiler(AssemblyName an, CustomAttributeBuilder[] attribs, String resourceFile) { // SECREVIEW : Regex only generates string manipulation, so this is // : ok. diff --git a/System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs b/System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs new file mode 100644 index 000000000..c58653bcc --- /dev/null +++ b/System/security/system/security/Authentication/ExtendedProtection/TokenBinding.cs @@ -0,0 +1,37 @@ +//------------------------------------------------------------------------------ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// +//------------------------------------------------------------------------------ + +namespace System.Security.Authentication.ExtendedProtection +{ + + public enum TokenBindingType + { + Provided = 0, + Referred = 1 + }; + + public class TokenBinding + { + internal TokenBinding(TokenBindingType bindingType, byte[] rawData) + { + BindingType = bindingType; + _rawTokenBindingId = rawData; + } + + private byte[] _rawTokenBindingId = null; + + public byte[] GetRawTokenBindingId() + { + return (_rawTokenBindingId != null) ? (byte[])_rawTokenBindingId.Clone() : null; + } + + public TokenBindingType BindingType + { + get; + private set; + } + } +} diff --git a/System/security/system/security/cryptography/cryptoapi.cs b/System/security/system/security/cryptography/cryptoapi.cs index 82a6a9518..45e47aac1 100644 --- a/System/security/system/security/cryptography/cryptoapi.cs +++ b/System/security/system/security/cryptography/cryptoapi.cs @@ -488,6 +488,9 @@ internal abstract class CAPIBase { internal const uint CERT_TRUST_IS_OFFLINE_REVOCATION = 0x01000000; internal const uint CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY = 0x02000000; + internal const uint CERT_TRUST_IS_EXPLICIT_DISTRUST = 0x04000000; + internal const uint CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT = 0x08000000; + internal const uint CERT_TRUST_HAS_WEAK_SIGNATURE = 0x00100000; // These can be applied to chains only internal const uint CERT_TRUST_IS_PARTIAL_CHAIN = 0x00010000; @@ -997,12 +1000,15 @@ internal abstract class CAPIBase { internal const int CRYPT_E_REVOCATION_OFFLINE = unchecked((int) 0x80092013); // The revocation function was unable to check revocation // because the revocation server was offline. internal const int CRYPT_E_ASN1_BADTAG = unchecked((int) 0x8009310B); // ASN1 bad tag value met. + internal const int CERTSRV_E_WEAK_SIGNATURE_OR_KEY = unchecked((int) 0x80094016); // A signature algorithm or public key length does not meet the system's + // minimum required strength. internal const int TRUST_E_CERT_SIGNATURE = unchecked((int) 0x80096004); // The signature of the certificate can not be verified. internal const int TRUST_E_BASIC_CONSTRAINTS = unchecked((int) 0x80096019); // A certificate's basic constraint extension has not been observed. internal const int CERT_E_EXPIRED = unchecked((int) 0x800B0101); // A required certificate is not within its validity period when verifying against // the current system clock or the timestamp in the signed file. internal const int CERT_E_VALIDITYPERIODNESTING = unchecked((int) 0x800B0102); // The validity periods of the certification chain do not nest correctly. + internal const int CERT_E_CRITICAL = unchecked((int) 0x800B0105); // A certificate contains an unknown extension that is marked 'critical'. internal const int CERT_E_UNTRUSTEDROOT = unchecked((int) 0x800B0109); // A certificate chain processed, but terminated in a root // certificate which is not trusted by the trust provider. internal const int CERT_E_CHAINING = unchecked((int) 0x800B010A); // An internal certificate chaining error has occurred. @@ -1012,6 +1018,7 @@ internal abstract class CAPIBase { // is not trusted with the current policy settings. internal const int CERT_E_REVOCATION_FAILURE = unchecked((int) 0x800B010E); // The revocation process could not continue - the certificate(s) could not be checked. internal const int CERT_E_WRONG_USAGE = unchecked((int) 0x800B0110); // The certificate is not valid for the requested usage. + internal const int TRUST_E_EXPLICIT_DISTRUST = unchecked((int) 0x800B0111); // The certificate was explicitly marked as untrusted by the user. internal const int CERT_E_INVALID_POLICY = unchecked((int) 0x800B0113); // The certificate has invalid policy. internal const int CERT_E_INVALID_NAME = unchecked((int) 0x800B0114); // The certificate has an invalid name. The name is not included // in the permitted list or is explicitly excluded. diff --git a/System/security/system/security/cryptography/x509/x509chain.cs b/System/security/system/security/cryptography/x509/x509chain.cs index e2c943902..beb480dc9 100644 --- a/System/security/system/security/cryptography/x509/x509chain.cs +++ b/System/security/system/security/cryptography/x509/x509chain.cs @@ -45,7 +45,10 @@ public enum X509ChainStatusFlags { CtlNotSignatureValid = 0x00040000, CtlNotValidForUsage = 0x00080000, OfflineRevocation = 0x01000000, - NoIssuanceChainPolicy = 0x02000000 + NoIssuanceChainPolicy = 0x02000000, + ExplicitDistrust = 0x04000000, + HasNotSupportedCriticalExtension = 0x08000000, + HasWeakSignature = 0x00100000, } public struct X509ChainStatus { @@ -298,151 +301,26 @@ internal static X509ChainStatus[] GetChainStatusInformation (uint dwStatus) { } X509ChainStatus[] chainStatus = new X509ChainStatus[count]; - int index = 0; - if ((dwStatus & CAPI.CERT_TRUST_IS_NOT_SIGNATURE_VALID) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.TRUST_E_CERT_SIGNATURE); - chainStatus[index].Status = X509ChainStatusFlags.NotSignatureValid; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_NOT_SIGNATURE_VALID; - } - - if ((dwStatus & CAPI.CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.TRUST_E_CERT_SIGNATURE); - chainStatus[index].Status = X509ChainStatusFlags.CtlNotSignatureValid; - index++; - dwStatus &= ~CAPI.CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_UNTRUSTED_ROOT) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_UNTRUSTEDROOT); - chainStatus[index].Status = X509ChainStatusFlags.UntrustedRoot; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_UNTRUSTED_ROOT; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_PARTIAL_CHAIN) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_CHAINING); - chainStatus[index].Status = X509ChainStatusFlags.PartialChain; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_PARTIAL_CHAIN; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_REVOKED) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CRYPT_E_REVOKED); - chainStatus[index].Status = X509ChainStatusFlags.Revoked; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_REVOKED; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_NOT_VALID_FOR_USAGE) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_WRONG_USAGE); - chainStatus[index].Status = X509ChainStatusFlags.NotValidForUsage; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_NOT_VALID_FOR_USAGE; - } - - if ((dwStatus & CAPI.CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_WRONG_USAGE); - chainStatus[index].Status = X509ChainStatusFlags.CtlNotValidForUsage; - index++; - dwStatus &= ~CAPI.CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_NOT_TIME_VALID) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_EXPIRED); - chainStatus[index].Status = X509ChainStatusFlags.NotTimeValid; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_NOT_TIME_VALID; - } - - if ((dwStatus & CAPI.CERT_TRUST_CTL_IS_NOT_TIME_VALID) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_EXPIRED); - chainStatus[index].Status = X509ChainStatusFlags.CtlNotTimeValid; - index++; - dwStatus &= ~CAPI.CERT_TRUST_CTL_IS_NOT_TIME_VALID; - } - - if ((dwStatus & CAPI.CERT_TRUST_INVALID_NAME_CONSTRAINTS) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_NAME); - chainStatus[index].Status = X509ChainStatusFlags.InvalidNameConstraints; - index++; - dwStatus &= ~CAPI.CERT_TRUST_INVALID_NAME_CONSTRAINTS; - } - - if ((dwStatus & CAPI.CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_NAME); - chainStatus[index].Status = X509ChainStatusFlags.HasNotSupportedNameConstraint; - index++; - dwStatus &= ~CAPI.CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT; - } - - if ((dwStatus & CAPI.CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_NAME); - chainStatus[index].Status = X509ChainStatusFlags.HasNotDefinedNameConstraint; - index++; - dwStatus &= ~CAPI.CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT; - } - - if ((dwStatus & CAPI.CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_NAME); - chainStatus[index].Status = X509ChainStatusFlags.HasNotPermittedNameConstraint; - index++; - dwStatus &= ~CAPI.CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT; - } - - if ((dwStatus & CAPI.CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_NAME); - chainStatus[index].Status = X509ChainStatusFlags.HasExcludedNameConstraint; - index++; - dwStatus &= ~CAPI.CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT; - } - - if ((dwStatus & CAPI.CERT_TRUST_INVALID_POLICY_CONSTRAINTS) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_POLICY); - chainStatus[index].Status = X509ChainStatusFlags.InvalidPolicyConstraints; - index++; - dwStatus &= ~CAPI.CERT_TRUST_INVALID_POLICY_CONSTRAINTS; - } - - if ((dwStatus & CAPI.CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_INVALID_POLICY); - chainStatus[index].Status = X509ChainStatusFlags.NoIssuanceChainPolicy; - index++; - dwStatus &= ~CAPI.CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY; - } - if ((dwStatus & CAPI.CERT_TRUST_INVALID_BASIC_CONSTRAINTS) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.TRUST_E_BASIC_CONSTRAINTS); - chainStatus[index].Status = X509ChainStatusFlags.InvalidBasicConstraints; - index++; - dwStatus &= ~CAPI.CERT_TRUST_INVALID_BASIC_CONSTRAINTS; - } - - if ((dwStatus & CAPI.CERT_TRUST_IS_NOT_TIME_NESTED) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CERT_E_VALIDITYPERIODNESTING); - chainStatus[index].Status = X509ChainStatusFlags.NotTimeNested; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_NOT_TIME_NESTED; - } - - if ((dwStatus & CAPI.CERT_TRUST_REVOCATION_STATUS_UNKNOWN) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CRYPT_E_NO_REVOCATION_CHECK); - chainStatus[index].Status = X509ChainStatusFlags.RevocationStatusUnknown; - index++; - dwStatus &= ~CAPI.CERT_TRUST_REVOCATION_STATUS_UNKNOWN; - } + foreach (X509ChainErrorMapping mapping in s_x509ChainErrorMappings) + { + if ((dwStatus & mapping.Win32Flag) != 0) + { + Debug.Assert(index < chainStatus.Length); - if ((dwStatus & CAPI.CERT_TRUST_IS_OFFLINE_REVOCATION) != 0) { - chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(CAPI.CRYPT_E_REVOCATION_OFFLINE); - chainStatus[index].Status = X509ChainStatusFlags.OfflineRevocation; - index++; - dwStatus &= ~CAPI.CERT_TRUST_IS_OFFLINE_REVOCATION; + chainStatus[index].StatusInformation = X509Utils.GetSystemErrorString(mapping.Win32ErrorCode); + chainStatus[index].Status = mapping.ChainStatusFlag; + index++; + dwStatus &= ~mapping.Win32Flag; + } } int shiftCount = 0; for (uint bits = dwStatus; bits != 0; bits = bits >> 1) { if ((bits & 0x1) != 0) { + Debug.Assert(index < chainStatus.Length); + chainStatus[index].Status = (X509ChainStatusFlags) (1 << shiftCount); chainStatus[index].StatusInformation = SR.GetString(SR.Unknown_Error); index++; @@ -450,6 +328,8 @@ internal static X509ChainStatus[] GetChainStatusInformation (uint dwStatus) { shiftCount++; } + Debug.Assert(index == chainStatus.Length); + return chainStatus; } @@ -525,5 +405,46 @@ internal static unsafe int BuildChain (IntPtr hChainEngine, return CAPI.S_OK; } + + private struct X509ChainErrorMapping + { + public readonly uint Win32Flag; + public readonly int Win32ErrorCode; + public readonly X509ChainStatusFlags ChainStatusFlag; + + public X509ChainErrorMapping(uint win32Flag, int win32ErrorCode, X509ChainStatusFlags chainStatusFlag) + { + Win32Flag = win32Flag; + Win32ErrorCode = win32ErrorCode; + ChainStatusFlag = chainStatusFlag; + } + } + + private static readonly X509ChainErrorMapping[] s_x509ChainErrorMappings = new[] + { + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_NOT_SIGNATURE_VALID, CAPI.TRUST_E_CERT_SIGNATURE, X509ChainStatusFlags.NotSignatureValid), + new X509ChainErrorMapping(CAPI.CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID, CAPI.TRUST_E_CERT_SIGNATURE, X509ChainStatusFlags.CtlNotSignatureValid), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_UNTRUSTED_ROOT, CAPI.CERT_E_UNTRUSTEDROOT, X509ChainStatusFlags.UntrustedRoot), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_PARTIAL_CHAIN, CAPI.CERT_E_CHAINING, X509ChainStatusFlags.PartialChain), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_REVOKED, CAPI.CRYPT_E_REVOKED, X509ChainStatusFlags.Revoked), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_NOT_VALID_FOR_USAGE, CAPI.CERT_E_WRONG_USAGE, X509ChainStatusFlags.NotValidForUsage), + new X509ChainErrorMapping(CAPI.CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE, CAPI.CERT_E_WRONG_USAGE, X509ChainStatusFlags.CtlNotValidForUsage), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_NOT_TIME_VALID, CAPI.CERT_E_EXPIRED, X509ChainStatusFlags.NotTimeValid), + new X509ChainErrorMapping(CAPI.CERT_TRUST_CTL_IS_NOT_TIME_VALID, CAPI.CERT_E_EXPIRED, X509ChainStatusFlags.CtlNotTimeValid), + new X509ChainErrorMapping(CAPI.CERT_TRUST_INVALID_NAME_CONSTRAINTS, CAPI.CERT_E_INVALID_NAME, X509ChainStatusFlags.InvalidNameConstraints), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT, CAPI.CERT_E_INVALID_NAME, X509ChainStatusFlags.HasNotSupportedNameConstraint), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CAPI.CERT_E_INVALID_NAME, X509ChainStatusFlags.HasNotDefinedNameConstraint), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CAPI.CERT_E_INVALID_NAME, X509ChainStatusFlags.HasNotPermittedNameConstraint), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, CAPI.CERT_E_INVALID_NAME, X509ChainStatusFlags.HasExcludedNameConstraint), + new X509ChainErrorMapping(CAPI.CERT_TRUST_INVALID_POLICY_CONSTRAINTS, CAPI.CERT_E_INVALID_POLICY, X509ChainStatusFlags.InvalidPolicyConstraints), + new X509ChainErrorMapping(CAPI.CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY, CAPI.CERT_E_INVALID_POLICY, X509ChainStatusFlags.NoIssuanceChainPolicy), + new X509ChainErrorMapping(CAPI.CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CAPI.TRUST_E_BASIC_CONSTRAINTS, X509ChainStatusFlags.InvalidBasicConstraints), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_NOT_TIME_NESTED, CAPI.CERT_E_VALIDITYPERIODNESTING, X509ChainStatusFlags.NotTimeNested), + new X509ChainErrorMapping(CAPI.CERT_TRUST_REVOCATION_STATUS_UNKNOWN, CAPI.CRYPT_E_NO_REVOCATION_CHECK, X509ChainStatusFlags.RevocationStatusUnknown), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_OFFLINE_REVOCATION, CAPI.CRYPT_E_REVOCATION_OFFLINE, X509ChainStatusFlags.OfflineRevocation), + new X509ChainErrorMapping(CAPI.CERT_TRUST_IS_EXPLICIT_DISTRUST, CAPI.TRUST_E_EXPLICIT_DISTRUST, X509ChainStatusFlags.ExplicitDistrust), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, CAPI.CERT_E_CRITICAL, X509ChainStatusFlags.HasNotSupportedCriticalExtension), + new X509ChainErrorMapping(CAPI.CERT_TRUST_HAS_WEAK_SIGNATURE, CAPI.CERTSRV_E_WEAK_SIGNATURE_OR_KEY, X509ChainStatusFlags.HasWeakSignature), + }; } } diff --git a/System/services/monitoring/system/diagnosticts/EventLog.cs b/System/services/monitoring/system/diagnosticts/EventLog.cs index 1c8e71440..faa25dd5e 100644 --- a/System/services/monitoring/system/diagnosticts/EventLog.cs +++ b/System/services/monitoring/system/diagnosticts/EventLog.cs @@ -150,8 +150,8 @@ public string LogDisplayName { [MonitoringDescription(SR.LogLog)] [DefaultValue("")] [SettingsBindable(true)] - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, oldLog.machineName doesn't change")] - [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "Microsoft: By design, see justification above assert")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, oldLog.machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "[....]: By design, see justification above assert")] public string Log { get { return m_underlyingEventLog.Log; @@ -181,7 +181,7 @@ public string Log { [MonitoringDescription(SR.LogMachineName)] [DefaultValue(".")] [SettingsBindable(true)] - [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "Microsoft: By design, see justification above assert")] + [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "[....]: By design, see justification above assert")] public string MachineName { get { return m_underlyingEventLog.MachineName; @@ -292,8 +292,8 @@ public ISynchronizeInvoke SynchronizingObject { [MonitoringDescription(SR.LogSource)] [DefaultValue("")] [SettingsBindable(true)] - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, oldLog.machineName doesn't change")] - [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "Microsoft: By design, see justification above assert")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, oldLog.machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "[....]: By design, see justification above assert")] public string Source { get { return m_underlyingEventLog.Source; @@ -1069,7 +1069,7 @@ public static bool SourceExists(string source, string machineName) { /// [ResourceExposure(ResourceScope.None)] [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, machineName doesn't change")] internal static bool SourceExists(string source, string machineName, bool wantToCreate) { if (!SyntaxCheck.CheckMachineName(machineName)) { throw new ArgumentException(SR.GetString(SR.InvalidParameter, "machineName", machineName)); diff --git a/System/services/monitoring/system/diagnosticts/EventLogEntry.cs b/System/services/monitoring/system/diagnosticts/EventLogEntry.cs index cd19c7cc6..931faaa6a 100644 --- a/System/services/monitoring/system/diagnosticts/EventLogEntry.cs +++ b/System/services/monitoring/system/diagnosticts/EventLogEntry.cs @@ -426,7 +426,7 @@ internal string ReplaceMessageParameters( String msg, string[] insertionStrings if ( percentIdx < 0 ) return msg; // no '%' at all - int startCopyIdx = 0; // start idx of last orig msg chars to copy + int startCopyIdx = 0; // start idx of last [....] msg chars to copy int msgLength = msg.Length; StringBuilder buf = new StringBuilder(); string paramDLLNames = GetMessageLibraryNames("ParameterMessageFile"); diff --git a/System/services/monitoring/system/diagnosticts/EventLogEntryCollection.cs b/System/services/monitoring/system/diagnosticts/EventLogEntryCollection.cs index c095b3600..589a1d493 100644 --- a/System/services/monitoring/system/diagnosticts/EventLogEntryCollection.cs +++ b/System/services/monitoring/system/diagnosticts/EventLogEntryCollection.cs @@ -9,7 +9,7 @@ namespace System.Diagnostics { using System; using System.Collections; - //Consider, V2, Microsoft: Is there a way to implement Contains + //Consider, V2, [....]: Is there a way to implement Contains //and IndexOf, can we live withouth this part of the ReadOnly //collection pattern? /// diff --git a/System/services/monitoring/system/diagnosticts/EventLogInternal.cs b/System/services/monitoring/system/diagnosticts/EventLogInternal.cs index d43d0a8df..754ae4cb0 100644 --- a/System/services/monitoring/system/diagnosticts/EventLogInternal.cs +++ b/System/services/monitoring/system/diagnosticts/EventLogInternal.cs @@ -160,7 +160,7 @@ public EventLogInternal(string logName, string machineName, string source) : thi /// /// [To be supplied.] /// - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, oldLog.machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, oldLog.machineName doesn't change")] public EventLogInternal(string logName, string machineName, string source, EventLog parent) { //look out for invalid log names if (logName == null) @@ -316,7 +316,7 @@ public string Log { } } - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, machineName doesn't change")] private string GetLogName(string currentMachineName) { if ((logName == null || logName.Length == 0) && sourceName != null && sourceName.Length!=0) { @@ -347,7 +347,7 @@ public string MachineName { } [ComVisible(false)] - [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Justification = "Microsoft: MaximumKilobytes is the name of this property.")] + [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly", Justification = "[....]: MaximumKilobytes is the name of this property.")] public long MaximumKilobytes { get { string currentMachineName = this.machineName; @@ -653,7 +653,7 @@ public void Close() { Close(this.machineName); } - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, currentMachineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, currentMachineName doesn't change")] private void Close(string currentMachineName) { EventLogPermission permission = new EventLogPermission(EventLogPermissionAccess.Write, currentMachineName); permission.Demand(); @@ -730,7 +730,7 @@ private void CompletionCallback(object context) { i = lastSeenCount; } - // NOTE, Microsoft: We have a double loop here so that we access the + // NOTE, [....]: We have a double loop here so that we access the // EntryCount property as infrequently as possible. (It may be expensive // to get the property.) Even though there are two loops, they will together // only execute as many times as (final value of EntryCount) - lastSeenCount. @@ -897,7 +897,7 @@ internal EventLogEntry[] GetAllEntries() { oldestEntry+idx, buf, buf.Length, out bytesRead, out minBytesNeeded); if (!success) { error = Marshal.GetLastWin32Error(); - // NOTE, Microsoft: ERROR_PROC_NOT_FOUND used to get returned, but I think that + // NOTE, [....]: ERROR_PROC_NOT_FOUND used to get returned, but I think that // was because I was calling GetLastError directly instead of GetLastWin32Error. // Making the buffer bigger and trying again seemed to work. I've removed the check // for ERROR_PROC_NOT_FOUND because I don't think it's necessary any more, but @@ -1090,7 +1090,7 @@ private EventLogEntry GetEntryWithOldest(int index) { cache, cache.Length, out bytesRead, out minBytesNeeded); if (!success) { int error = Marshal.GetLastWin32Error(); - // NOTE, Microsoft: ERROR_PROC_NOT_FOUND used to get returned, but I think that + // NOTE, [....]: ERROR_PROC_NOT_FOUND used to get returned, but I think that // was because I was calling GetLastError directly instead of GetLastWin32Error. // Making the buffer bigger and trying again seemed to work. I've removed the check // for ERROR_PROC_NOT_FOUND because I don't think it's necessary any more, but @@ -1270,7 +1270,7 @@ public void ModifyOverflowPolicy(OverflowAction action, int retentionDays) { /// [ResourceExposure(ResourceScope.None)] [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, machineName doesn't change")] private void OpenForRead(string currentMachineName) { Debug.WriteLineIf(CompModSwitches.EventLog.TraceVerbose, "EventLog::OpenForRead"); @@ -1286,13 +1286,13 @@ private void OpenForRead(string currentMachineName) { if (logname == null || logname.Length==0) throw new ArgumentException(SR.GetString(SR.MissingLogProperty)); - if (!EventLog.Exists(logname, currentMachineName) ) // do not open non-existing Log [Microsoft] + if (!EventLog.Exists(logname, currentMachineName) ) // do not open non-existing Log [[....]] throw new InvalidOperationException( SR.GetString(SR.LogDoesNotExists, logname, currentMachineName) ); //Check environment before calling api SharedUtils.CheckEnvironment(); // Clean up cache variables. - // [Microsoft] The initilizing code is put here to guarantee, that first read of events + // [[....]] The initilizing code is put here to guarantee, that first read of events // from log file will start by filling up the cache buffer. lastSeenEntry = 0; lastSeenPos = 0; @@ -1506,7 +1506,7 @@ internal static bool ValidLogName(string logName, bool ignoreEmpty) { [ResourceExposure(ResourceScope.None)] [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)] - [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "Microsoft: Safe, machineName doesn't change")] + [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity", Justification = "[....]: Safe, machineName doesn't change")] private void VerifyAndCreateSource(string sourceName, string currentMachineName) { if (boolFlags[Flag_sourceVerified]) return; diff --git a/System/services/monitoring/system/diagnosticts/Process.cs b/System/services/monitoring/system/diagnosticts/Process.cs index 43272662e..6f59b8c23 100644 --- a/System/services/monitoring/system/diagnosticts/Process.cs +++ b/System/services/monitoring/system/diagnosticts/Process.cs @@ -2062,6 +2062,9 @@ private bool StartWithCreateProcess(ProcessStartInfo startInfo) { #if !FEATURE_PAL if (startInfo.UserName.Length != 0) { + if (startInfo.Password != null && startInfo.PasswordInClearText != null) + throw new ArgumentException(SR.GetString(SR.CantSetDuplicatePassword)); + NativeMethods.LogonFlags logonFlags = (NativeMethods.LogonFlags)0; if( startInfo.LoadUserProfile) { logonFlags = NativeMethods.LogonFlags.LOGON_WITH_PROFILE; @@ -2069,10 +2072,12 @@ private bool StartWithCreateProcess(ProcessStartInfo startInfo) { IntPtr password = IntPtr.Zero; try { - if( startInfo.Password == null) { + if( startInfo.Password != null) { + password = Marshal.SecureStringToCoTaskMemUnicode(startInfo.Password); + } else if( startInfo.PasswordInClearText != null) { + password = Marshal.StringToCoTaskMemUni(startInfo.PasswordInClearText); + } else { password = Marshal.StringToCoTaskMemUni(String.Empty); - } else { - password = Marshal.SecureStringToCoTaskMemUnicode(startInfo.Password); } RuntimeHelpers.PrepareConstrainedRegions(); diff --git a/System/services/monitoring/system/diagnosticts/ProcessManager.cs b/System/services/monitoring/system/diagnosticts/ProcessManager.cs index 9c9d5e9e4..711debb3a 100644 --- a/System/services/monitoring/system/diagnosticts/ProcessManager.cs +++ b/System/services/monitoring/system/diagnosticts/ProcessManager.cs @@ -49,7 +49,7 @@ bool IsMainWindow(IntPtr handle) { if (NativeMethods.GetWindow(new HandleRef(this, handle), NativeMethods.GW_OWNER) != (IntPtr)0 || !NativeMethods.IsWindowVisible(new HandleRef(this, handle))) return false; - // Microsoft: should we use no window title to mean not a main window? (task man does) + // [....]: should we use no window title to mean not a main window? (task man does) /* int length = NativeMethods.GetWindowTextLength(handle) * 2; diff --git a/System/services/monitoring/system/diagnosticts/ProcessStartInfo.cs b/System/services/monitoring/system/diagnosticts/ProcessStartInfo.cs index b57851de6..36cd9ec91 100644 --- a/System/services/monitoring/system/diagnosticts/ProcessStartInfo.cs +++ b/System/services/monitoring/system/diagnosticts/ProcessStartInfo.cs @@ -49,6 +49,7 @@ public sealed class ProcessStartInfo { string userName; string domain; SecureString password; + string passwordInClearText; bool loadUserProfile; #endif //FEATURE_PAL bool redirectStandardInput = false; @@ -336,6 +337,12 @@ public SecureString Password { get { return password; } set { password = value; } } + + [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] + public string PasswordInClearText { + get { return passwordInClearText; } + set { passwordInClearText = value; } + } [NotifyParentProperty(true)] public string Domain { diff --git a/System/services/monitoring/system/diagnosticts/SharedUtils.cs b/System/services/monitoring/system/diagnosticts/SharedUtils.cs index 5b664f60c..b1c4a8601 100644 --- a/System/services/monitoring/system/diagnosticts/SharedUtils.cs +++ b/System/services/monitoring/system/diagnosticts/SharedUtils.cs @@ -112,7 +112,7 @@ internal static void EnterMutex(string name, ref Mutex mutex) { [ResourceExposure(ResourceScope.Machine)] [ResourceConsumption(ResourceScope.Machine)] [SecurityPermission(SecurityAction.Assert, ControlPrincipal = true)] - [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "Microsoft: We pass fixed data into sec.AddAccessRule")] + [SuppressMessage("Microsoft.Security", "CA2106:SecureAsserts", Justification = "[....]: We pass fixed data into sec.AddAccessRule")] internal static void EnterMutexWithoutGlobal(string mutexName, ref Mutex mutex) { bool createdNew; MutexSecurity sec = new MutexSecurity(); diff --git a/System/services/timers/system/timers/Timer.cs b/System/services/timers/system/timers/Timer.cs index 4202e7920..7dc76d448 100644 --- a/System/services/timers/system/timers/Timer.cs +++ b/System/services/timers/system/timers/Timer.cs @@ -98,7 +98,7 @@ public bool AutoReset { /// is able /// to raise events at a defined interval. /// - //Microsoft - The default value by design is false, don't change it. + //[....] - The default value by design is false, don't change it. [Category("Behavior"), TimersDescription(SR.TimerEnabled), DefaultValue(false)] public bool Enabled { get { diff --git a/System/sys/LocalAppContextSwitches.cs b/System/sys/LocalAppContextSwitches.cs index 1d776627f..50f2bac56 100644 --- a/System/sys/LocalAppContextSwitches.cs +++ b/System/sys/LocalAppContextSwitches.cs @@ -25,5 +25,19 @@ public static bool DontEnableSchUseStrongCrypto } #endregion +#region System.Net.WebSockets.HttpListenerAsyncEventArgs + private static int _allocateOverlappedOnDemand; + internal const string AllocateOverlappedOnDemandName = @"Switch.System.Net.WebSockets.HttpListenerAsyncEventArgs.AllocateOverlappedOnDemand"; + + public static bool AllocateOverlappedOnDemand + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + get + { + return LocalAppContext.GetCachedSwitchValue(AllocateOverlappedOnDemandName, ref _allocateOverlappedOnDemand); + } + } +#endregion + } } diff --git a/System/sys/system/IO/compression/FastEncoderWindow.cs b/System/sys/system/IO/compression/FastEncoderWindow.cs index 2fd3054cd..6b95ed1f6 100644 --- a/System/sys/system/IO/compression/FastEncoderWindow.cs +++ b/System/sys/system/IO/compression/FastEncoderWindow.cs @@ -109,9 +109,9 @@ public void MoveWindows() { } #if DEBUG - // For debugging, wipe the window clean, so that if there is a - - + // For debugging, wipe the window clean, so that if there is a bug in our hashing, + // the hash pointers will now point to locations which are not valid for the hash value + // (and will be caught by our ASSERTs). Array.Clear(window, FastEncoderWindowSize, window.Length - FastEncoderWindowSize); #endif diff --git a/System/sys/system/IO/ports/SerialStream.cs b/System/sys/system/IO/ports/SerialStream.cs index 358baee38..02e2d4445 100644 --- a/System/sys/system/IO/ports/SerialStream.cs +++ b/System/sys/system/IO/ports/SerialStream.cs @@ -7,7 +7,7 @@ ** ** Class: SerialStream ** -** Purpose: Class for enabling low-level sync and async control over a serial +** Purpose: Class for enabling low-level [....] and async control over a serial ** : communications resource. ** ** Date: August, 2002 diff --git a/System/sys/system/Media/SoundPlayer.cs b/System/sys/system/Media/SoundPlayer.cs index 3463d51e8..57e621ef4 100644 --- a/System/sys/system/Media/SoundPlayer.cs +++ b/System/sys/system/Media/SoundPlayer.cs @@ -227,7 +227,7 @@ private void CleanupStreamData() { /// public void Load() { // if we have a file there is nothing to load - we just pass the file to the PlaySound function - // if we have a stream, then we start loading the stream sync + // if we have a stream, then we start loading the stream [....] // if (uri != null && uri.IsFile){ Debug.Assert(stream == null, "we can't have a stream and a path at the same time"); @@ -245,7 +245,7 @@ public void Load() { [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")] // FileIOPermission based on URI path, but path isn't gonna change during scope of Demand private void LoadAndPlay(int flags) { - // + // bug 16794: when the user does not specify a sound location nor a stream, play Beep if (String.IsNullOrEmpty(soundLocation) && stream == null) { SystemSounds.Beep.Play(); return; diff --git a/System/sys/system/collections/concurrent/BlockingCollection.cs b/System/sys/system/collections/concurrent/BlockingCollection.cs index 53f2bf210..ba8dac366 100644 --- a/System/sys/system/collections/concurrent/BlockingCollection.cs +++ b/System/sys/system/collections/concurrent/BlockingCollection.cs @@ -7,7 +7,7 @@ // // BlockingCollection.cs // -// Microsoft +// [....] // // A class that implements the bounding and blocking functionality while abstracting away // the underlying storage mechanism. This file also contains BlockingCollection's @@ -499,7 +499,7 @@ private bool TryAddWithNoTimeValidation(T item, int millisecondsTimeout, Cancell try { //The token may have been canceled before the collection had space available, so we need a check after the wait has completed. - //This fixes + //This fixes bug #702328, case 2 of 2. cancellationToken.ThrowIfCancellationRequested(); addingSucceeded = m_collection.TryAdd(item); } @@ -736,7 +736,7 @@ private bool TryTakeWithNoTimeValidation(out T item, int millisecondsTimeout, Ca try { //The token may have been canceled before an item arrived, so we need a check after the wait has completed. - //This fixes + //This fixes bug #702328, case 1 of 2. cancellationToken.ThrowIfCancellationRequested(); //If an item was successfully removed from the underlying collection. diff --git a/System/sys/system/collections/concurrent/ConcurrentBag.cs b/System/sys/system/collections/concurrent/ConcurrentBag.cs index 0eac2aa19..1f0d34927 100644 --- a/System/sys/system/collections/concurrent/ConcurrentBag.cs +++ b/System/sys/system/collections/concurrent/ConcurrentBag.cs @@ -7,7 +7,7 @@ // // ConcurrentBag.cs // -// Microsoft +// [....] // // //An unordered collection that allows duplicates and that provides add and get operations. diff --git a/System/sys/system/threading/Barrier.cs b/System/sys/system/threading/Barrier.cs index 25c0ed599..35db6d1f9 100644 --- a/System/sys/system/threading/Barrier.cs +++ b/System/sys/system/threading/Barrier.cs @@ -7,7 +7,7 @@ // // Barrier.cs // -// Microsoft +// [....] // // A barrier allows multiple tasks to cooperatively work on some algorithm in parallel. // A group of tasks cooperate by moving through a series of phases, where each in the group signals it has arrived at diff --git a/System/sys/system/windows/markup/ValueSerializerAttribute.cs b/System/sys/system/windows/markup/ValueSerializerAttribute.cs index 083ec90e7..2a0102e8c 100644 --- a/System/sys/system/windows/markup/ValueSerializerAttribute.cs +++ b/System/sys/system/windows/markup/ValueSerializerAttribute.cs @@ -10,7 +10,7 @@ // an attached property by setting it on the static accessor // for the attachable property). // -// Created: 04/28/2005 Microsoft +// Created: 04/28/2005 [....] // //------------------------------------------------------------------------ diff --git a/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs b/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs index 423b3f8e0..f66e29706 100644 --- a/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs +++ b/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTaskInternal.cs @@ -487,11 +487,11 @@ bool ProcessMarkupItem(ITaskItem markupItem, CodeDomProvider codeDomProvider) XamlXmlWriterSettings xamlSettings = new XamlXmlWriterSettings() { CloseOutput = true }; // Process EmbeddedResourceXaml to remove xml:space="preserve" - // due to a - - - - + // due to a bug in XamlXmlWriter. XamlXmlWriter throws + // if there are duplicate xml:space attributes. + // It is ok to remove the xml:space attribute + // as the XamlXmlWriter would add it in the next step + // if needed. RemoveXamlSpaceAttribute(classData); using (XamlReader reader = classData.EmbeddedResourceXaml.GetReader()) diff --git a/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs b/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs index e498bca02..891e2e8cd 100644 --- a/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs +++ b/XamlBuildTask/Microsoft/Build/Tasks/Xaml/ResolveAssemblyHelper.cs @@ -44,9 +44,9 @@ internal static string FileNotFound public Assembly ResolveLocalProjectReferences(object sender, ResolveEventArgs args) { // Currently we are return the assembly just by matching the short name - // of the assembly. Filed - - + // of the assembly. Filed bug 172138 to figure out whether we need + // to load the exact matching(version, culture, public key matches) + // assembly. AssemblyName targetAssemblyName = new AssemblyName(args.Name); string targetName = targetAssemblyName.Name; diff --git a/mscorlib/InternalApis/NDP_Common/inc/StrongNameHelpers.cs b/mscorlib/InternalApis/NDP_Common/inc/StrongNameHelpers.cs index eca286141..262070c90 100644 --- a/mscorlib/InternalApis/NDP_Common/inc/StrongNameHelpers.cs +++ b/mscorlib/InternalApis/NDP_Common/inc/StrongNameHelpers.cs @@ -20,7 +20,7 @@ internal static class StrongNameHelpers { [ThreadStatic] private static IClrStrongName s_StrongName; - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] private static IClrStrongName StrongName { [System.Security.SecurityCritical] get { @@ -33,7 +33,7 @@ private static IClrStrongName StrongName { } } - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] private static IClrStrongNameUsingIntPtr StrongNameUsingIntPtr { [System.Security.SecurityCritical] get { @@ -42,20 +42,20 @@ private static IClrStrongNameUsingIntPtr StrongNameUsingIntPtr { } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static int StrongNameErrorInfo() { return ts_LastStrongNameHR; } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "Microsoft.Runtime.Hosting.IClrStrongNameUsingIntPtr.StrongNameFreeBuffer(System.IntPtr)", Justification = "StrongNameFreeBuffer returns void but the new runtime wrappers return an HRESULT.")] public static void StrongNameFreeBuffer(IntPtr pbMemory) { StrongNameUsingIntPtr.StrongNameFreeBuffer(pbMemory); } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameGetPublicKey(string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob, out IntPtr ppbPublicKeyBlob, out int pcbPublicKeyBlob) { int hr = StrongNameUsingIntPtr.StrongNameGetPublicKey(pwzKeyContainer, pbKeyBlob, cbKeyBlob, out ppbPublicKeyBlob, out pcbPublicKeyBlob); if( hr < 0 ) @@ -70,7 +70,7 @@ public static bool StrongNameGetPublicKey(string pwzKeyContainer, IntPtr pbKeyBl [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyDelete(string pwzKeyContainer) { int hr = StrongName.StrongNameKeyDelete(pwzKeyContainer); if( hr < 0 ) @@ -82,7 +82,7 @@ public static bool StrongNameKeyDelete(string pwzKeyContainer) { } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyGen(string pwzKeyContainer, int dwFlags, out IntPtr ppbKeyBlob, out int pcbKeyBlob) { int hr = StrongName.StrongNameKeyGen(pwzKeyContainer, dwFlags, out ppbKeyBlob, out pcbKeyBlob); if( hr < 0 ) @@ -96,7 +96,7 @@ public static bool StrongNameKeyGen(string pwzKeyContainer, int dwFlags, out Int } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyInstall(string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob) { int hr = StrongNameUsingIntPtr.StrongNameKeyInstall(pwzKeyContainer, pbKeyBlob, cbKeyBlob); if( hr < 0 ) @@ -108,7 +108,7 @@ public static bool StrongNameKeyInstall(string pwzKeyContainer, IntPtr pbKeyBlob } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob) { IntPtr ppbSignatureBlob = IntPtr.Zero; int cbSignatureBlob = 0; @@ -117,7 +117,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, IntPtr pbKeyBlob, int cbKeyBlob, ref IntPtr ppbSignatureBlob, out int pcbSignatureBlob) { int hr = StrongNameUsingIntPtr.StrongNameSignatureGeneration(pwzFilePath, pwzKeyContainer, pbKeyBlob, cbKeyBlob, ppbSignatureBlob, out pcbSignatureBlob); if( hr < 0 ) @@ -130,7 +130,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureSize(IntPtr pbPublicKeyBlob, int cbPublicKeyBlob, out int pcbSize) { int hr = StrongNameUsingIntPtr.StrongNameSignatureSize(pbPublicKeyBlob, cbPublicKeyBlob, out pcbSize); if( hr < 0 ) @@ -143,7 +143,7 @@ public static bool StrongNameSignatureSize(IntPtr pbPublicKeyBlob, int cbPublicK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureVerification(string pwzFilePath, int dwInFlags, out int pdwOutFlags) { int hr = StrongName.StrongNameSignatureVerification(pwzFilePath, dwInFlags, out pdwOutFlags); if( hr < 0 ) @@ -156,7 +156,7 @@ public static bool StrongNameSignatureVerification(string pwzFilePath, int dwInF } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureVerificationEx(string pwzFilePath, bool fForceVerification, out bool pfWasVerified) { int hr = StrongName.StrongNameSignatureVerificationEx(pwzFilePath, fForceVerification, out pfWasVerified); if( hr < 0 ) @@ -169,7 +169,7 @@ public static bool StrongNameSignatureVerificationEx(string pwzFilePath, bool fF } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameTokenFromPublicKey(IntPtr pbPublicKeyBlob, int cbPublicKeyBlob, out IntPtr ppbStrongNameToken, out int pcbStrongNameToken) { int hr = StrongNameUsingIntPtr.StrongNameTokenFromPublicKey(pbPublicKeyBlob, cbPublicKeyBlob, out ppbStrongNameToken, out pcbStrongNameToken); if( hr < 0 ) @@ -183,7 +183,7 @@ public static bool StrongNameTokenFromPublicKey(IntPtr pbPublicKeyBlob, int cbPu } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureSize(byte[] bPublicKeyBlob, int cbPublicKeyBlob, out int pcbSize) { int hr = StrongName.StrongNameSignatureSize(bPublicKeyBlob, cbPublicKeyBlob, out pcbSize); if( hr < 0 ) @@ -195,7 +195,7 @@ public static bool StrongNameSignatureSize(byte[] bPublicKeyBlob, int cbPublicKe return true; } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameTokenFromPublicKey(byte[] bPublicKeyBlob, int cbPublicKeyBlob, out IntPtr ppbStrongNameToken, out int pcbStrongNameToken) { int hr = StrongName.StrongNameTokenFromPublicKey(bPublicKeyBlob, cbPublicKeyBlob, out ppbStrongNameToken, out pcbStrongNameToken); if( hr < 0 ) @@ -209,7 +209,7 @@ public static bool StrongNameTokenFromPublicKey(byte[] bPublicKeyBlob, int cbPub } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameGetPublicKey(string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob, out IntPtr ppbPublicKeyBlob, out int pcbPublicKeyBlob) { int hr = StrongName.StrongNameGetPublicKey(pwzKeyContainer, bKeyBlob, cbKeyBlob, out ppbPublicKeyBlob, out pcbPublicKeyBlob); if( hr < 0 ) @@ -223,7 +223,7 @@ public static bool StrongNameGetPublicKey(string pwzKeyContainer, byte[] bKeyBlo } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameKeyInstall(string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob) { int hr = StrongName.StrongNameKeyInstall(pwzKeyContainer, bKeyBlob, cbKeyBlob); if( hr < 0 ) @@ -235,7 +235,7 @@ public static bool StrongNameKeyInstall(string pwzKeyContainer, byte[] bKeyBlob, } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob) { IntPtr ppbSignatureBlob = IntPtr.Zero; int cbSignatureBlob = 0; @@ -243,7 +243,7 @@ public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzK } [System.Security.SecurityCritical] - [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Microsoft: This file is included in a lot of projects some of which only use a subset of the functions.")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "[....]: This file is included in a lot of projects some of which only use a subset of the functions.")] public static bool StrongNameSignatureGeneration(string pwzFilePath, string pwzKeyContainer, byte[] bKeyBlob, int cbKeyBlob, ref IntPtr ppbSignatureBlob, out int pcbSignatureBlob) { int hr = StrongName.StrongNameSignatureGeneration(pwzFilePath, pwzKeyContainer, bKeyBlob, cbKeyBlob, ppbSignatureBlob, out pcbSignatureBlob); if( hr < 0 ) diff --git a/mscorlib/microsoft/win32/oavariantlib.cs b/mscorlib/microsoft/win32/oavariantlib.cs index 96525f5cd..8b8d0b1cb 100644 --- a/mscorlib/microsoft/win32/oavariantlib.cs +++ b/mscorlib/microsoft/win32/oavariantlib.cs @@ -60,7 +60,7 @@ internal static class OAVariantLib typeof(DBNull), }; - // Keep these numbers in sync w/ the above array. + // Keep these numbers in [....] w/ the above array. private const int CV_OBJECT=0x12; #endregion diff --git a/mscorlib/microsoft/win32/safehandles/saferegistryhandle.cs b/mscorlib/microsoft/win32/safehandles/saferegistryhandle.cs index c2b6730bb..afe090120 100644 --- a/mscorlib/microsoft/win32/safehandles/saferegistryhandle.cs +++ b/mscorlib/microsoft/win32/safehandles/saferegistryhandle.cs @@ -6,7 +6,7 @@ // // File: SafeRegistryHandle.cs // -// Microsoft +// [....] // // Implements Microsoft.Win32.SafeHandles.SafeRegistryHandle // diff --git a/mscorlib/system/AggregateException.cs b/mscorlib/system/AggregateException.cs index 5b442f254..2a2561b05 100644 --- a/mscorlib/system/AggregateException.cs +++ b/mscorlib/system/AggregateException.cs @@ -7,7 +7,7 @@ // // AggregateException.cs // -// Microsoft +// [....] // // Public type to communicate multiple failures to an end-user. // diff --git a/mscorlib/system/AppContext/AppContext.cs b/mscorlib/system/AppContext/AppContext.cs index b24498b42..f6f74fa46 100644 --- a/mscorlib/system/AppContext/AppContext.cs +++ b/mscorlib/system/AppContext/AppContext.cs @@ -28,7 +28,9 @@ public static string BaseDirectory #endif get { - return AppDomain.CurrentDomain.BaseDirectory; + // The value of APP_CONTEXT_BASE_DIRECTORY key has to be a string and it is not allowed to be any other type. + // Otherwise the caller will get invalid cast exception + return (string) AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") ?? AppDomain.CurrentDomain.BaseDirectory; } } diff --git a/mscorlib/system/AppContext/AppContextDefaultValues.cs b/mscorlib/system/AppContext/AppContextDefaultValues.cs index 124f9f45a..8a130a0f3 100644 --- a/mscorlib/system/AppContext/AppContextDefaultValues.cs +++ b/mscorlib/system/AppContext/AppContextDefaultValues.cs @@ -25,7 +25,6 @@ public static void PopulateDefaultValues() /// We have this separate method for getting the parsed elements out of the TargetFrameworkName so we can /// more easily support this on other platforms. /// - [System.Security.SecuritySafeCritical] private static void ParseTargetFrameworkName(out string identifier, out string profile, out int version) { string targetFrameworkMoniker = AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName; diff --git a/mscorlib/system/Lazy.cs b/mscorlib/system/Lazy.cs index edb3f9e93..41de24814 100644 --- a/mscorlib/system/Lazy.cs +++ b/mscorlib/system/Lazy.cs @@ -8,7 +8,7 @@ // // Lazy.cs // -// Microsoft +// [....] // // -------------------------------------------------------------------------------------- // @@ -431,7 +431,7 @@ private Boxed CreateValue() } else if (factory == ALREADY_INVOKED_SENTINEL) { - // Another thread raced with us and beat us to successfully invoke the factory. + // Another thread ----d with us and beat us to successfully invoke the factory. return null; } boxed = new Boxed(factory()); diff --git a/mscorlib/system/appdomain.cs b/mscorlib/system/appdomain.cs index 897696699..0d7719d22 100644 --- a/mscorlib/system/appdomain.cs +++ b/mscorlib/system/appdomain.cs @@ -7,7 +7,7 @@ ** ** Class: AppDomain ** -** Microsoft +** [....] ** ** ** Purpose: Domains represent an application within the runtime. Objects can @@ -3740,7 +3740,7 @@ private static Object Setup(Object arg) for (int i=0; iMicrosoft +** [....] ** ** ** Purpose: For AppDomain-related custom attributes. diff --git a/mscorlib/system/appdomainunloadedexception.cs b/mscorlib/system/appdomainunloadedexception.cs index b0518f6ed..6c21cf0ba 100644 --- a/mscorlib/system/appdomainunloadedexception.cs +++ b/mscorlib/system/appdomainunloadedexception.cs @@ -7,7 +7,7 @@ ** ** Class: AppDomainUnloadedException ** -** Microsoft +** [....] ** ** ** Purpose: Exception class for attempt to access an unloaded AppDomain diff --git a/mscorlib/system/argiterator.cs b/mscorlib/system/argiterator.cs index 56b67d05c..9edb731f1 100644 --- a/mscorlib/system/argiterator.cs +++ b/mscorlib/system/argiterator.cs @@ -13,7 +13,7 @@ namespace System { // This class will not be marked serializable // Note: This type must have the same layout as the CLR's VARARGS type in CLRVarArgs.h. - // It also contains an inline SigPointer data structure - must keep those fields in sync. + // It also contains an inline SigPointer data structure - must keep those fields in [....]. [StructLayout(LayoutKind.Sequential)] public struct ArgIterator { diff --git a/mscorlib/system/array.cs b/mscorlib/system/array.cs index 3c678360d..7c767692f 100644 --- a/mscorlib/system/array.cs +++ b/mscorlib/system/array.cs @@ -618,7 +618,7 @@ private static int GetMedian(int low, int hi) { // We impose limits on maximum array lenght in each dimension to allow efficient // implementation of advanced range check elimination in future. - // Keep in sync with vm\gcscan.cpp and HashHelpers.MaxPrimeArrayLength. + // Keep in [....] with vm\gcscan.cpp and HashHelpers.MaxPrimeArrayLength. // The constants are defined in this method: inline SIZE_T MaxArrayLength(SIZE_T componentSize) from gcscan // We have different max sizes for arrays with elements of size 1 for backwards compatibility internal const int MaxArrayLength = 0X7FEFFFFF; diff --git a/mscorlib/system/badimageformatexception.cs b/mscorlib/system/badimageformatexception.cs index 19783eb44..442639c09 100644 --- a/mscorlib/system/badimageformatexception.cs +++ b/mscorlib/system/badimageformatexception.cs @@ -12,7 +12,7 @@ ** ** ===========================================================*/ -// Microsoft +// [....] namespace System { diff --git a/mscorlib/system/cannotunloadappdomainexception.cs b/mscorlib/system/cannotunloadappdomainexception.cs index 6c9df903f..1f3b6ff37 100644 --- a/mscorlib/system/cannotunloadappdomainexception.cs +++ b/mscorlib/system/cannotunloadappdomainexception.cs @@ -7,7 +7,7 @@ ** ** Class: CannotUnloadAppDomainException ** -** Microsoft +** [....] ** ** ** Purpose: Exception class for failed attempt to unload an AppDomain. diff --git a/mscorlib/system/collections/Concurrent/CDSCollectionETWBCLProvider.cs b/mscorlib/system/collections/Concurrent/CDSCollectionETWBCLProvider.cs index 793a0d9f1..318794b7f 100644 --- a/mscorlib/system/collections/Concurrent/CDSCollectionETWBCLProvider.cs +++ b/mscorlib/system/collections/Concurrent/CDSCollectionETWBCLProvider.cs @@ -7,7 +7,7 @@ // // CDSCollectionETWBCLProvider.cs // -// Microsoft +// [....] // // A helper class for firing ETW events related to the Coordination Data Structure // collection types. This provider is used by CDS collections in both mscorlib.dll diff --git a/mscorlib/system/collections/Concurrent/ConcurrentDictionary.cs b/mscorlib/system/collections/Concurrent/ConcurrentDictionary.cs index 90f183261..61a88f102 100644 --- a/mscorlib/system/collections/Concurrent/ConcurrentDictionary.cs +++ b/mscorlib/system/collections/Concurrent/ConcurrentDictionary.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================ ** ** Class: ConcurrentDictionary diff --git a/mscorlib/system/collections/Concurrent/ConcurrentQueue.cs b/mscorlib/system/collections/Concurrent/ConcurrentQueue.cs index 9a17c4436..eb7aeb2d7 100644 --- a/mscorlib/system/collections/Concurrent/ConcurrentQueue.cs +++ b/mscorlib/system/collections/Concurrent/ConcurrentQueue.cs @@ -9,7 +9,7 @@ // // ConcurrentQueue.cs // -// Microsoft +// [....] // // A lock-free, concurrent queue primitive, and its associated debugger view type. // diff --git a/mscorlib/system/collections/Concurrent/ConcurrentStack.cs b/mscorlib/system/collections/Concurrent/ConcurrentStack.cs index 8e5821f55..dbadcc311 100644 --- a/mscorlib/system/collections/Concurrent/ConcurrentStack.cs +++ b/mscorlib/system/collections/Concurrent/ConcurrentStack.cs @@ -9,7 +9,7 @@ // // ConcurrentStack.cs // -// Microsoft +// [....] // // A lock-free, concurrent stack primitive, and its associated debugger view type. // diff --git a/mscorlib/system/collections/Concurrent/IProducerConsumerCollection.cs b/mscorlib/system/collections/Concurrent/IProducerConsumerCollection.cs index 6ed2935c8..d8b1a0bf1 100644 --- a/mscorlib/system/collections/Concurrent/IProducerConsumerCollection.cs +++ b/mscorlib/system/collections/Concurrent/IProducerConsumerCollection.cs @@ -7,7 +7,7 @@ // // IProducerConsumerCollection.cs // -// Microsoft +// [....] // // A common interface for all concurrent collections. // diff --git a/mscorlib/system/collections/Concurrent/OrderablePartitioner.cs b/mscorlib/system/collections/Concurrent/OrderablePartitioner.cs index aaf92c0fc..82419f629 100644 --- a/mscorlib/system/collections/Concurrent/OrderablePartitioner.cs +++ b/mscorlib/system/collections/Concurrent/OrderablePartitioner.cs @@ -7,7 +7,7 @@ // // OrderablePartitioner.cs // -// Microsoft +// [....] // // // diff --git a/mscorlib/system/collections/Concurrent/Partitioner.cs b/mscorlib/system/collections/Concurrent/Partitioner.cs index 095777506..7b683d247 100644 --- a/mscorlib/system/collections/Concurrent/Partitioner.cs +++ b/mscorlib/system/collections/Concurrent/Partitioner.cs @@ -7,7 +7,7 @@ // // Partitioner.cs // -// Microsoft +// [....] // // Represents a particular way of splitting a collection into multiple partitions. // diff --git a/mscorlib/system/collections/Concurrent/PartitionerStatic.cs b/mscorlib/system/collections/Concurrent/PartitionerStatic.cs index 20c1ac593..a0c3d19c8 100644 --- a/mscorlib/system/collections/Concurrent/PartitionerStatic.cs +++ b/mscorlib/system/collections/Concurrent/PartitionerStatic.cs @@ -8,7 +8,7 @@ // // PartitionerStatic.cs // -// Microsoft +// [....] // // A class of default partitioners for Partitioner // diff --git a/mscorlib/system/collections/arraylist.cs b/mscorlib/system/collections/arraylist.cs index c980dc136..ac2b660cf 100644 --- a/mscorlib/system/collections/arraylist.cs +++ b/mscorlib/system/collections/arraylist.cs @@ -7,7 +7,7 @@ ** ** Class: ArrayList ** -** Microsoft +** [....] ** ** ** Purpose: Implements a dynamically sized List as an array, diff --git a/mscorlib/system/collections/bitarray.cs b/mscorlib/system/collections/bitarray.cs index 67acd6a07..dfe421f31 100644 --- a/mscorlib/system/collections/bitarray.cs +++ b/mscorlib/system/collections/bitarray.cs @@ -7,7 +7,7 @@ ** ** Class: BitArray ** -** Microsoft +** [....] ** ** ** Purpose: The BitArray class manages a compact array of bit values. diff --git a/mscorlib/system/collections/caseinsensitivecomparer.cs b/mscorlib/system/collections/caseinsensitivecomparer.cs index 9e584ea82..c6d46c109 100644 --- a/mscorlib/system/collections/caseinsensitivecomparer.cs +++ b/mscorlib/system/collections/caseinsensitivecomparer.cs @@ -7,7 +7,7 @@ ** ** Class: CaseInsensitiveComparer ** -** Microsoft +** [....] ** ** ** diff --git a/mscorlib/system/collections/caseinsensitivehashcodeprovider.cs b/mscorlib/system/collections/caseinsensitivehashcodeprovider.cs index e9d24edc9..c9a9fd5c9 100644 --- a/mscorlib/system/collections/caseinsensitivehashcodeprovider.cs +++ b/mscorlib/system/collections/caseinsensitivehashcodeprovider.cs @@ -7,7 +7,7 @@ ** ** Class: CaseInsensitiveHashCodeProvider ** -** Microsoft +** [....] ** ** ** Purpose: Designed to support hashtables which require diff --git a/mscorlib/system/collections/collectionbase.cs b/mscorlib/system/collections/collectionbase.cs index 02ea374d2..52355ea4c 100644 --- a/mscorlib/system/collections/collectionbase.cs +++ b/mscorlib/system/collections/collectionbase.cs @@ -5,7 +5,7 @@ // ==--== //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -// Microsoft +// [....] // namespace System.Collections { diff --git a/mscorlib/system/collections/comparer.cs b/mscorlib/system/collections/comparer.cs index 4509457f8..89a67deff 100644 --- a/mscorlib/system/collections/comparer.cs +++ b/mscorlib/system/collections/comparer.cs @@ -7,7 +7,7 @@ ** ** Class: Comparer ** -** Microsoft +** [....] ** ** ** Purpose: Default IComparer implementation. diff --git a/mscorlib/system/collections/compatiblecomparer.cs b/mscorlib/system/collections/compatiblecomparer.cs index 92760855b..a19337c90 100644 --- a/mscorlib/system/collections/compatiblecomparer.cs +++ b/mscorlib/system/collections/compatiblecomparer.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System.Diagnostics.Contracts; diff --git a/mscorlib/system/collections/dictionarybase.cs b/mscorlib/system/collections/dictionarybase.cs index a8bfc680c..022cc7355 100644 --- a/mscorlib/system/collections/dictionarybase.cs +++ b/mscorlib/system/collections/dictionarybase.cs @@ -5,7 +5,7 @@ // ==--== //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -// Microsoft +// [....] // namespace System.Collections { diff --git a/mscorlib/system/collections/dictionaryentry.cs b/mscorlib/system/collections/dictionaryentry.cs index 34ccbc28c..fe2e34148 100644 --- a/mscorlib/system/collections/dictionaryentry.cs +++ b/mscorlib/system/collections/dictionaryentry.cs @@ -7,7 +7,7 @@ ** ** Interface: DictionaryEntry ** -** Microsoft +** [....] ** ** ** Purpose: Return Value for IDictionaryEnumerator::GetEntry diff --git a/mscorlib/system/collections/emptyreadonlydictionaryinternal.cs b/mscorlib/system/collections/emptyreadonlydictionaryinternal.cs index 5fab81ba4..da84bb45f 100644 --- a/mscorlib/system/collections/emptyreadonlydictionaryinternal.cs +++ b/mscorlib/system/collections/emptyreadonlydictionaryinternal.cs @@ -7,7 +7,7 @@ ** ** Class: EmptyReadOnlyDictionaryInternal ** -** Microsoft +** [....] ** ** ** Purpose: List for exceptions. diff --git a/mscorlib/system/collections/generic/arraysorthelper.cs b/mscorlib/system/collections/generic/arraysorthelper.cs index 6fa9b12e3..961482b65 100644 --- a/mscorlib/system/collections/generic/arraysorthelper.cs +++ b/mscorlib/system/collections/generic/arraysorthelper.cs @@ -7,7 +7,7 @@ ** ** Class: ArraySortHelper ** -** Microsoft +** [....] ** ** ** Purpose: class to sort arrays diff --git a/mscorlib/system/collections/generic/comparer.cs b/mscorlib/system/collections/generic/comparer.cs index 275b0c496..ec1fcd681 100644 --- a/mscorlib/system/collections/generic/comparer.cs +++ b/mscorlib/system/collections/generic/comparer.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/collections/generic/debugview.cs b/mscorlib/system/collections/generic/debugview.cs index ac847ec06..e82dda98c 100644 --- a/mscorlib/system/collections/generic/debugview.cs +++ b/mscorlib/system/collections/generic/debugview.cs @@ -9,7 +9,7 @@ ** ** Purpose: DebugView class for generic collections ** -** Microsoft +** [....] ** ** =============================================================================*/ diff --git a/mscorlib/system/collections/generic/dictionary.cs b/mscorlib/system/collections/generic/dictionary.cs index 92b7c2ac5..74859fa7f 100644 --- a/mscorlib/system/collections/generic/dictionary.cs +++ b/mscorlib/system/collections/generic/dictionary.cs @@ -7,7 +7,7 @@ ** ** Class: Dictionary ** -** Microsoft +** [....] ** ** Purpose: Generic hash table implementation ** diff --git a/mscorlib/system/collections/generic/equalitycomparer.cs b/mscorlib/system/collections/generic/equalitycomparer.cs index f3118216f..7064b3978 100644 --- a/mscorlib/system/collections/generic/equalitycomparer.cs +++ b/mscorlib/system/collections/generic/equalitycomparer.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/collections/generic/keynotfoundexception.cs b/mscorlib/system/collections/generic/keynotfoundexception.cs index c8afceb30..10477931a 100644 --- a/mscorlib/system/collections/generic/keynotfoundexception.cs +++ b/mscorlib/system/collections/generic/keynotfoundexception.cs @@ -7,7 +7,7 @@ ** ** Class: KeyNotFoundException ** -** Microsoft +** [....] ** ** ** Purpose: Exception class for Hashtable and Dictionary. diff --git a/mscorlib/system/collections/generic/keyvaluepair.cs b/mscorlib/system/collections/generic/keyvaluepair.cs index d6e298ee5..24baeb3f2 100644 --- a/mscorlib/system/collections/generic/keyvaluepair.cs +++ b/mscorlib/system/collections/generic/keyvaluepair.cs @@ -7,7 +7,7 @@ ** ** Interface: KeyValuePair ** -** Microsoft +** [....] ** ** ** Purpose: Generic key-value pair for dictionary enumerators. diff --git a/mscorlib/system/collections/generic/list.cs b/mscorlib/system/collections/generic/list.cs index fbf8b5020..5803c382d 100644 --- a/mscorlib/system/collections/generic/list.cs +++ b/mscorlib/system/collections/generic/list.cs @@ -7,7 +7,7 @@ ** ** Class: List ** -** Microsoft +** [....] ** ** Purpose: Implements a generic, dynamically sized list as an ** array. diff --git a/mscorlib/system/collections/hashtable.cs b/mscorlib/system/collections/hashtable.cs index ee14bfa52..6998dde77 100644 --- a/mscorlib/system/collections/hashtable.cs +++ b/mscorlib/system/collections/hashtable.cs @@ -7,7 +7,7 @@ ** ** Class: Hashtable ** -** Microsoft +** [....] ** ** ** Purpose: Hash table implementation @@ -74,58 +74,58 @@ namespace System.Collections { public class Hashtable : IDictionary, ISerializable, IDeserializationCallback, ICloneable { /* Implementation Notes: - The generic Dictionary was copied from Hashtable's source - any - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + The generic Dictionary was copied from Hashtable's source - any bug + fixes here probably need to be made to the generic Dictionary as well. + + This Hashtable uses double hashing. There are hashsize buckets in the + table, and each bucket can contain 0 or 1 element. We a bit to mark + whether there's been a collision when we inserted multiple elements + (ie, an inserted item was hashed at least a second time and we probed + this bucket, but it was already in use). Using the collision bit, we + can terminate lookups & removes for elements that aren't in the hash + table more quickly. We steal the most significant bit from the hash code + to store the collision bit. + + Our hash function is of the following form: + + h(key, n) = h1(key) + n*h2(key) + + where n is the number of times we've hit a collided bucket and rehashed + (on this particular lookup). Here are our hash functions: + + h1(key) = GetHash(key); // default implementation calls key.GetHashCode(); + h2(key) = 1 + (((h1(key) >> 5) + 1) % (hashsize - 1)); + + The h1 can return any number. h2 must return a number between 1 and + hashsize - 1 that is relatively prime to hashsize (not a problem if + hashsize is prime). (Knuth's Art of Computer Programming, Vol. 3, p. 528-9) + If this is true, then we are guaranteed to visit every bucket in exactly + hashsize probes, since the least common multiple of hashsize and h2(key) + will be hashsize * h2(key). (This is the first number where adding h2 to + h1 mod hashsize will be 0 and we will search the same bucket twice). + + We previously used a different h2(key, n) that was not constant. That is a + horrifically bad idea, unless you can prove that series will never produce + any identical numbers that overlap when you mod them by hashsize, for all + subranges from i to i+hashsize, for all i. It's not worth investigating, + since there was no clear benefit from using that hash function, and it was + broken. + + For efficiency reasons, we've implemented this by storing h1 and h2 in a + temporary, and setting a variable called seed equal to h1. We do a probe, + and if we collided, we simply add h2 to seed each time through the loop. + + A good test for h2() is to subclass Hashtable, provide your own implementation + of GetHash() that returns a constant, then add many items to the hash table. + Make sure Count equals the number of items you inserted. + Note that when we remove an item from the hash table, we set the key + equal to buckets, if there was a collision in this bucket. Otherwise + we'd either wipe out the collision bit, or we'd still have an item in + the hash table. -*/ + -- + */ internal const Int32 HashPrime = 101; private const Int32 InitialSize = 3; diff --git a/mscorlib/system/collections/keyvaluepairs.cs b/mscorlib/system/collections/keyvaluepairs.cs index 06aeb0975..345e2b506 100644 --- a/mscorlib/system/collections/keyvaluepairs.cs +++ b/mscorlib/system/collections/keyvaluepairs.cs @@ -7,7 +7,7 @@ ** ** Class: KeyValuePairs ** -** Microsoft +** [....] ** ** ** Purpose: KeyValuePairs to display items in collection class under debugger diff --git a/mscorlib/system/collections/listdictionaryinternal.cs b/mscorlib/system/collections/listdictionaryinternal.cs index b24b03ba7..db4fe1d05 100644 --- a/mscorlib/system/collections/listdictionaryinternal.cs +++ b/mscorlib/system/collections/listdictionaryinternal.cs @@ -8,7 +8,7 @@ ** ** Class: ListDictionaryInternal ** -** Microsoft +** [....] ** ** ** Purpose: List for exceptions. diff --git a/mscorlib/system/collections/objectmodel/collection.cs b/mscorlib/system/collections/objectmodel/collection.cs index 81eda7eda..6f8b53c88 100644 --- a/mscorlib/system/collections/objectmodel/collection.cs +++ b/mscorlib/system/collections/objectmodel/collection.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Collections.ObjectModel diff --git a/mscorlib/system/collections/objectmodel/keyedcollection.cs b/mscorlib/system/collections/objectmodel/keyedcollection.cs index 6fb157925..014d889c4 100644 --- a/mscorlib/system/collections/objectmodel/keyedcollection.cs +++ b/mscorlib/system/collections/objectmodel/keyedcollection.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Collections.ObjectModel diff --git a/mscorlib/system/collections/objectmodel/readonlycollection.cs b/mscorlib/system/collections/objectmodel/readonlycollection.cs index 30ab5372f..760349f81 100644 --- a/mscorlib/system/collections/objectmodel/readonlycollection.cs +++ b/mscorlib/system/collections/objectmodel/readonlycollection.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Collections.ObjectModel diff --git a/mscorlib/system/collections/queue.cs b/mscorlib/system/collections/queue.cs index edfcd0873..ba67a2a31 100644 --- a/mscorlib/system/collections/queue.cs +++ b/mscorlib/system/collections/queue.cs @@ -7,7 +7,7 @@ ** ** Class: Queue ** -** Microsoft +** [....] ** ** Purpose: A circular-array implementation of a queue. ** diff --git a/mscorlib/system/collections/readonlycollectionbase.cs b/mscorlib/system/collections/readonlycollectionbase.cs index c83271d24..cf07d664e 100644 --- a/mscorlib/system/collections/readonlycollectionbase.cs +++ b/mscorlib/system/collections/readonlycollectionbase.cs @@ -5,7 +5,7 @@ // ==--== //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -// Microsoft +// [....] // namespace System.Collections { diff --git a/mscorlib/system/collections/sortedlist.cs b/mscorlib/system/collections/sortedlist.cs index 6e50be2d2..bb7b853fa 100644 --- a/mscorlib/system/collections/sortedlist.cs +++ b/mscorlib/system/collections/sortedlist.cs @@ -7,7 +7,7 @@ ** ** Class: SortedList ** -** Microsoft +** [....] ** ** Purpose: A sorted dictionary. ** diff --git a/mscorlib/system/collections/stack.cs b/mscorlib/system/collections/stack.cs index de575ffbd..158089a62 100644 --- a/mscorlib/system/collections/stack.cs +++ b/mscorlib/system/collections/stack.cs @@ -7,7 +7,7 @@ ** ** Class: Stack ** -** Microsoft +** [....] ** ** Purpose: An array implementation of a stack. ** @@ -30,7 +30,7 @@ public class Stack : ICollection, ICloneable { private Object[] _array; // Storage for stack elements [ContractPublicPropertyName("Count")] private int _size; // Number of items in the stack. - private int _version; // Used to keep enumerator in sync w/ collection. + private int _version; // Used to keep enumerator in [....] w/ collection. [NonSerialized] private Object _syncRoot; diff --git a/mscorlib/system/collections/structuralcomparisons.cs b/mscorlib/system/collections/structuralcomparisons.cs index e5a1aa556..4d4252aaa 100644 --- a/mscorlib/system/collections/structuralcomparisons.cs +++ b/mscorlib/system/collections/structuralcomparisons.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/delegate.cs b/mscorlib/system/delegate.cs index 3bc7e77bd..998b13fbd 100644 --- a/mscorlib/system/delegate.cs +++ b/mscorlib/system/delegate.cs @@ -796,7 +796,7 @@ internal virtual Object GetTarget() } // These flags effect the way BindToMethodInfo and BindToMethodName are allowed to bind a delegate to a target method. Their - // values must be kept in sync with the definition in vm\comdelegate.h. + // values must be kept in [....] with the definition in vm\comdelegate.h. internal enum DelegateBindingFlags { StaticMethodOnly = 0x00000001, // Can only bind to static target methods diff --git a/mscorlib/system/diagnostics/assert.cs b/mscorlib/system/diagnostics/assert.cs index c737904c4..8b886267b 100644 --- a/mscorlib/system/diagnostics/assert.cs +++ b/mscorlib/system/diagnostics/assert.cs @@ -15,8 +15,8 @@ namespace System.Diagnostics { // Class which handles code asserts. Asserts are used to explicitly protect // assumptions made in the code. In general if an assert fails, it indicates - // a program - + // a program bug so is immediately called to the attention of the user. + // Only static data members, does not need to be marked with the serializable attribute internal static class Assert { internal const int COR_E_FAILFAST = unchecked((int) 0x80131623); @@ -102,13 +102,13 @@ internal static void Fail(String conditionString, String message, String windowT #else // This assert dialog will be common for code contract failures. If a code contract failure // occurs on an end user machine, we believe the right experience is to do a FailFast, which - // will report this error via Watson, so someone could theoretically fix the - - - - - - + // will report this error via Watson, so someone could theoretically fix the bug. + // However, in CLR v4, Environment.FailFast when a debugger is attached gives you an MDA + // saying you've hit a bug in the runtime or unsafe managed code, and this is most likely caused + // by heap corruption or a stack imbalance from COM Interop or P/Invoke. That extremely + // misleading error isn't right, and we can temporarily work around this by using Environment.Exit + // if a debugger is attached. The right fix is to plumb FailFast correctly through our native + // Watson code, adding in a TypeOfReportedError for fatal managed errors. if (Debugger.IsAttached) Environment._Exit(exitCode); else diff --git a/mscorlib/system/diagnostics/contracts/contracts.cs b/mscorlib/system/diagnostics/contracts/contracts.cs index e2fc7888f..fe943007d 100644 --- a/mscorlib/system/diagnostics/contracts/contracts.cs +++ b/mscorlib/system/diagnostics/contracts/contracts.cs @@ -7,7 +7,7 @@ ** ** Class: Contract ** -** Microsoft,mbarnett +** [....],mbarnett ** ** Purpose: The contract class allows for expressing preconditions, ** postconditions, and object invariants about methods in source diff --git a/mscorlib/system/diagnostics/contracts/contractsbcl.cs b/mscorlib/system/diagnostics/contracts/contractsbcl.cs index d021a995d..644e05605 100644 --- a/mscorlib/system/diagnostics/contracts/contractsbcl.cs +++ b/mscorlib/system/diagnostics/contracts/contractsbcl.cs @@ -7,7 +7,7 @@ ** ** Class: Contract ** -** maf,mbarnett,Microsoft +** maf,mbarnett,[....] ** ** Implementation details of CLR Contracts. ** diff --git a/mscorlib/system/diagnostics/eventing/TraceLogging/SimpleTypeInfos.cs b/mscorlib/system/diagnostics/eventing/TraceLogging/SimpleTypeInfos.cs index f08ef29f5..cd70bfb23 100644 --- a/mscorlib/system/diagnostics/eventing/TraceLogging/SimpleTypeInfos.cs +++ b/mscorlib/system/diagnostics/eventing/TraceLogging/SimpleTypeInfos.cs @@ -653,7 +653,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (Byte)value; + return value; } } @@ -675,7 +675,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (SByte)value; + return value; } } @@ -697,7 +697,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (Int16)value; + return value; } } @@ -719,7 +719,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (UInt16)value; + return value; } } @@ -741,7 +741,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (Int32)value; + return value; } } @@ -763,7 +763,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (UInt32)value; + return value; } } @@ -785,7 +785,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (Int64)value; + return value; } } @@ -807,7 +807,7 @@ public override void WriteData(TraceLoggingDataCollector collector, ref EnumType public override object GetData(object value) { - return (UInt64)value; + return value; } } diff --git a/mscorlib/system/diagnostics/eventing/activitytracker.cs b/mscorlib/system/diagnostics/eventing/activitytracker.cs index 6d33bb5fe..633183d94 100644 --- a/mscorlib/system/diagnostics/eventing/activitytracker.cs +++ b/mscorlib/system/diagnostics/eventing/activitytracker.cs @@ -526,7 +526,7 @@ private static unsafe void WriteNibble(ref byte* ptr, byte* endPtr, uint value) } // This callback is used to initialize the m_current AsyncLocal Variable. - // Its job is to keep the ETW Activity ID (part of thread local storage) in sync + // Its job is to keep the ETW Activity ID (part of thread local storage) in [....] // with m_current.ActivityID void ActivityChanging(AsyncLocalValueChangedArgs args) { diff --git a/mscorlib/system/diagnostics/eventing/eventdescriptor.cs b/mscorlib/system/diagnostics/eventing/eventdescriptor.cs index 60eae4d2d..f8f4afe95 100644 --- a/mscorlib/system/diagnostics/eventing/eventdescriptor.cs +++ b/mscorlib/system/diagnostics/eventing/eventdescriptor.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] //------------------------------------------------------------------------------ using System; using System.Runtime.InteropServices; diff --git a/mscorlib/system/diagnostics/eventing/eventsource.cs b/mscorlib/system/diagnostics/eventing/eventsource.cs index 496529829..a1b518512 100644 --- a/mscorlib/system/diagnostics/eventing/eventsource.cs +++ b/mscorlib/system/diagnostics/eventing/eventsource.cs @@ -1,4 +1,5 @@ // Copyright (c) Microsoft Corporation. All rights reserved +// Copyright (c) Microsoft Corporation. All rights reserved // This program uses code hyperlinks available as part of the HyperAddin Visual Studio plug-in. // It is available from http://www.codeplex.com/hyperAddin #define FEATURE_MANAGED_ETW @@ -1181,7 +1182,7 @@ protected unsafe void WriteEventWithRelatedActivityIdCore(int eventId, Guid* rel } #if FEATURE_ACTIVITYSAMPLING - // this code should be kept in sync with WriteEventVarargs(). + // this code should be kept in [....] with WriteEventVarargs(). SessionMask etwSessions = SessionMask.All; // only compute etwSessions if there are *any* ETW filters enabled... if ((ulong)m_curLiveSessions != 0) @@ -1892,7 +1893,7 @@ private unsafe void WriteEventVarargs(int eventId, Guid* childActivityID, object } #if FEATURE_ACTIVITYSAMPLING - // this code should be kept in sync with WriteEventWithRelatedActivityIdCore(). + // this code should be kept in [....] with WriteEventWithRelatedActivityIdCore(). SessionMask etwSessions = SessionMask.All; // only compute etwSessions if there are *any* ETW filters enabled... if ((ulong)m_curLiveSessions != 0) @@ -3298,23 +3299,27 @@ private static byte[] CreateManifestAndDescriptors(Type eventSourceType, string } else if (eventAttribute.Opcode == EventOpcode.Stop) { - // Find the start associated with this stop event. We requre start to be immediately before the stop + // Find the start associated with this stop event. We require start to be immediately before the stop int startEventId = eventAttribute.EventId - 1; - Contract.Assert(0 <= startEventId); // Since we reserve id 0, we know that id-1 is <= 0 - EventMetadata startEventMetadata = eventData[startEventId]; - - // If you remove the Stop and add a Start does that name match the Start Event's Name? - // Ideally we would throw an error - string taskName = eventName.Substring(0, eventName.Length - s_ActivityStopSuffix.Length); // Remove the Stop suffix to get the task name - if (startEventMetadata.Descriptor.Opcode == (byte)EventOpcode.Start && - string.Compare(startEventMetadata.Name, 0, taskName, 0, taskName.Length) == 0 && - string.Compare(startEventMetadata.Name, taskName.Length, s_ActivityStartSuffix, 0, Math.Max(startEventMetadata.Name.Length - taskName.Length, s_ActivityStartSuffix.Length)) == 0) + if (eventData != null && startEventId < eventData.Length) { - - // Make the stop event match the start event - eventAttribute.Task = (EventTask)startEventMetadata.Descriptor.Task; + Contract.Assert(0 <= startEventId); // Since we reserve id 0, we know that id-1 is <= 0 + EventMetadata startEventMetadata = eventData[startEventId]; + + // If you remove the Stop and add a Start does that name match the Start Event's Name? + // Ideally we would throw an error + string taskName = eventName.Substring(0, eventName.Length - s_ActivityStopSuffix.Length); // Remove the Stop suffix to get the task name + if (startEventMetadata.Descriptor.Opcode == (byte)EventOpcode.Start && + string.Compare(startEventMetadata.Name, 0, taskName, 0, taskName.Length) == 0 && + string.Compare(startEventMetadata.Name, taskName.Length, s_ActivityStartSuffix, 0, Math.Max(startEventMetadata.Name.Length - taskName.Length, s_ActivityStartSuffix.Length)) == 0) + { + + // Make the stop event match the start event + eventAttribute.Task = (EventTask)startEventMetadata.Descriptor.Task; + noTask = false; + } } - else if ((flags & EventManifestOptions.Strict) != 0) // Throw an error if we can compatibly. + if (noTask && (flags & EventManifestOptions.Strict) != 0) // Throw an error if we can compatibly. throw new ArgumentException(Environment.GetResourceString("EventSource_StopsFollowStarts")); } } @@ -3551,8 +3556,14 @@ private static void DebugCheckEvent(ref Dictionary eventsByName, manifest.ManifestError(Environment.GetResourceString("EventSource_EventIdReused", evtName, evtId, eventData[evtId].Name), true); } + // We give a task to things if they don't have one. + Contract.Assert(eventAttribute.Task != EventTask.None || eventAttribute.Opcode != EventOpcode.Info); for (int idx = 0; idx < eventData.Length; ++idx) { + // skip unused Event IDs. + if (eventData[idx].Name == null) + continue; + if (eventData[idx].Descriptor.Task == (int)eventAttribute.Task && eventData[idx].Descriptor.Opcode == (int)eventAttribute.Opcode) { manifest.ManifestError(Environment.GetResourceString("EventSource_TaskOpcodePairReused", @@ -4237,7 +4248,7 @@ internal static void AddEventSource(EventSource newEventSource) // to throw a COMPLUS_BOOT_EXCEPTION. The guideline we give is that you must unregister // such callbacks on process shutdown or appdomain so that unmanaged code will never // do this. This is what this callback is for. - // See + // See bug 724140 for more private static void DisposeOnShutdown(object sender, EventArgs e) { foreach (var esRef in s_EventSources) @@ -4656,7 +4667,7 @@ public EventLevel Level { get { - if ((uint)EventId >= (uint)m_eventSource.m_eventData.Length) + if (EventId < 0) return EventLevel.LogAlways; return (EventLevel)m_eventSource.m_eventData[EventId].Descriptor.Level; } diff --git a/mscorlib/system/diagnostics/eventing/frameworkeventsource.cs b/mscorlib/system/diagnostics/eventing/frameworkeventsource.cs index f20eaa19b..fbd51c70f 100644 --- a/mscorlib/system/diagnostics/eventing/frameworkeventsource.cs +++ b/mscorlib/system/diagnostics/eventing/frameworkeventsource.cs @@ -6,8 +6,8 @@ // // ResourcesEtwProvider.cs // -// Microsoft -// Microsoft +// [....] +// [....] // // Managed event source for things that can version with MSCORLIB. // diff --git a/mscorlib/system/environment.cs b/mscorlib/system/environment.cs index 9c94d4195..5e9b986bd 100644 --- a/mscorlib/system/environment.cs +++ b/mscorlib/system/environment.cs @@ -164,12 +164,12 @@ private void GetResourceStringCode(Object userDataIn) return; } rh.infinitelyRecursingCount++; - // This is often a - - - - - + // This is often a bug in the BCL, security, NLS+ code, + // or the loader somewhere. However, this could also + // be a setup problem - check whether mscorlib & + // clr.dll are both of the same build flavor. Also, user + // code in the resource lookup process (like an assembly + // resolve event or custom CultureInfo) might potentially cause issues. // Note: our infrastructure for reporting this exception will again cause resource lookup. // This is the most direct way of dealing with that problem. diff --git a/mscorlib/system/exception.cs b/mscorlib/system/exception.cs index bae8755d5..c1e9a3fad 100644 --- a/mscorlib/system/exception.cs +++ b/mscorlib/system/exception.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] // // ==--== /*============================================================================= diff --git a/mscorlib/system/executionengineexception.cs b/mscorlib/system/executionengineexception.cs index 6e928d517..493228346 100644 --- a/mscorlib/system/executionengineexception.cs +++ b/mscorlib/system/executionengineexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] // /*============================================================================= ** diff --git a/mscorlib/system/globalization/Persiancalendar.cs b/mscorlib/system/globalization/Persiancalendar.cs index 5eb368bac..cdcbe04a2 100644 --- a/mscorlib/system/globalization/Persiancalendar.cs +++ b/mscorlib/system/globalization/Persiancalendar.cs @@ -13,7 +13,7 @@ namespace System.Globalization { // //////////////////////////////////////////////////////////////////////////// // Modern Persian calendar is a solar observation based calendar. Each new year begins on the day when the vernal equinox occurs before noon. - // The epoch is the date of the vernal equinox prior to the epoch of the Islamic calendar (Microsoft 19, 622 Julian or Microsoft 22, 622 Gregorian) + // The epoch is the date of the vernal equinox prior to the epoch of the Islamic calendar ([....] 19, 622 Julian or [....] 22, 622 Gregorian) // There is no Persian year 0. Ordinary years have 365 days. Leap years have 366 days with the last month (Esfand) gaining the extra day. /* diff --git a/mscorlib/system/globalization/calendar.cs b/mscorlib/system/globalization/calendar.cs index 9b0ca90b5..44840fdca 100644 --- a/mscorlib/system/globalization/calendar.cs +++ b/mscorlib/system/globalization/calendar.cs @@ -19,7 +19,7 @@ namespace System.Globalization { // , 46, 8, 20, 3, 1999) in the Gregorian calendar. An implementation of // Calendar can map any DateTime value to such an n-tuple and vice versa. The // DateTimeFormat class can map between such n-tuples and a textual - // representation such as "8:46 AM Microsoft 20th 1999 AD". + // representation such as "8:46 AM [....] 20th 1999 AD". // // Most calendars identify a year which begins the current era. There may be any // number of previous eras. The Calendar class identifies the eras as enumerated diff --git a/mscorlib/system/globalization/calendardata.cs b/mscorlib/system/globalization/calendardata.cs index bc1761915..85d21351a 100644 --- a/mscorlib/system/globalization/calendardata.cs +++ b/mscorlib/system/globalization/calendardata.cs @@ -24,7 +24,7 @@ namespace System.Globalization // properties are available without locales using CalendarData.GetCalendar(int) // StructLayout is needed here otherwise compiler can re-arrange the fields. - // We have to keep this in-sync with the definition in calendardata.h + // We have to keep this in-[....] with the definition in calendardata.h // // WARNING WARNING WARNING // diff --git a/mscorlib/system/globalization/culturedata.cs b/mscorlib/system/globalization/culturedata.cs index ee33b115b..b128980d0 100644 --- a/mscorlib/system/globalization/culturedata.cs +++ b/mscorlib/system/globalization/culturedata.cs @@ -55,7 +55,7 @@ namespace System.Globalization // // StructLayout is needed here otherwise compiler can re-arrange the fields. - // We have to keep this in-sync with the definition in comnlsinfo.h + // We have to keep this in-[....] with the definition in comnlsinfo.h // // WARNING WARNING WARNING // @@ -1186,24 +1186,10 @@ internal String SLOCALIZEDDISPLAYNAME if (this.sLocalizedDisplayName == null) { #if !FEATURE_CORECLR - if (this.IsSupplementalCustomCulture) + String resourceKey = "Globalization.ci_" + this.sName; + if (IsResourcePresent(resourceKey)) { - if (this.IsNeutralCulture) - { - this.sLocalizedDisplayName = this.SNATIVELANGUAGE; - } - else - { - this.sLocalizedDisplayName = this.SNATIVEDISPLAYNAME; - } - } - else - { - String resourceKey = "Globalization.ci_" + this.sName; - if (IsResourcePresent(resourceKey)) - { - this.sLocalizedDisplayName = Environment.GetResourceString(resourceKey); - } + this.sLocalizedDisplayName = Environment.GetResourceString(resourceKey); } #endif // If it hasn't been found (Windows 8 and up), fallback to the system @@ -1323,7 +1309,7 @@ internal String SNATIVEDISPLAYNAME #if !FEATURE_CORECLR if (IsIncorrectNativeLanguageForSinhala()) { - // work around + // work around bug in Windows 7 for native name of Sinhala this.sNativeDisplayName ="\x0dc3\x0dd2\x0d82\x0dc4\x0dbd (\x0DC1\x0DCA\x200D\x0DBB\x0DD3\x0020\x0DBD\x0D82\x0D9A\x0DCF)"; } else @@ -1452,7 +1438,7 @@ internal String SNATIVELANGUAGE #if !FEATURE_CORECLR if (IsIncorrectNativeLanguageForSinhala()) { - // work around + // work around bug in Windows 7 for native language of Sinhala this.sNativeLanguage = "\x0dc3\x0dd2\x0d82\x0dc4\x0dbd"; } else @@ -1525,17 +1511,10 @@ internal string SLOCALIZEDCOUNTRY if (this.sLocalizedCountry == null) { #if !FEATURE_CORECLR - if (this.IsSupplementalCustomCulture) - { - this.sLocalizedCountry = SNATIVECOUNTRY; - } - else + String resourceKey = "Globalization.ri_" + this.SREGIONNAME; + if (IsResourcePresent(resourceKey)) { - String resourceKey = "Globalization.ri_" + this.SREGIONNAME; - if (IsResourcePresent(resourceKey)) - { - this.sLocalizedCountry = Environment.GetResourceString(resourceKey); - } + this.sLocalizedCountry = Environment.GetResourceString(resourceKey); } #endif // If it hasn't been found (Windows 8 and up), fallback to the system diff --git a/mscorlib/system/globalization/cultureinfo.cs b/mscorlib/system/globalization/cultureinfo.cs index b3cf1c0cb..07c0f1472 100644 --- a/mscorlib/system/globalization/cultureinfo.cs +++ b/mscorlib/system/globalization/cultureinfo.cs @@ -14,7 +14,7 @@ // as well as methods for common operations such as printing // dates and sorting strings. // -// Date: Microsoft 31, 1999 +// Date: [....] 31, 1999 // // // !!!! NOTE WHEN CHANGING THIS CLASS !!!! diff --git a/mscorlib/system/globalization/datetimeformat.cs b/mscorlib/system/globalization/datetimeformat.cs index 9553307f7..4b29fb1f5 100644 --- a/mscorlib/system/globalization/datetimeformat.cs +++ b/mscorlib/system/globalization/datetimeformat.cs @@ -709,11 +709,11 @@ private static void FormatCustomizedTimeZone(DateTime dateTime, TimeSpan offset, #if FEATURE_CORECLR offset = TimeSpan.Zero; #else // FEATURE_CORECLR - // This code path points to a - - - - + // This code path points to a bug in user code. It would make sense to return a 0 offset in this case. + // However, because it was only possible to detect this in Whidbey, there is user code that takes a + // dependency on being serialize a UTC DateTime using the 'z' format, and it will work almost all the + // time if it is offset by an incorrect conversion to local time when parsed. Therefore, we need to + // explicitly emit the local time offset, which we can do by removing the UTC flag. InvalidFormatForUtc(format, dateTime); dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Local); offset = TimeZoneInfo.GetLocalUtcOffset(dateTime, TimeZoneInfoOptions.NoThrowOnInvalidTime); diff --git a/mscorlib/system/globalization/datetimeparse.cs b/mscorlib/system/globalization/datetimeparse.cs index 47f9eb7d9..c521139c1 100644 --- a/mscorlib/system/globalization/datetimeparse.cs +++ b/mscorlib/system/globalization/datetimeparse.cs @@ -1,4 +1,4 @@ -// ==++== +// ==++== // // Copyright (c) Microsoft Corporation. All rights reserved. // @@ -699,6 +699,20 @@ private static Boolean Lex(DS dps, ref __DTString str, ref DateTimeToken dtok, r case TokenType.SEP_Date: dtok.dtt = DTT.YearDateSep; break; + + case TokenType.SEP_Time: + if (!raw.hasSameDateAndTimeSeparators) + { + result.SetFailure(ParseFailureKind.Format, "Format_BadDateTime", null); + LexTraceExit("0040 (Invalid separator after number)", dps); + return false; + } + + // we have the date and time separators are same and getting a year number, then change the token to YearDateSep as + // we are sure we are not parsing time. + dtok.dtt = DTT.YearDateSep; + break; + case TokenType.SEP_DateOrOffset: // The separator is either a date separator or the start of a time zone offset. If the token will complete the date then // process just the number and roll back the index so that the outer loop can attempt to parse the time zone offset. @@ -804,6 +818,14 @@ private static Boolean Lex(DS dps, ref __DTString str, ref DateTimeToken dtok, r raw.AddNumber(dtok.num); break; case TokenType.SEP_Time: + if (raw.hasSameDateAndTimeSeparators && + (dps == DS.D_Y || dps == DS.D_YN || dps == DS.D_YNd || dps == DS.D_YM || dps == DS.D_YMd)) + { + // we are parsing a date and we have the time separator same as date separator, so we mark the token as date separator + dtok.dtt = DTT.NumDatesep; + raw.AddNumber(dtok.num); + break; + } dtok.dtt = DTT.NumTimesep; raw.AddNumber(dtok.num); break; @@ -949,6 +971,18 @@ private static Boolean Lex(DS dps, ref __DTString str, ref DateTimeToken dtok, r case TokenType.SEP_Date: dtok.dtt = DTT.MonthDatesep; break; + case TokenType.SEP_Time: + if (!raw.hasSameDateAndTimeSeparators) + { + result.SetFailure(ParseFailureKind.Format, "Format_BadDateTime", null); + LexTraceExit("0130 (Invalid separator after month name)", dps); + return false; + } + + // we have the date and time separators are same and getting a Month name, then change the token to MonthDatesep as + // we are sure we are not parsing time. + dtok.dtt = DTT.MonthDatesep; + break; case TokenType.SEP_DateOrOffset: // The separator is either a date separator or the start of a time zone offset. If the token will complete the date then // process just the number and roll back the index so that the outer loop can attempt to parse the time zone offset. @@ -2329,6 +2363,8 @@ internal static bool TryParse(String s, DateTimeFormatInfo dtfi, DateTimeStyles Int32 * numberPointer = stackalloc Int32[3]; raw.Init(numberPointer); } + raw.hasSameDateAndTimeSeparators = dtfi.DateSeparator.Equals(dtfi.TimeSeparator, StringComparison.Ordinal); + result.calendar = dtfi.Calendar; result.era = Calendar.CurrentEra; @@ -2390,6 +2426,38 @@ internal static bool TryParse(String s, DateTimeFormatInfo dtfi, DateTimeStyles } } + if (raw.hasSameDateAndTimeSeparators) + { + if (dtok.dtt == DTT.YearEnd || dtok.dtt == DTT.YearSpace || dtok.dtt == DTT.YearDateSep) + { + // When time and date separators are same and we are hitting a year number while the first parsed part of the string was recognized + // as part of time (and not a date) DS.T_Nt, DS.T_NNt then change the state to be a date so we try to parse it as a date instead + if (dps == DS.T_Nt) + { + dps = DS.D_Nd; + } + if (dps == DS.T_NNt) + { + dps = DS.D_NNd; + } + } + + bool atEnd = str.AtEnd(); + if (dateParsingStates[(int)dps][(int)dtok.dtt] == DS.ERROR || atEnd) + { + switch (dtok.dtt) + { + // we have the case of Serbia have dates in forms 'd.M.yyyy.' so we can expect '.' after the date parts. + // changing the token to end with space instead of Date Separator will avoid failing the parsing. + + case DTT.YearDateSep: dtok.dtt = atEnd ? DTT.YearEnd : DTT.YearSpace; break; + case DTT.NumDatesep: dtok.dtt = atEnd ? DTT.NumEnd : DTT.NumSpace; break; + case DTT.NumTimesep: dtok.dtt = atEnd ? DTT.NumEnd : DTT.NumSpace; break; + case DTT.MonthDatesep: dtok.dtt = atEnd ? DTT.MonthEnd : DTT.MonthSpace; break; + } + } + } + // // Advance to the next state, and continue // @@ -4321,6 +4389,11 @@ internal bool GetNext() { return (false); } + internal bool AtEnd() + { + return Index < len ? false : true; + } + internal bool Advance(int count) { Contract.Assert(Index + count <= len, "__DTString::Advance: Index + count <= len"); Index += count; @@ -4833,6 +4906,7 @@ unsafe struct DateTimeRawInfo { internal int era; internal DateTimeParse.TM timeMark; internal double fraction; + internal bool hasSameDateAndTimeSeparators; // // < @@ -4983,7 +5057,7 @@ internal enum TokenType { YearNumberToken = 2, // The number which is considered as year number, which has 3 or more digits. E.g. "2003" Am = 3, // AM timemark. E.g. "AM" Pm = 4, // PM timemark. E.g. "PM" - MonthToken = 5, // A word (or words) that represents a month name. E.g. "Microsoft" + MonthToken = 5, // A word (or words) that represents a month name. E.g. "[....]" EndOfString = 6, // End of string DayOfWeekToken = 7, // A word (or words) that represents a day of week name. E.g. "Monday" or "Mon" TimeZoneToken = 8, // A word that represents a timezone name. E.g. "GMT" diff --git a/mscorlib/system/globalization/eastasianlunisolarcalendar.cs b/mscorlib/system/globalization/eastasianlunisolarcalendar.cs index 893503413..cab202119 100644 --- a/mscorlib/system/globalization/eastasianlunisolarcalendar.cs +++ b/mscorlib/system/globalization/eastasianlunisolarcalendar.cs @@ -303,7 +303,7 @@ internal void GregorianToLunar(int nSYear, int nSMonth, int nSDate, ref int nLYe // convert solar day into lunar day. // subtract off the beginning part of the solar year which is not // part of the lunar year. since this part is always in Jan or Feb, - // we don't need to handle Leap Year (LY only affects Microsoft + // we don't need to handle Leap Year (LY only affects [....] // and later). nLunarDay -= DaysToMonth365[nJan1Month-1]; nLunarDay -= (nJan1Date - 1); diff --git a/mscorlib/system/globalization/hebrewnumber.cs b/mscorlib/system/globalization/hebrewnumber.cs index 4bb6202e6..8c96b12e3 100644 --- a/mscorlib/system/globalization/hebrewnumber.cs +++ b/mscorlib/system/globalization/hebrewnumber.cs @@ -140,7 +140,7 @@ internal static String ToString(int Number) { cTens = '\x05db'; // Hebrew Letter Kaf break; case ( 3 ) : - cTens = '\x05dc'; // Hebrew Letter Lamed + cTens = '\x05dc'; // Hebrew Letter ----d break; case ( 4 ) : cTens = '\x05de'; // Hebrew Letter Mem @@ -256,7 +256,7 @@ internal HebrewValue(HebrewToken token, int value) { new HebrewValue(HebrewToken.Digit10, 10) , // '\x05d9; // Hebrew Letter Yod new HebrewValue(HebrewToken.Invalid, -1) , // '\x05da; new HebrewValue(HebrewToken.Digit10, 20) , // '\x05db; // Hebrew Letter Kaf - new HebrewValue(HebrewToken.Digit10, 30) , // '\x05dc; // Hebrew Letter Lamed + new HebrewValue(HebrewToken.Digit10, 30) , // '\x05dc; // Hebrew Letter ----d new HebrewValue(HebrewToken.Invalid, -1) , // '\x05dd; new HebrewValue(HebrewToken.Digit10, 40) , // '\x05de; // Hebrew Letter Mem new HebrewValue(HebrewToken.Invalid, -1) , // '\x05df; diff --git a/mscorlib/system/globalization/regioninfo.cs b/mscorlib/system/globalization/regioninfo.cs index 16503897c..c27177b8e 100644 --- a/mscorlib/system/globalization/regioninfo.cs +++ b/mscorlib/system/globalization/regioninfo.cs @@ -14,7 +14,7 @@ // preferences of the user and does not depend on the user's // language or culture. // -// Date: Microsoft 31, 1999 +// Date: [....] 31, 1999 // //////////////////////////////////////////////////////////////////////////// diff --git a/mscorlib/system/globalization/stringinfo.cs b/mscorlib/system/globalization/stringinfo.cs index f39ac8c43..efd5cada4 100644 --- a/mscorlib/system/globalization/stringinfo.cs +++ b/mscorlib/system/globalization/stringinfo.cs @@ -11,7 +11,7 @@ // A writing system is the collection of scripts and // orthographic rules required to represent a language as text. // -// Date: Microsoft 31, 1999 +// Date: [....] 31, 1999 // //////////////////////////////////////////////////////////////////////////// diff --git a/mscorlib/system/globalization/textelementenumerator.cs b/mscorlib/system/globalization/textelementenumerator.cs index 57b17ae07..503a249df 100644 --- a/mscorlib/system/globalization/textelementenumerator.cs +++ b/mscorlib/system/globalization/textelementenumerator.cs @@ -9,7 +9,7 @@ // // Purpose: // -// Date: Microsoft 31, 1999 +// Date: [....] 31, 1999 // //////////////////////////////////////////////////////////////////////////// diff --git a/mscorlib/system/globalization/textinfo.cs b/mscorlib/system/globalization/textinfo.cs index 783e2a1fc..afef11223 100644 --- a/mscorlib/system/globalization/textinfo.cs +++ b/mscorlib/system/globalization/textinfo.cs @@ -11,7 +11,7 @@ // A writing system is the collection of scripts and // orthographic rules required to represent a language as text. // -// Date: Microsoft 31, 1999 +// Date: [....] 31, 1999 // //////////////////////////////////////////////////////////////////////////// diff --git a/mscorlib/system/globalization/timespanformat.cs b/mscorlib/system/globalization/timespanformat.cs index 23928c8e2..ae14266ab 100644 --- a/mscorlib/system/globalization/timespanformat.cs +++ b/mscorlib/system/globalization/timespanformat.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Globalization { using System.Text; diff --git a/mscorlib/system/globalization/timespanparse.cs b/mscorlib/system/globalization/timespanparse.cs index 3e15ad940..5ff183b7c 100644 --- a/mscorlib/system/globalization/timespanparse.cs +++ b/mscorlib/system/globalization/timespanparse.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // //////////////////////////////////////////////////////////////////////////// // diff --git a/mscorlib/system/globalization/umalquracalendar.cs b/mscorlib/system/globalization/umalquracalendar.cs index 7e8a4dde5..d7ca8056a 100644 --- a/mscorlib/system/globalization/umalquracalendar.cs +++ b/mscorlib/system/globalization/umalquracalendar.cs @@ -43,7 +43,7 @@ internal DateMapping(int MonthsLengthFlags, int GYear, int GMonth, int GDay) static DateMapping[] InitDateMapping() { short[] rawData = new short[] { -//These data is taken from Tables/Excel/UmAlQura.xls please make sure that the two places are in sync +//These data is taken from Tables/Excel/UmAlQura.xls please make sure that the two places are in [....] /* DaysPerM GY GM GD D1 D2 D3 D4 D5 D6 D7 D8 D9 D10 D11 D12 1318*/0x02EA, 1900, 4, 30,/* 0 1 0 1 0 1 1 1 0 1 0 0 4/30/1900 1319*/0x06E9, 1901, 4, 19,/* 1 0 0 1 0 1 1 1 0 1 1 0 4/19/1901 diff --git a/mscorlib/system/io/__consolestream.cs b/mscorlib/system/io/__consolestream.cs index a877feabd..505f30675 100644 --- a/mscorlib/system/io/__consolestream.cs +++ b/mscorlib/system/io/__consolestream.cs @@ -5,7 +5,7 @@ // ==--== /*============================================================ ** -** Microsoft +** [....] ** ** Class: ConsoleStream ** diff --git a/mscorlib/system/io/__error.cs b/mscorlib/system/io/__error.cs index 7827899e5..48677e89d 100644 --- a/mscorlib/system/io/__error.cs +++ b/mscorlib/system/io/__error.cs @@ -7,7 +7,7 @@ ** ** Class: __Error ** -** Microsoft +** [....] ** ** ** Purpose: Centralized error methods for the IO package. diff --git a/mscorlib/system/io/bufferedstream.cs b/mscorlib/system/io/bufferedstream.cs index 4b66e2fce..1cdc72037 100644 --- a/mscorlib/system/io/bufferedstream.cs +++ b/mscorlib/system/io/bufferedstream.cs @@ -345,8 +345,8 @@ private static async Task FlushAsyncInternal(CancellationToken cancellationToken // We bring instance fields down as local parameters to this async method becasue BufferedStream is derived from MarshalByRefObject. // Field access would be from the async state machine i.e., not via the this pointer and would require runtime checking to see - // if we are talking to a remote object, whcih is currently very slow (Dev11 - + // if we are talking to a remote object, whcih is currently very slow (Dev11 bug #365921). + // Field access from whithin Asserts is, of course, irrelevant. Contract.Assert(stream != null); SemaphoreSlim sem = _this.EnsureAsyncActiveSemaphoreInitialized(); @@ -395,7 +395,7 @@ private static async Task FlushAsyncInternal(CancellationToken cancellationToken // Reading is done in blocks, but someone could read 1 byte from the buffer then write. - // At that point, the underlying stream's pointer is out of sync with this stream's position. + // At that point, the underlying stream's pointer is out of [....] with this stream's position. // All write functions should call this function to ensure that the buffered data is not lost. private void FlushRead() { @@ -1158,7 +1158,7 @@ private async Task WriteToUnderlyingStreamAsync(Byte[] array, Int32 offset, Int3 try { // The buffer might have been changed by another async task while we were waiting on the semaphore. - // However, note that if we recalculate the sync completion condition to TRUE, then useBuffer will also be TRUE. + // However, note that if we recalculate the [....] completion condition to TRUE, then useBuffer will also be TRUE. if (_writePos == 0) ClearReadBufferBeforeWrite(); diff --git a/mscorlib/system/io/directory.cs b/mscorlib/system/io/directory.cs index fe3f1d84a..da6f5ab57 100644 --- a/mscorlib/system/io/directory.cs +++ b/mscorlib/system/io/directory.cs @@ -7,7 +7,7 @@ ** ** Class: Directory ** -** Microsoft +** [....] ** ** ** Purpose: Exposes routines for enumerating through a @@ -412,7 +412,7 @@ internal static bool InternalExistsHelper(String path, bool checkHost) { catch (UnauthorizedAccessException) { #if !FEATURE_PAL - Contract.Assert(false, "Ignore this assert and send a repro to Microsoft. This assert was tracking purposes only."); + Contract.Assert(false, "Ignore this assert and send a repro to [....]. This assert was tracking purposes only."); #endif //!FEATURE_PAL } return false; diff --git a/mscorlib/system/io/directoryinfo.cs b/mscorlib/system/io/directoryinfo.cs index c675bd5e7..5d88346dd 100644 --- a/mscorlib/system/io/directoryinfo.cs +++ b/mscorlib/system/io/directoryinfo.cs @@ -7,7 +7,7 @@ ** ** Class: DirectoryInfo ** -** Microsoft +** [....] ** ** ** Purpose: Exposes routines for enumerating through a diff --git a/mscorlib/system/io/directorynotfoundexception.cs b/mscorlib/system/io/directorynotfoundexception.cs index 97c5dcc6b..93e9437ad 100644 --- a/mscorlib/system/io/directorynotfoundexception.cs +++ b/mscorlib/system/io/directorynotfoundexception.cs @@ -7,7 +7,7 @@ ** ** Class: DirectoryNotFoundException ** -** Microsoft +** [....] ** ** ** Purpose: Exception for accessing a path that doesn't exist. diff --git a/mscorlib/system/io/driveinfo.cs b/mscorlib/system/io/driveinfo.cs index 7dd7a3bc3..5f7893387 100644 --- a/mscorlib/system/io/driveinfo.cs +++ b/mscorlib/system/io/driveinfo.cs @@ -7,7 +7,7 @@ ** ** Class: DriveInfo ** -** Microsoft +** [....] ** ** ** Purpose: Exposes routines for exploring a drive. diff --git a/mscorlib/system/io/drivenotfoundexception.cs b/mscorlib/system/io/drivenotfoundexception.cs index 0361c2908..cfc543f30 100644 --- a/mscorlib/system/io/drivenotfoundexception.cs +++ b/mscorlib/system/io/drivenotfoundexception.cs @@ -7,7 +7,7 @@ // // Class: DriveNotFoundException // -// Microsoft +// [....] // // Purpose: Exception for accessing a drive that is not available. // diff --git a/mscorlib/system/io/endofstreamexception.cs b/mscorlib/system/io/endofstreamexception.cs index b0cd0d1c9..aa07bc4c7 100644 --- a/mscorlib/system/io/endofstreamexception.cs +++ b/mscorlib/system/io/endofstreamexception.cs @@ -7,7 +7,7 @@ ** ** Class: EndOfStreamException ** -** Microsoft +** [....] ** ** ** Purpose: Exception to be thrown when reading past end-of-file. diff --git a/mscorlib/system/io/file.cs b/mscorlib/system/io/file.cs index 94c45e4d2..d8a7146e0 100644 --- a/mscorlib/system/io/file.cs +++ b/mscorlib/system/io/file.cs @@ -7,7 +7,7 @@ ** ** Class: File ** -** Microsoft +** [....] ** ** ** Purpose: A collection of methods for manipulating Files. diff --git a/mscorlib/system/io/fileinfo.cs b/mscorlib/system/io/fileinfo.cs index ddda3f277..21cca9f51 100644 --- a/mscorlib/system/io/fileinfo.cs +++ b/mscorlib/system/io/fileinfo.cs @@ -5,7 +5,7 @@ // ==--== /*============================================================ ** -** Microsoft +** [....] ** ** Class: File ** diff --git a/mscorlib/system/io/fileloadexception.cs b/mscorlib/system/io/fileloadexception.cs index 150175d80..632742dd8 100644 --- a/mscorlib/system/io/fileloadexception.cs +++ b/mscorlib/system/io/fileloadexception.cs @@ -7,8 +7,8 @@ ** ** Class: FileLoadException ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** ** Purpose: Exception for failure to load a file that was successfully found. diff --git a/mscorlib/system/io/filenotfoundexception.cs b/mscorlib/system/io/filenotfoundexception.cs index 985d9e1a1..088ef6117 100644 --- a/mscorlib/system/io/filenotfoundexception.cs +++ b/mscorlib/system/io/filenotfoundexception.cs @@ -7,8 +7,8 @@ ** ** Class: FileNotFoundException ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** ** Purpose: Exception for accessing a file that doesn't exist. diff --git a/mscorlib/system/io/filestream.cs b/mscorlib/system/io/filestream.cs index 14aaf8000..38b867352 100644 --- a/mscorlib/system/io/filestream.cs +++ b/mscorlib/system/io/filestream.cs @@ -7,7 +7,7 @@ ** ** Class: FileStream ** -** Microsoft +** [....] ** ** ** Purpose: Exposes a Stream around a file, with full @@ -39,11 +39,11 @@ /* * FileStream supports different modes of accessing the disk - async mode - * and sync mode. They are two completely different codepaths in the - * sync & async methods (ie, Read/Write vs. BeginRead/BeginWrite). File - * handles in NT can be opened in only sync or overlapped (async) mode, + * and [....] mode. They are two completely different codepaths in the + * [....] & async methods (ie, Read/Write vs. BeginRead/BeginWrite). File + * handles in NT can be opened in only [....] or overlapped (async) mode, * and we have to deal with this pain. Stream has implementations of - * the sync methods in terms of the async ones, so we'll + * the [....] methods in terms of the async ones, so we'll * call through to our base class to get those methods when necessary. * * Also buffering is added into FileStream as well. Folded in the @@ -1224,7 +1224,7 @@ public override long Position { Contract.Assert((_readPos == 0 && _readLen == 0 && _writePos >= 0) || (_writePos == 0 && _readPos <= _readLen), "We're either reading or writing, but not both."); - // Verify that internal position is in sync with the handle + // Verify that internal position is in [....] with the handle if (_exposedHandle) VerifyOSHandlePosition(); @@ -1353,7 +1353,7 @@ private void FlushOSBuffer() // Reading is done by blocks from the file, but someone could read // 1 byte from the buffer then write. At that point, the OS's file - // pointer is out of sync with the stream's position. All write + // pointer is out of [....] with the stream's position. All write // functions should call this function to preserve the position in the file. private void FlushRead() { Contract.Assert(_writePos == 0, "FileStream: Write buffer must be empty in FlushRead!"); @@ -1628,7 +1628,7 @@ public override long Seek(long offset, SeekOrigin origin) { offset -= (_readLen - _readPos); } - // Verify that internal position is in sync with the handle + // Verify that internal position is in [....] with the handle if (_exposedHandle) VerifyOSHandlePosition(); @@ -1722,7 +1722,7 @@ private long SeekCore(long offset, SeekOrigin origin) { // Checks the position of the OS's handle equals what we expect it to. // This will fail if someone else moved the FileStream's handle or if - // we've hit a + // we've hit a bug in FileStream's position updating code. private void VerifyOSHandlePosition() { if (!CanSeek) @@ -1945,7 +1945,7 @@ private FileStreamAsyncResult BeginReadAsync(byte[] array, int offset, int numBy // (either synchronously or asynchronously) before the first one // returns. This would involve some sort of complex buffer locking // that we probably don't want to get into, at least not in V1. - // If we did a sync read to fill the buffer, we could avoid the + // If we did a [....] read to fill the buffer, we could avoid the // problem, and any async read less than 64K gets turned into a // synchronous read by NT anyways... -- @@ -2513,7 +2513,7 @@ private unsafe int ReadFileNative(SafeFileHandle handle, byte[] bytes, int offse if (r==0) { hr = Marshal.GetLastWin32Error(); - // We should never silently swallow an error here without some + // We should never silently ---- an error here without some // extra work. We must make sure that BeginReadCore won't return an // IAsyncResult that will cause EndRead to block, since the OS won't // call AsyncFSCallback for us. @@ -2570,7 +2570,7 @@ private unsafe int WriteFileNative(SafeFileHandle handle, byte[] bytes, int offs if (r==0) { hr = Marshal.GetLastWin32Error(); - // We should never silently swallow an error here without some + // We should never silently ---- an error here without some // extra work. We must make sure that BeginWriteCore won't return an // IAsyncResult that will cause EndWrite to block, since the OS won't // call AsyncFSCallback for us. diff --git a/mscorlib/system/io/filesystemenumerable.cs b/mscorlib/system/io/filesystemenumerable.cs index f74c05c87..ec69c33af 100644 --- a/mscorlib/system/io/filesystemenumerable.cs +++ b/mscorlib/system/io/filesystemenumerable.cs @@ -7,7 +7,7 @@ ** ** Class: FileSystemEnumerable ** -** Microsoft +** [....] ** ** ** Purpose: Enumerates files and dirs diff --git a/mscorlib/system/io/filesysteminfo.cs b/mscorlib/system/io/filesysteminfo.cs index e0fedf9fd..6428bc0c8 100644 --- a/mscorlib/system/io/filesysteminfo.cs +++ b/mscorlib/system/io/filesysteminfo.cs @@ -7,7 +7,7 @@ ** ** Class: FileSystemInfo ** -** Microsoft +** [....] ** ** ** Purpose: diff --git a/mscorlib/system/io/ioexception.cs b/mscorlib/system/io/ioexception.cs index 3301207c6..699d4f7e7 100644 --- a/mscorlib/system/io/ioexception.cs +++ b/mscorlib/system/io/ioexception.cs @@ -7,7 +7,7 @@ ** ** Class: IOException ** -** Microsoft +** [....] ** ** ** Purpose: Exception for a generic IO error. diff --git a/mscorlib/system/io/isolatedstorage/isolatedstorage.cs b/mscorlib/system/io/isolatedstorage/isolatedstorage.cs index 4d384f1d0..1249595b5 100644 --- a/mscorlib/system/io/isolatedstorage/isolatedstorage.cs +++ b/mscorlib/system/io/isolatedstorage/isolatedstorage.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // /*============================================================ @@ -331,7 +331,7 @@ private static bool IsValidName(String s) private static SecurityPermission GetControlEvidencePermission() { - // Don't sync. OK to create this object more than once. + // Don't [....]. OK to create this object more than once. if (s_PermControlEvidence == null) s_PermControlEvidence = new SecurityPermission( SecurityPermissionFlag.ControlEvidence); @@ -341,7 +341,7 @@ private static SecurityPermission GetControlEvidencePermission() private static PermissionSet GetUnrestricted() { - // Don't sync. OK to create this object more than once. + // Don't [....]. OK to create this object more than once. if (s_PermUnrestricted == null) s_PermUnrestricted = new PermissionSet( PermissionState.Unrestricted); diff --git a/mscorlib/system/io/isolatedstorage/isolatedstorageexception.cs b/mscorlib/system/io/isolatedstorage/isolatedstorageexception.cs index 175991615..e02e83a75 100644 --- a/mscorlib/system/io/isolatedstorage/isolatedstorageexception.cs +++ b/mscorlib/system/io/isolatedstorage/isolatedstorageexception.cs @@ -7,7 +7,7 @@ * * Class: IsolatedStorageException // -// Microsoft +// [....] * * * Purpose: The exceptions in IsolatedStorage diff --git a/mscorlib/system/io/isolatedstorage/isolatedstoragefile.cs b/mscorlib/system/io/isolatedstorage/isolatedstoragefile.cs index 739311221..932a4ee9f 100644 --- a/mscorlib/system/io/isolatedstorage/isolatedstoragefile.cs +++ b/mscorlib/system/io/isolatedstorage/isolatedstoragefile.cs @@ -8,8 +8,8 @@ * * Class: IsolatedStorageFile // -// Microsoft -// Microsoft +// [....] +// [....] * * * Purpose: Provides access to Application files and folders @@ -2304,7 +2304,7 @@ internal static FileIOPermission GetGlobalFileIOPerm( { if (IsRoaming(scope)) { - // no sync needed, ok to create multiple instances. + // no [....] needed, ok to create multiple instances. if (s_PermRoaming == null) { s_PermRoaming = new FileIOPermission( @@ -2316,7 +2316,7 @@ internal static FileIOPermission GetGlobalFileIOPerm( if (IsMachine(scope)) { - // no sync needed, ok to create multiple instances. + // no [....] needed, ok to create multiple instances. if (s_PermMachine == null) { s_PermMachine = new FileIOPermission( @@ -2325,7 +2325,7 @@ internal static FileIOPermission GetGlobalFileIOPerm( return s_PermMachine; } - // no sync needed, ok to create multiple instances. + // no [....] needed, ok to create multiple instances. if (s_PermUser == null) { s_PermUser = new FileIOPermission( @@ -2338,7 +2338,7 @@ internal static FileIOPermission GetGlobalFileIOPerm( [System.Security.SecurityCritical] // auto-generated private static void DemandAdminPermission() { - // Ok if more than one instance is created, no need to sync. + // Ok if more than one instance is created, no need to [....]. if (s_PermAdminUser == null) { s_PermAdminUser = new IsolatedStorageFilePermission( diff --git a/mscorlib/system/io/isolatedstorage/isolatedstoragefilestream.cs b/mscorlib/system/io/isolatedstorage/isolatedstoragefilestream.cs index caa5cfe5e..c6d0b5541 100644 --- a/mscorlib/system/io/isolatedstorage/isolatedstoragefilestream.cs +++ b/mscorlib/system/io/isolatedstorage/isolatedstoragefilestream.cs @@ -7,7 +7,7 @@ * * Class: IsolatedStorageFileStream // -// Microsoft +// [....] * * * Purpose: Provides access to files using the same interface as FileStream diff --git a/mscorlib/system/io/longpath.cs b/mscorlib/system/io/longpath.cs index b88e5d4b7..2240ba9e1 100644 --- a/mscorlib/system/io/longpath.cs +++ b/mscorlib/system/io/longpath.cs @@ -7,7 +7,7 @@ ** ** Class: File ** -** Microsoft +** [....] ** ** ** Purpose: Long paths diff --git a/mscorlib/system/io/memorystream.cs b/mscorlib/system/io/memorystream.cs index b3755edac..d91a11621 100644 --- a/mscorlib/system/io/memorystream.cs +++ b/mscorlib/system/io/memorystream.cs @@ -7,7 +7,7 @@ ** ** Class: MemoryStream ** -** Microsoft +** [....] ** ** ** Purpose: A Stream whose backing store is memory. Great @@ -422,7 +422,7 @@ public override Task CopyToAsync(Stream destination, Int32 bufferSize, Cancellat // This implementation offers beter performance compared to the base class version. - // The parameter checks must be in sync with the base version: + // The parameter checks must be in [....] with the base version: if (destination == null) throw new ArgumentNullException("destination"); diff --git a/mscorlib/system/io/path.cs b/mscorlib/system/io/path.cs index f260924b1..b4cb0ab7e 100644 --- a/mscorlib/system/io/path.cs +++ b/mscorlib/system/io/path.cs @@ -7,7 +7,7 @@ ** ** Class: Path ** -** Microsoft +** [....] ** ** ** Purpose: A collection of path manipulation methods. @@ -673,17 +673,17 @@ internal unsafe static String NormalizePath(String path, bool fullCheck, int max // might be well within the MAX_PATH restriction. For ex, // "c:\SomeReallyLongDirName(thinkGreaterThan_MAXPATH)\..\foo.txt" which actually requires a // buffer well with in the MAX_PATH as the normalized path is just "c:\foo.txt" - // This buffer requirement seems wrong, it could be a - - + // This buffer requirement seems wrong, it could be a bug or a perf optimization + // like returning required buffer length quickly or avoid stratch buffer etc. + // Either way we need to workaround it here... // Ideally we would get the required buffer length first by calling GetFullPathName // once without the buffer and use that in the later call but this doesn't always work - // due to Win32 GetFullPathName - - - - + // due to Win32 GetFullPathName bug. For instance, in Win2k, when the path we are trying to + // fully qualify is a single letter name (such as "a", "1", ",") GetFullPathName + // fails to return the right buffer size (i.e, resulting in insufficient buffer). + // To workaround this bug we will start with MAX_PATH buffer and grow it once if the + // return value is > MAX_PATH. result = newBuffer.GetFullPathName(); diff --git a/mscorlib/system/io/pathtoolongexception.cs b/mscorlib/system/io/pathtoolongexception.cs index 048e734ac..aebd4c30d 100644 --- a/mscorlib/system/io/pathtoolongexception.cs +++ b/mscorlib/system/io/pathtoolongexception.cs @@ -7,7 +7,7 @@ ** ** Class: PathTooLongException ** -** Microsoft +** [....] ** ** ** Purpose: Exception for paths and/or filenames that are diff --git a/mscorlib/system/io/pinnedbuffermemorystream.cs b/mscorlib/system/io/pinnedbuffermemorystream.cs index fda409ae8..7b45756c7 100644 --- a/mscorlib/system/io/pinnedbuffermemorystream.cs +++ b/mscorlib/system/io/pinnedbuffermemorystream.cs @@ -7,7 +7,7 @@ ** ** Class: PinnedBufferMemoryStream ** -** Microsoft +** [....] ** ** ** Purpose: Pins a byte[], exposing it as an unmanaged memory diff --git a/mscorlib/system/io/stream.cs b/mscorlib/system/io/stream.cs index 306eda314..8d8dfab64 100644 --- a/mscorlib/system/io/stream.cs +++ b/mscorlib/system/io/stream.cs @@ -509,7 +509,7 @@ internal IAsyncResult BeginWriteInternal(byte[] buffer, int offset, int count, A private void RunReadWriteTaskWhenReady(Task asyncWaiter, ReadWriteTask readWriteTask) { Contract.Assert(readWriteTask != null); // Should be Contract.Requires, but CCRewrite is doing a poor job with - // preconditions in async methods that await. Mike & Manuel are aware. (10/6/2011, + // preconditions in async methods that await. Mike & Manuel are aware. (10/6/2011, bug 290222) Contract.Assert(asyncWaiter != null); // Ditto // If the wait has already complete, run the task. diff --git a/mscorlib/system/io/streamreader.cs b/mscorlib/system/io/streamreader.cs index 3d5ebfdd5..55d6948fb 100644 --- a/mscorlib/system/io/streamreader.cs +++ b/mscorlib/system/io/streamreader.cs @@ -1123,7 +1123,7 @@ public override Task ReadBlockAsync(char[] buffer, int index, int count) // and is thus lifted to a state machine type, access will be slow. // As a workaround, we either cache instance fields in locals or use properties to access such fields. - // See Dev11 + // See Dev11 bug #370300 for more info. private Int32 CharLen_Prop { get { return charLen; } diff --git a/mscorlib/system/io/stringreader.cs b/mscorlib/system/io/stringreader.cs index 1db58849a..d4d92c05f 100644 --- a/mscorlib/system/io/stringreader.cs +++ b/mscorlib/system/io/stringreader.cs @@ -7,7 +7,7 @@ ** ** Class: StringReader ** -** Microsoft +** [....] ** ** Purpose: For reading text from strings ** diff --git a/mscorlib/system/io/stringwriter.cs b/mscorlib/system/io/stringwriter.cs index f464f5c1a..6f41279ca 100644 --- a/mscorlib/system/io/stringwriter.cs +++ b/mscorlib/system/io/stringwriter.cs @@ -7,7 +7,7 @@ ** ** Class: StringWriter ** -** Microsoft +** [....] ** ** Purpose: For writing text to a string ** diff --git a/mscorlib/system/io/textreader.cs b/mscorlib/system/io/textreader.cs index 4e5bad0c1..5f8e7b98a 100644 --- a/mscorlib/system/io/textreader.cs +++ b/mscorlib/system/io/textreader.cs @@ -7,7 +7,7 @@ ** ** Class: TextReader ** -** Microsoft +** [....] ** ** ** Purpose: Abstract base class for all Text-only Readers. diff --git a/mscorlib/system/io/textwriter.cs b/mscorlib/system/io/textwriter.cs index 1f1987109..4dbc025fe 100644 --- a/mscorlib/system/io/textwriter.cs +++ b/mscorlib/system/io/textwriter.cs @@ -7,7 +7,7 @@ ** ** Class: TextWriter ** -** Microsoft +** [....] ** ** ** Purpose: Abstract base class for Text-only Writers. diff --git a/mscorlib/system/io/unmanagedmemoryaccessor.cs b/mscorlib/system/io/unmanagedmemoryaccessor.cs index 3d4c571bc..70e100c6e 100644 --- a/mscorlib/system/io/unmanagedmemoryaccessor.cs +++ b/mscorlib/system/io/unmanagedmemoryaccessor.cs @@ -7,7 +7,7 @@ ** ** Class: UnmanagedMemoryAccessor ** -** Microsoft +** [....] ** ** Purpose: Provides a fast, AV free, cross-language way of ** accessing unmanaged memory in a random fashion. diff --git a/mscorlib/system/io/unmanagedmemorystream.cs b/mscorlib/system/io/unmanagedmemorystream.cs index 2100d3054..c02d6a7d7 100644 --- a/mscorlib/system/io/unmanagedmemorystream.cs +++ b/mscorlib/system/io/unmanagedmemorystream.cs @@ -7,7 +7,7 @@ ** ** Class: UnmanagedMemoryStream ** -** Microsoft +** [....] ** ** Purpose: Create a stream over unmanaged memory, mostly ** useful for memory-mapped files. @@ -398,7 +398,7 @@ public override int Read([In, Out] byte[] buffer, int offset, int count) { throw new ArgumentOutOfRangeException("count", Environment.GetResourceString("ArgumentOutOfRange_NeedNonNegNum")); if (buffer.Length - offset < count) throw new ArgumentException(Environment.GetResourceString("Argument_InvalidOffLen")); - Contract.EndContractBlock(); // Keep this in sync with contract validation in ReadAsync + Contract.EndContractBlock(); // Keep this in [....] with contract validation in ReadAsync if (!_isOpen) __Error.StreamIsClosed(); if (!CanRead) __Error.ReadNotSupported(); @@ -577,7 +577,7 @@ public override void Write(byte[] buffer, int offset, int count) { throw new ArgumentOutOfRangeException("count", Environment.GetResourceString("ArgumentOutOfRange_NeedNonNegNum")); if (buffer.Length - offset < count) throw new ArgumentException(Environment.GetResourceString("Argument_InvalidOffLen")); - Contract.EndContractBlock(); // Keep contract validation in sync with WriteAsync(..) + Contract.EndContractBlock(); // Keep contract validation in [....] with WriteAsync(..) if (!_isOpen) __Error.StreamIsClosed(); if (!CanWrite) __Error.WriteNotSupported(); diff --git a/mscorlib/system/io/unmanagedmemorystreamwrapper.cs b/mscorlib/system/io/unmanagedmemorystreamwrapper.cs index 613241bab..20535e702 100644 --- a/mscorlib/system/io/unmanagedmemorystreamwrapper.cs +++ b/mscorlib/system/io/unmanagedmemorystreamwrapper.cs @@ -7,7 +7,7 @@ ** ** Class: UnmanagedMemoryStreamWrapper ** -** Microsoft +** [....] ** ** Purpose: Create a Memorystream over an UnmanagedMemoryStream ** @@ -152,7 +152,7 @@ public override void SetLength(Int64 value) { public override Task CopyToAsync(Stream destination, Int32 bufferSize, CancellationToken cancellationToken) { - // The parameter checks must be in sync with the base version: + // The parameter checks must be in [....] with the base version: if (destination == null) throw new ArgumentNullException("destination"); diff --git a/mscorlib/system/object.cs b/mscorlib/system/object.cs index 6c27df75d..2d9f91e83 100644 --- a/mscorlib/system/object.cs +++ b/mscorlib/system/object.cs @@ -86,7 +86,7 @@ public static bool ReferenceEquals (Object objA, Object objB) { // Based on the contents of the object, the hash function will return a suitable // value with a relatively random distribution over the various inputs. // - // The default implementation returns the sync block index for this instance. + // The default implementation returns the [....] block index for this instance. // Calling it on the same object multiple times will return the same value, so // it will technically meet the needs of a hash function, but it's less than ideal. // Objects (& especially value classes) should override this method. diff --git a/mscorlib/system/progress.cs b/mscorlib/system/progress.cs index a85eeeb73..6b273c894 100644 --- a/mscorlib/system/progress.cs +++ b/mscorlib/system/progress.cs @@ -7,7 +7,7 @@ ** ** Class: Progress ** -** Microsoft +** [....] ** ** ** Purpose: Event-based implementation of IProgress. @@ -46,8 +46,8 @@ public class Progress : IProgress public Progress() { // Capture the current synchronization context. "current" is determined by CurrentNoFlow, - // which doesn't consider the sync ctx flown with an ExecutionContext, avoiding - // sync ctx reference identity issues where the sync ctx for one thread could be Current on another. + // which doesn't consider the [....] ctx flown with an ExecutionContext, avoiding + // [....] ctx reference identity issues where the [....] ctx for one thread could be Current on another. // If there is no current context, we use a default instance targeting the ThreadPool. m_synchronizationContext = SynchronizationContext.CurrentNoFlow ?? ProgressStatics.DefaultContext; Contract.Assert(m_synchronizationContext != null); @@ -80,14 +80,14 @@ public Progress(Action handler) : this() /// The value of the updated progress. protected virtual void OnReport(T value) { - // If there's no handler, don't bother going through the sync context. + // If there's no handler, don't bother going through the [....] context. // Inside the callback, we'll need to check again, in case // an event handler is removed between now and then. Action handler = m_handler; EventHandler changedEvent = ProgressChanged; if (handler != null || changedEvent != null) { - // Post the processing to the sync context. + // Post the processing to the [....] context. // (If T is a value type, it will get boxed here.) m_synchronizationContext.Post(m_invokeHandlers, value); } diff --git a/mscorlib/system/reflection/Associates.cs b/mscorlib/system/reflection/Associates.cs index e2a1842a4..3f9c8e559 100644 --- a/mscorlib/system/reflection/Associates.cs +++ b/mscorlib/system/reflection/Associates.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/ConstructorInfo.cs b/mscorlib/system/reflection/ConstructorInfo.cs index dfc2d64d8..6704bd53f 100644 --- a/mscorlib/system/reflection/ConstructorInfo.cs +++ b/mscorlib/system/reflection/ConstructorInfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/__filters.cs b/mscorlib/system/reflection/__filters.cs index b4f925948..951881c29 100644 --- a/mscorlib/system/reflection/__filters.cs +++ b/mscorlib/system/reflection/__filters.cs @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// // -// Microsoft +// [....] // // This class defines the delegate methods for the COM+ implemented filters. // This is the reflection version of these. There is also a _Filters class in diff --git a/mscorlib/system/reflection/ambiguousmatchexception.cs b/mscorlib/system/reflection/ambiguousmatchexception.cs index cfff77d66..b6f715ae2 100644 --- a/mscorlib/system/reflection/ambiguousmatchexception.cs +++ b/mscorlib/system/reflection/ambiguousmatchexception.cs @@ -8,7 +8,7 @@ // // AmbiguousMatchException is thrown when binding to a method results in more // -// Microsoft +// [....] // than one method matching the binding criteria. This exception is thrown in // general when something is Ambiguous. // diff --git a/mscorlib/system/reflection/assembly.cs b/mscorlib/system/reflection/assembly.cs index 84bc21c56..24bd73651 100644 --- a/mscorlib/system/reflection/assembly.cs +++ b/mscorlib/system/reflection/assembly.cs @@ -1146,7 +1146,7 @@ public virtual bool IsDynamic } - // Keep this in sync with LOADCTX_TYPE defined in fusionpriv.idl + // Keep this in [....] with LOADCTX_TYPE defined in fusionpriv.idl internal enum LoadContext { DEFAULT, @@ -2915,9 +2915,9 @@ internal RuntimeAssembly InternalGetSatelliteAssembly(String name, if (e.IsTransient) throw; - // See Dev11 - - + // See Dev11 bug 298776 (DevDiv2 TFS database). Sometimes + // UnauthorizedAccessException will be thrown by the call to + // Fusion.ReadCache. // We also catch any other exception types we haven't come across yet, // not just UnauthorizedAccessException. diff --git a/mscorlib/system/reflection/assemblyattributes.cs b/mscorlib/system/reflection/assemblyattributes.cs index d222ee51a..b3fec0ba1 100644 --- a/mscorlib/system/reflection/assemblyattributes.cs +++ b/mscorlib/system/reflection/assemblyattributes.cs @@ -7,7 +7,7 @@ ** ** File: AssemblyAttributes ** -** Microsoft +** [....] ** ** ** Purpose: For Assembly-related custom attributes. diff --git a/mscorlib/system/reflection/assemblyname.cs b/mscorlib/system/reflection/assemblyname.cs index 802414cc0..a7e5857d0 100644 --- a/mscorlib/system/reflection/assemblyname.cs +++ b/mscorlib/system/reflection/assemblyname.cs @@ -7,8 +7,8 @@ ** ** File: AssemblyName ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** ** Purpose: Used for binding and retrieving info about an assembly diff --git a/mscorlib/system/reflection/assemblynameproxy.cs b/mscorlib/system/reflection/assemblynameproxy.cs index 5be9bc495..dc844de41 100644 --- a/mscorlib/system/reflection/assemblynameproxy.cs +++ b/mscorlib/system/reflection/assemblynameproxy.cs @@ -7,8 +7,8 @@ ** ** File: AssemblyNameProxy ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** ** Purpose: Remotable version the AssemblyName diff --git a/mscorlib/system/reflection/customattribute.cs b/mscorlib/system/reflection/customattribute.cs index 46ee3f08f..4dfeb2679 100644 --- a/mscorlib/system/reflection/customattribute.cs +++ b/mscorlib/system/reflection/customattribute.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/customattributeformatexception.cs b/mscorlib/system/reflection/customattributeformatexception.cs index 1d158db80..093314aba 100644 --- a/mscorlib/system/reflection/customattributeformatexception.cs +++ b/mscorlib/system/reflection/customattributeformatexception.cs @@ -8,11 +8,11 @@ // // CustomAttributeFormatException is thrown when the binary format of a // -// Microsoft +// [....] // custom attribute is invalid. // // Author: darylo -// Date: Microsoft 98 +// Date: [....] 98 // namespace System.Reflection { using System; diff --git a/mscorlib/system/reflection/defaultmemberattribute.cs b/mscorlib/system/reflection/defaultmemberattribute.cs index 28af33c9d..00d6ab38e 100644 --- a/mscorlib/system/reflection/defaultmemberattribute.cs +++ b/mscorlib/system/reflection/defaultmemberattribute.cs @@ -8,7 +8,7 @@ // // DefaultMemberAttribute is defines the Member of a Type that is the "default" // -// Microsoft +// [....] // member used by Type.InvokeMember. The default member is simply a name given // to a type. // diff --git a/mscorlib/system/reflection/emit/aqnbuilder.cs b/mscorlib/system/reflection/emit/aqnbuilder.cs index e715f5836..35c267da6 100644 --- a/mscorlib/system/reflection/emit/aqnbuilder.cs +++ b/mscorlib/system/reflection/emit/aqnbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] using System; using System.Collections.Generic; using System.Runtime.CompilerServices; diff --git a/mscorlib/system/reflection/emit/assemblybuilder.cs b/mscorlib/system/reflection/emit/assemblybuilder.cs index f8099ccd8..221618061 100644 --- a/mscorlib/system/reflection/emit/assemblybuilder.cs +++ b/mscorlib/system/reflection/emit/assemblybuilder.cs @@ -23,7 +23,7 @@ // "internal" and "external" ModuleBuilders are similar //************************************************************************************************************* -// Microsoft +// [....] namespace System.Reflection.Emit { using System; @@ -475,7 +475,7 @@ private void InitManifestModule() // The name in the underlying metadata will be set when the // manifest module is created during nCreateDynamicAssembly. - // This name needs to stay in sync with that used in + // This name needs to stay in [....] with that used in // Assembly::Init to call ReflectionModule::Create (in VM) m_manifestModuleBuilder.Init(AssemblyBuilder.MANIFEST_MODULE_NAME, null, 0); diff --git a/mscorlib/system/reflection/emit/assemblybuilderdata.cs b/mscorlib/system/reflection/emit/assemblybuilderdata.cs index fbce6487b..cc02531a6 100644 --- a/mscorlib/system/reflection/emit/assemblybuilderdata.cs +++ b/mscorlib/system/reflection/emit/assemblybuilderdata.cs @@ -5,7 +5,7 @@ // ==--== //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// -// Microsoft +// [....] // namespace System.Reflection.Emit { diff --git a/mscorlib/system/reflection/emit/constructorbuilder.cs b/mscorlib/system/reflection/emit/constructorbuilder.cs index ec850ba4d..3a1435b90 100644 --- a/mscorlib/system/reflection/emit/constructorbuilder.cs +++ b/mscorlib/system/reflection/emit/constructorbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/customattributebuilder.cs b/mscorlib/system/reflection/emit/customattributebuilder.cs index c4cc7d299..cb0aa8cac 100644 --- a/mscorlib/system/reflection/emit/customattributebuilder.cs +++ b/mscorlib/system/reflection/emit/customattributebuilder.cs @@ -5,7 +5,7 @@ // ==--== /*============================================================ ** -** Microsoft +** [....] ** ** Class: CustomAttrbuteBuilder ** diff --git a/mscorlib/system/reflection/emit/dynamicilgenerator.cs b/mscorlib/system/reflection/emit/dynamicilgenerator.cs index 6f86bcd1f..f26816471 100644 --- a/mscorlib/system/reflection/emit/dynamicilgenerator.cs +++ b/mscorlib/system/reflection/emit/dynamicilgenerator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit @@ -799,7 +799,7 @@ private class DestroyScout } } - // Keep in sync with vm/dynamicmethod.h + // Keep in [....] with vm/dynamicmethod.h [Flags] internal enum SecurityControlFlags { diff --git a/mscorlib/system/reflection/emit/dynamicmethod.cs b/mscorlib/system/reflection/emit/dynamicmethod.cs index 71ee85706..23a7baa1f 100644 --- a/mscorlib/system/reflection/emit/dynamicmethod.cs +++ b/mscorlib/system/reflection/emit/dynamicmethod.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/enumbuilder.cs b/mscorlib/system/reflection/emit/enumbuilder.cs index f6be53add..7cea00bdc 100644 --- a/mscorlib/system/reflection/emit/enumbuilder.cs +++ b/mscorlib/system/reflection/emit/enumbuilder.cs @@ -7,7 +7,7 @@ ** ** Class: EnumBuilder ** -** Microsoft +** [....] ** ** ** EnumBuilder is a helper class to build Enum ( a special type ). diff --git a/mscorlib/system/reflection/emit/eventbuilder.cs b/mscorlib/system/reflection/emit/eventbuilder.cs index e6bd4327f..0fea09464 100644 --- a/mscorlib/system/reflection/emit/eventbuilder.cs +++ b/mscorlib/system/reflection/emit/eventbuilder.cs @@ -7,7 +7,7 @@ ** ** Class: EventBuilder ** -** Microsoft +** [....] ** ** ** Eventbuilder is for client to define eevnts for a class diff --git a/mscorlib/system/reflection/emit/eventtoken.cs b/mscorlib/system/reflection/emit/eventtoken.cs index 737c95c3d..a12e442aa 100644 --- a/mscorlib/system/reflection/emit/eventtoken.cs +++ b/mscorlib/system/reflection/emit/eventtoken.cs @@ -7,7 +7,7 @@ ** ** Class: EventToken ** -** Microsoft +** [....] ** ** ** Propertybuilder is for client to define properties for a class diff --git a/mscorlib/system/reflection/emit/fieldbuilder.cs b/mscorlib/system/reflection/emit/fieldbuilder.cs index 43cf5cedd..c38cc21d3 100644 --- a/mscorlib/system/reflection/emit/fieldbuilder.cs +++ b/mscorlib/system/reflection/emit/fieldbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/fieldtoken.cs b/mscorlib/system/reflection/emit/fieldtoken.cs index e043c0f7f..1684ef054 100644 --- a/mscorlib/system/reflection/emit/fieldtoken.cs +++ b/mscorlib/system/reflection/emit/fieldtoken.cs @@ -7,7 +7,7 @@ ** ** Class: FieldToken ** -** Microsoft +** [....] ** ** ** Purpose: Represents a Field to the ILGenerator Class diff --git a/mscorlib/system/reflection/emit/generictypeparameterbuilder.cs b/mscorlib/system/reflection/emit/generictypeparameterbuilder.cs index f9e701e4c..8a6f6e540 100644 --- a/mscorlib/system/reflection/emit/generictypeparameterbuilder.cs +++ b/mscorlib/system/reflection/emit/generictypeparameterbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/ilgenerator.cs b/mscorlib/system/reflection/emit/ilgenerator.cs index 44f61a5dd..475fc3d0f 100644 --- a/mscorlib/system/reflection/emit/ilgenerator.cs +++ b/mscorlib/system/reflection/emit/ilgenerator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/label.cs b/mscorlib/system/reflection/emit/label.cs index d0ee014f0..577f1960d 100644 --- a/mscorlib/system/reflection/emit/label.cs +++ b/mscorlib/system/reflection/emit/label.cs @@ -7,7 +7,7 @@ ** ** Class: Label ** -** Microsoft +** [....] ** ** ** diff --git a/mscorlib/system/reflection/emit/localbuilder.cs b/mscorlib/system/reflection/emit/localbuilder.cs index 77352947c..51f6f15bb 100644 --- a/mscorlib/system/reflection/emit/localbuilder.cs +++ b/mscorlib/system/reflection/emit/localbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] using System; using System.Reflection; using System.Security.Permissions; diff --git a/mscorlib/system/reflection/emit/methodbuilder.cs b/mscorlib/system/reflection/emit/methodbuilder.cs index d7bfb9c25..6cbed85f1 100644 --- a/mscorlib/system/reflection/emit/methodbuilder.cs +++ b/mscorlib/system/reflection/emit/methodbuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit @@ -1404,7 +1404,7 @@ internal virtual void EmitLocalSymInfo(ISymbolWriter symWriter) [ComVisible(false)] public struct ExceptionHandler : IEquatable { - // Keep in sync with unmanged structure. + // Keep in [....] with unmanged structure. internal readonly int m_exceptionClass; internal readonly int m_tryStartOffset; internal readonly int m_tryEndOffset; diff --git a/mscorlib/system/reflection/emit/methodbuilderinstantiation.cs b/mscorlib/system/reflection/emit/methodbuilderinstantiation.cs index 3b73e1b24..1a7db5cec 100644 --- a/mscorlib/system/reflection/emit/methodbuilderinstantiation.cs +++ b/mscorlib/system/reflection/emit/methodbuilderinstantiation.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/methodrental.cs b/mscorlib/system/reflection/emit/methodrental.cs index c4e980c95..e54ffa506 100644 --- a/mscorlib/system/reflection/emit/methodrental.cs +++ b/mscorlib/system/reflection/emit/methodrental.cs @@ -7,7 +7,7 @@ ** ** Class: MethodRental ** -** Microsoft +** [....] ** ** ** MethodRental class is to provide a fast way to swap method body implementation diff --git a/mscorlib/system/reflection/emit/methodtoken.cs b/mscorlib/system/reflection/emit/methodtoken.cs index 18c050acc..92d2c9d9f 100644 --- a/mscorlib/system/reflection/emit/methodtoken.cs +++ b/mscorlib/system/reflection/emit/methodtoken.cs @@ -7,7 +7,7 @@ ** ** Class: MethodToken ** -** Microsoft +** [....] ** ** ** Purpose: Represents a Method to the ILGenerator class. diff --git a/mscorlib/system/reflection/emit/modulebuilder.cs b/mscorlib/system/reflection/emit/modulebuilder.cs index c872fa065..e64bd9bd9 100644 --- a/mscorlib/system/reflection/emit/modulebuilder.cs +++ b/mscorlib/system/reflection/emit/modulebuilder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/modulebuilderdata.cs b/mscorlib/system/reflection/emit/modulebuilderdata.cs index 0252f9dba..36f17022e 100644 --- a/mscorlib/system/reflection/emit/modulebuilderdata.cs +++ b/mscorlib/system/reflection/emit/modulebuilderdata.cs @@ -5,7 +5,7 @@ // ==--== //////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////// -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/opcode.cs b/mscorlib/system/reflection/emit/opcode.cs index 477b3595e..b0110f5f8 100644 --- a/mscorlib/system/reflection/emit/opcode.cs +++ b/mscorlib/system/reflection/emit/opcode.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Reflection.Emit { using System; using System.Threading; diff --git a/mscorlib/system/reflection/emit/opcodes.cs b/mscorlib/system/reflection/emit/opcodes.cs index 0b0cb66a0..f7b85f815 100644 --- a/mscorlib/system/reflection/emit/opcodes.cs +++ b/mscorlib/system/reflection/emit/opcodes.cs @@ -2,7 +2,7 @@ ** **Class: OpCodes ** -** Microsoft +** [....] ** **Purpose: Exposes all of the il instructions supported by the runtime. ** diff --git a/mscorlib/system/reflection/emit/parameterbuilder.cs b/mscorlib/system/reflection/emit/parameterbuilder.cs index fbcb9cad9..840e8bdcb 100644 --- a/mscorlib/system/reflection/emit/parameterbuilder.cs +++ b/mscorlib/system/reflection/emit/parameterbuilder.cs @@ -7,7 +7,7 @@ ** ** Class: ParameterBuilder ** -** Microsoft +** [....] ** ** ** ParameterBuilder is used to create/associate parameter information diff --git a/mscorlib/system/reflection/emit/parametertoken.cs b/mscorlib/system/reflection/emit/parametertoken.cs index 109641ef2..b4fa891db 100644 --- a/mscorlib/system/reflection/emit/parametertoken.cs +++ b/mscorlib/system/reflection/emit/parametertoken.cs @@ -7,7 +7,7 @@ ** ** Class: ParameterToken ** -** Microsoft +** [....] ** ** ** Purpose: metadata tokens for a parameter diff --git a/mscorlib/system/reflection/emit/propertybuilder.cs b/mscorlib/system/reflection/emit/propertybuilder.cs index b3a73689f..57cd6df97 100644 --- a/mscorlib/system/reflection/emit/propertybuilder.cs +++ b/mscorlib/system/reflection/emit/propertybuilder.cs @@ -7,7 +7,7 @@ ** ** Class: PropertyBuilder ** -** Microsoft +** [....] ** ** ** Propertybuilder is for client to define properties for a class diff --git a/mscorlib/system/reflection/emit/propertytoken.cs b/mscorlib/system/reflection/emit/propertytoken.cs index a29d4c6f4..db59f5d80 100644 --- a/mscorlib/system/reflection/emit/propertytoken.cs +++ b/mscorlib/system/reflection/emit/propertytoken.cs @@ -7,7 +7,7 @@ ** ** Class: PropertyToken ** -** Microsoft +** [....] ** ** ** Propertybuilder is for client to define properties for a class diff --git a/mscorlib/system/reflection/emit/signaturehelper.cs b/mscorlib/system/reflection/emit/signaturehelper.cs index 05b2d9f40..9c61d53dd 100644 --- a/mscorlib/system/reflection/emit/signaturehelper.cs +++ b/mscorlib/system/reflection/emit/signaturehelper.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/signaturetoken.cs b/mscorlib/system/reflection/emit/signaturetoken.cs index a41b2d292..2ae4c1eec 100644 --- a/mscorlib/system/reflection/emit/signaturetoken.cs +++ b/mscorlib/system/reflection/emit/signaturetoken.cs @@ -7,7 +7,7 @@ ** ** Signature: SignatureToken ** -** Microsoft +** [....] ** ** ** Purpose: Represents a Signature to the ILGenerator signature. diff --git a/mscorlib/system/reflection/emit/stringtoken.cs b/mscorlib/system/reflection/emit/stringtoken.cs index ad7216a46..b568cef11 100644 --- a/mscorlib/system/reflection/emit/stringtoken.cs +++ b/mscorlib/system/reflection/emit/stringtoken.cs @@ -7,7 +7,7 @@ ** ** Class: StringToken ** -** Microsoft +** [....] ** ** ** Purpose: Represents a String to the ILGenerator class. diff --git a/mscorlib/system/reflection/emit/symbolmethod.cs b/mscorlib/system/reflection/emit/symbolmethod.cs index 8bca9063d..136789441 100644 --- a/mscorlib/system/reflection/emit/symbolmethod.cs +++ b/mscorlib/system/reflection/emit/symbolmethod.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/symboltype.cs b/mscorlib/system/reflection/emit/symboltype.cs index f6fb66fc3..18f321e7e 100644 --- a/mscorlib/system/reflection/emit/symboltype.cs +++ b/mscorlib/system/reflection/emit/symboltype.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/typebuilder.cs b/mscorlib/system/reflection/emit/typebuilder.cs index 9cf13f212..7833c8f6a 100644 --- a/mscorlib/system/reflection/emit/typebuilder.cs +++ b/mscorlib/system/reflection/emit/typebuilder.cs @@ -4,7 +4,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit { diff --git a/mscorlib/system/reflection/emit/typebuilderinstantiation.cs b/mscorlib/system/reflection/emit/typebuilderinstantiation.cs index 61101139e..0db7978df 100644 --- a/mscorlib/system/reflection/emit/typebuilderinstantiation.cs +++ b/mscorlib/system/reflection/emit/typebuilderinstantiation.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/emit/typetoken.cs b/mscorlib/system/reflection/emit/typetoken.cs index da4b521d1..bfc3c1611 100644 --- a/mscorlib/system/reflection/emit/typetoken.cs +++ b/mscorlib/system/reflection/emit/typetoken.cs @@ -7,7 +7,7 @@ ** ** Class: TypeToken ** -** Microsoft +** [....] ** ** ** Purpose: Represents a Class to the ILGenerator class. diff --git a/mscorlib/system/reflection/emit/unmanagedmarshal.cs b/mscorlib/system/reflection/emit/unmanagedmarshal.cs index 5951fc9f5..1d2ab1063 100644 --- a/mscorlib/system/reflection/emit/unmanagedmarshal.cs +++ b/mscorlib/system/reflection/emit/unmanagedmarshal.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Reflection.Emit { using System.Runtime.InteropServices; diff --git a/mscorlib/system/reflection/emit/xxxontypebuilderinstantiation.cs b/mscorlib/system/reflection/emit/xxxontypebuilderinstantiation.cs index 71a3b53dd..59ae15e5f 100644 --- a/mscorlib/system/reflection/emit/xxxontypebuilderinstantiation.cs +++ b/mscorlib/system/reflection/emit/xxxontypebuilderinstantiation.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection.Emit diff --git a/mscorlib/system/reflection/eventinfo.cs b/mscorlib/system/reflection/eventinfo.cs index 34f324199..c81f87593 100644 --- a/mscorlib/system/reflection/eventinfo.cs +++ b/mscorlib/system/reflection/eventinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/fieldinfo.cs b/mscorlib/system/reflection/fieldinfo.cs index 9f7f9494b..3a7bdfc19 100644 --- a/mscorlib/system/reflection/fieldinfo.cs +++ b/mscorlib/system/reflection/fieldinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/introspectionextensions.cs b/mscorlib/system/reflection/introspectionextensions.cs index 95ba52799..4d393c99b 100644 --- a/mscorlib/system/reflection/introspectionextensions.cs +++ b/mscorlib/system/reflection/introspectionextensions.cs @@ -7,7 +7,7 @@ ** ** Class: TypeInfoExtension ** -** Microsoft +** [....] ** ** ** Purpose: go from type to type info diff --git a/mscorlib/system/reflection/invalidfiltercriteriaexception.cs b/mscorlib/system/reflection/invalidfiltercriteriaexception.cs index c7ae1c8a1..8c7365319 100644 --- a/mscorlib/system/reflection/invalidfiltercriteriaexception.cs +++ b/mscorlib/system/reflection/invalidfiltercriteriaexception.cs @@ -8,7 +8,7 @@ // // InvalidFilterCriteriaException is thrown in FindMembers when the // -// Microsoft +// [....] // filter criteria is not valid for the type of filter being used. // // diff --git a/mscorlib/system/reflection/loaderallocator.cs b/mscorlib/system/reflection/loaderallocator.cs index d8ff5d79d..4b35f9fdd 100644 --- a/mscorlib/system/reflection/loaderallocator.cs +++ b/mscorlib/system/reflection/loaderallocator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/manifestresourceinfo.cs b/mscorlib/system/reflection/manifestresourceinfo.cs index 6026f53d8..496012a52 100644 --- a/mscorlib/system/reflection/manifestresourceinfo.cs +++ b/mscorlib/system/reflection/manifestresourceinfo.cs @@ -7,7 +7,7 @@ ** ** Class: ManifestResourceInfo ** -** Microsoft +** [....] ** ** ** Purpose: For info regarding a manifest resource's topology. diff --git a/mscorlib/system/reflection/mdconstant.cs b/mscorlib/system/reflection/mdconstant.cs index 3f69c080c..f78dc8fb2 100644 --- a/mscorlib/system/reflection/mdconstant.cs +++ b/mscorlib/system/reflection/mdconstant.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/mdimport.cs b/mscorlib/system/reflection/mdimport.cs index 9ff1e3c6c..86d3a25a1 100644 --- a/mscorlib/system/reflection/mdimport.cs +++ b/mscorlib/system/reflection/mdimport.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; @@ -190,7 +190,7 @@ public byte this[int index] } } - // Keep the definition in sync with vm\ManagedMdImport.hpp + // Keep the definition in [....] with vm\ManagedMdImport.hpp internal int m_length; internal IntPtr m_constArray; } @@ -256,7 +256,7 @@ public static bool IsNullToken(int token) internal unsafe struct MetadataEnumResult { - // Keep the definition in sync with vm\ManagedMdImport.hpp + // Keep the definition in [....] with vm\ManagedMdImport.hpp private int[] largeResult; private int length; private fixed int smallResult[16]; diff --git a/mscorlib/system/reflection/memberinfo.cs b/mscorlib/system/reflection/memberinfo.cs index ebdb307ba..33b5c9c7b 100644 --- a/mscorlib/system/reflection/memberinfo.cs +++ b/mscorlib/system/reflection/memberinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/memberinfoserializationholder.cs b/mscorlib/system/reflection/memberinfoserializationholder.cs index 772cccd6e..ee3e0e31b 100644 --- a/mscorlib/system/reflection/memberinfoserializationholder.cs +++ b/mscorlib/system/reflection/memberinfoserializationholder.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/methodbase.cs b/mscorlib/system/reflection/methodbase.cs index f2536f4b7..d36402ddf 100644 --- a/mscorlib/system/reflection/methodbase.cs +++ b/mscorlib/system/reflection/methodbase.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/methodbody.cs b/mscorlib/system/reflection/methodbody.cs index 08570cf4b..005650ac6 100644 --- a/mscorlib/system/reflection/methodbody.cs +++ b/mscorlib/system/reflection/methodbody.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/methodinfo.cs b/mscorlib/system/reflection/methodinfo.cs index 0987d8225..6b8acb771 100644 --- a/mscorlib/system/reflection/methodinfo.cs +++ b/mscorlib/system/reflection/methodinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/missing.cs b/mscorlib/system/reflection/missing.cs index 7b310ebfa..d203d31aa 100644 --- a/mscorlib/system/reflection/missing.cs +++ b/mscorlib/system/reflection/missing.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/module.cs b/mscorlib/system/reflection/module.cs index b318b3901..fb10e18a0 100644 --- a/mscorlib/system/reflection/module.cs +++ b/mscorlib/system/reflection/module.cs @@ -4,8 +4,8 @@ // // ==--== //////////////////////////////////////////////////////////////////////////////// -// Microsoft -// Microsoft +// [....] +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/obfuscateassemblyattribute.cs b/mscorlib/system/reflection/obfuscateassemblyattribute.cs index 4c38baf4b..287a19a76 100644 --- a/mscorlib/system/reflection/obfuscateassemblyattribute.cs +++ b/mscorlib/system/reflection/obfuscateassemblyattribute.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/obfuscationattribute.cs b/mscorlib/system/reflection/obfuscationattribute.cs index 5e9a137cd..3bede5dea 100644 --- a/mscorlib/system/reflection/obfuscationattribute.cs +++ b/mscorlib/system/reflection/obfuscationattribute.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/reflection/parameterinfo.cs b/mscorlib/system/reflection/parameterinfo.cs index 0494899bc..8f6739f1d 100644 --- a/mscorlib/system/reflection/parameterinfo.cs +++ b/mscorlib/system/reflection/parameterinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/parametermodifier.cs b/mscorlib/system/reflection/parametermodifier.cs index ee168addd..545ea83eb 100644 --- a/mscorlib/system/reflection/parametermodifier.cs +++ b/mscorlib/system/reflection/parametermodifier.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/pointer.cs b/mscorlib/system/reflection/pointer.cs index 636795024..ec703d95e 100644 --- a/mscorlib/system/reflection/pointer.cs +++ b/mscorlib/system/reflection/pointer.cs @@ -7,7 +7,7 @@ // // This is a wrapper class for Pointers // -// Microsoft +// [....] // // // diff --git a/mscorlib/system/reflection/propertyinfo.cs b/mscorlib/system/reflection/propertyinfo.cs index 2ea511c43..f105a9ce3 100644 --- a/mscorlib/system/reflection/propertyinfo.cs +++ b/mscorlib/system/reflection/propertyinfo.cs @@ -3,7 +3,7 @@ // Copyright(c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Reflection diff --git a/mscorlib/system/reflection/reflectioncontext.cs b/mscorlib/system/reflection/reflectioncontext.cs index 3b8539732..d559a661f 100644 --- a/mscorlib/system/reflection/reflectioncontext.cs +++ b/mscorlib/system/reflection/reflectioncontext.cs @@ -7,7 +7,7 @@ ** ** Class: ReflectionContext ** -** Microsoft +** [....] ** ** ** Purpose: For Assembly-related stuff. diff --git a/mscorlib/system/reflection/reflectiontypeloadexception.cs b/mscorlib/system/reflection/reflectiontypeloadexception.cs index df95e64a2..07baefda6 100644 --- a/mscorlib/system/reflection/reflectiontypeloadexception.cs +++ b/mscorlib/system/reflection/reflectiontypeloadexception.cs @@ -8,7 +8,7 @@ // // ReflectionTypeLoadException is thrown when multiple TypeLoadExceptions may occur. // -// Microsoft +// [....] // Specifically, when you call Module.GetTypes() this causes multiple class loads to occur. // If there are failures, we continue to load classes and build an array of the successfully // loaded classes. We also build an array of the errors that occur. Then we throw this exception diff --git a/mscorlib/system/reflection/strongnamekeypair.cs b/mscorlib/system/reflection/strongnamekeypair.cs index 6734a4850..b4a736415 100644 --- a/mscorlib/system/reflection/strongnamekeypair.cs +++ b/mscorlib/system/reflection/strongnamekeypair.cs @@ -7,7 +7,7 @@ ** ** File: StrongNameKeyPair.cs ** -** Microsoft +** [....] ** ** ** Purpose: Encapsulate access to a public/private key pair diff --git a/mscorlib/system/reflection/targetexception.cs b/mscorlib/system/reflection/targetexception.cs index c3e51193f..caba5efd1 100644 --- a/mscorlib/system/reflection/targetexception.cs +++ b/mscorlib/system/reflection/targetexception.cs @@ -8,7 +8,7 @@ // // TargetException is thrown when the target to an Invoke is invalid. This may // -// Microsoft +// [....] // occur because the caller doesn't have access to the member, or the target doesn't // define the member, etc. // diff --git a/mscorlib/system/reflection/targetinvocationexception.cs b/mscorlib/system/reflection/targetinvocationexception.cs index dbe11f215..0df1faa9d 100644 --- a/mscorlib/system/reflection/targetinvocationexception.cs +++ b/mscorlib/system/reflection/targetinvocationexception.cs @@ -8,7 +8,7 @@ // // TargetInvocationException is used to report an exception that was thrown // -// Microsoft +// [....] // by the target of an invocation. // // diff --git a/mscorlib/system/reflection/targetparametercountexception.cs b/mscorlib/system/reflection/targetparametercountexception.cs index 60007d1cd..d350a07c2 100644 --- a/mscorlib/system/reflection/targetparametercountexception.cs +++ b/mscorlib/system/reflection/targetparametercountexception.cs @@ -8,7 +8,7 @@ // // TargetParameterCountException is thrown when the number of parameter to an // -// Microsoft +// [....] // invocation doesn't match the number expected. // // diff --git a/mscorlib/system/reflection/typedelegator.cs b/mscorlib/system/reflection/typedelegator.cs index 053c9f58e..59d567cb2 100644 --- a/mscorlib/system/reflection/typedelegator.cs +++ b/mscorlib/system/reflection/typedelegator.cs @@ -5,7 +5,7 @@ // ==--== // TypeDelegator // -// Microsoft +// [....] // This class wraps a Type object and delegates all methods to that Type. namespace System.Reflection { diff --git a/mscorlib/system/reflection/typeinfo.cs b/mscorlib/system/reflection/typeinfo.cs index 098b0add8..842f9e306 100644 --- a/mscorlib/system/reflection/typeinfo.cs +++ b/mscorlib/system/reflection/typeinfo.cs @@ -7,7 +7,7 @@ ** ** Class: TypeInfo ** -** Microsoft +** [....] ** ** ** Purpose: Notion of a type definition diff --git a/mscorlib/system/resources/__fastresourcecomparer.cs b/mscorlib/system/resources/__fastresourcecomparer.cs index e04fca6aa..9b315a100 100644 --- a/mscorlib/system/resources/__fastresourcecomparer.cs +++ b/mscorlib/system/resources/__fastresourcecomparer.cs @@ -5,7 +5,7 @@ // ==--== /*============================================================ ** -** Microsoft +** [....] ** ** Class: FastResourceComparer ** diff --git a/mscorlib/system/resources/filebasedresourcegroveler.cs b/mscorlib/system/resources/filebasedresourcegroveler.cs index c1ea5b4f9..ef75370fe 100644 --- a/mscorlib/system/resources/filebasedresourcegroveler.cs +++ b/mscorlib/system/resources/filebasedresourcegroveler.cs @@ -7,7 +7,7 @@ ** ** Class: FileBasedResourceGroveler ** -** Microsoft +** [....] ** ** ** Purpose: Searches for resources on disk, used for file- diff --git a/mscorlib/system/resources/manifestbasedresourcegroveler.cs b/mscorlib/system/resources/manifestbasedresourcegroveler.cs index 6cb592a6d..f834ac321 100644 --- a/mscorlib/system/resources/manifestbasedresourcegroveler.cs +++ b/mscorlib/system/resources/manifestbasedresourcegroveler.cs @@ -7,7 +7,7 @@ ** ** Class: ManifestBasedResourceGroveler ** -** Microsoft +** [....] ** ** ** Purpose: Searches for resources in Assembly manifest, used diff --git a/mscorlib/system/resources/missingmanifestresourceexception.cs b/mscorlib/system/resources/missingmanifestresourceexception.cs index 2baaaf322..5230ce273 100644 --- a/mscorlib/system/resources/missingmanifestresourceexception.cs +++ b/mscorlib/system/resources/missingmanifestresourceexception.cs @@ -7,7 +7,7 @@ ** ** Class: MissingManifestResourceException ** -** Microsoft +** [....] ** ** ** Purpose: Exception for a missing assembly-level resource diff --git a/mscorlib/system/resources/missingsatelliteassemblyexception.cs b/mscorlib/system/resources/missingsatelliteassemblyexception.cs index e9099224a..66de05a64 100644 --- a/mscorlib/system/resources/missingsatelliteassemblyexception.cs +++ b/mscorlib/system/resources/missingsatelliteassemblyexception.cs @@ -7,7 +7,7 @@ ** ** Class: MissingSatelliteAssemblyException ** -** Microsoft +** [....] ** ** ** Purpose: Exception for a missing satellite assembly needed diff --git a/mscorlib/system/resources/neutralresourceslanguageattribute.cs b/mscorlib/system/resources/neutralresourceslanguageattribute.cs index e22f68833..9ab5e027c 100644 --- a/mscorlib/system/resources/neutralresourceslanguageattribute.cs +++ b/mscorlib/system/resources/neutralresourceslanguageattribute.cs @@ -7,7 +7,7 @@ ** ** Class: NeutralResourcesLanguageAttribute ** -** Microsoft +** [....] ** ** ** Purpose: Tells the ResourceManager what language your main diff --git a/mscorlib/system/resources/resourcefallbackmanager.cs b/mscorlib/system/resources/resourcefallbackmanager.cs index fb6c16067..1b5ce87f6 100644 --- a/mscorlib/system/resources/resourcefallbackmanager.cs +++ b/mscorlib/system/resources/resourcefallbackmanager.cs @@ -7,7 +7,7 @@ ** ** Class: ResourceFallbackManager ** -** Microsoft +** [....] ** ** ** Purpose: Encapsulates CultureInfo fallback for resource @@ -67,7 +67,7 @@ IEnumerator IEnumerable.GetEnumerator() return GetEnumerator(); } - // WARING: This function must be kept in sync with ResourceManager.GetFirstResourceSet() + // WARING: This function must be kept in [....] with ResourceManager.GetFirstResourceSet() public IEnumerator GetEnumerator() { bool reachedNeutralResourcesCulture = false; @@ -234,23 +234,23 @@ private static String[] GetResourceFallbackArray() // settings, and applications built in certain styles. The OS-preferred fallback should // be last, and the user-preferred fallback just breaks certain apps no matter where you put it. // - // Necessary and sufficient conditions for an AppCompat - - - - - - - - - - - - - - - - + // Necessary and sufficient conditions for an AppCompat bug (if we respected user & OS fallbacks): + // 1) A French OS (ie, you walk into an Internet café in Paris) + // 2) A .NET application whose neutral resources are authored in English. + // 3) The application did not provide an English satellite assembly (a common pattern). + // 4) The application is localized to French. + // 5) The user wants to read English, expressed in either of two ways: + // a. Changing Windows’ Display Language in the Regional Options Control Panel + // b. The application explicitly ASKS THE USER what language to display. + // + // Obviously the exact languages above can be interchanged a bit - I’m keeping this concrete. + // Also the NeutralResourcesLanguageAttribute will allow this to work, but usually we set it + // to en-US for our assemblies, meaning all other English cultures are broken. + // + // Workarounds: + // *) Use the NeutralResourcesLanguageAttribute and tell us that your neutral resources + // are in region-neutral English (en). + // *) Consider shipping a region-neutral English satellite assembly. // Future work: // 2) Consider a mechanism for individual assemblies to opt into wanting user-preferred fallback. diff --git a/mscorlib/system/resources/resourcemanager.cs b/mscorlib/system/resources/resourcemanager.cs index a50e6d738..a5f90db3e 100644 --- a/mscorlib/system/resources/resourcemanager.cs +++ b/mscorlib/system/resources/resourcemanager.cs @@ -66,7 +66,7 @@ public virtual CultureInfo GlobalResourceContextBestFitCultureInfo { } [FriendAccessAllowed] - // [Microsoft 3/9/2012] This class should be named PRIErrorInfo. + // [[....] 3/9/2012] This class should be named PRIErrorInfo. // // During Dev11 CLR RC Ask mode, the Windows Modern Resource Manager // made a breaking change such that ResourceMap.GetSubtree returns null when a subtree is @@ -147,27 +147,27 @@ internal class PRIExceptionInfo // which is key for maintainability. // - Makes the ResourceManager more extensible by identifying and // encapsulating what varies - // - Unearthed a - - - - - - - - - - - - - - - - - - - - + // - Unearthed a bug that's been lurking a while in file-based + // lookup paths for InternalGetResourceSet if createIfNotExists is + // false. + // - Reuses logic, e.g. by breaking apart the culture fallback into + // the fallback iterator class, we don't have to repeat the + // sometimes confusing fallback logic across multiple methods + // - Fxcop violations reduced to 1/5th of original count. Most + // importantly, code complexity violations disappeared. + // - Finally, it got rid of dead code paths. Because the big loop was + // so confusing, it masked unused chunks of code. Also, dividing + // between file-based and manifest-based allowed functionaliy + // unused in silverlight to fall out. + // + // Note: this type is integral to the construction of exception objects, + // and sometimes this has to be done in low memory situtations (OOM) or + // to create TypeInitializationExceptions due to failure of a static class + // constructor. This type needs to be extremely careful and assume that + // any type it references may have previously failed to construct, so statics + // belonging to that type may not be initialized. FrameworkEventSource.Log + // is one such example. + // [Serializable] [System.Runtime.InteropServices.ComVisible(true)] @@ -644,7 +644,7 @@ protected virtual String GetResourceFileName(CultureInfo culture) { return sb.ToString(); } - // WARNING: This function must be kept in sync with ResourceFallbackManager.GetEnumerator() + // WARNING: This function must be kept in [....] with ResourceFallbackManager.GetEnumerator() // Return the first ResourceSet, based on the first culture ResourceFallbackManager would return internal ResourceSet GetFirstResourceSet(CultureInfo culture) { diff --git a/mscorlib/system/resources/resourcereader.cs b/mscorlib/system/resources/resourcereader.cs index ad4b8afd7..7f8d20517 100644 --- a/mscorlib/system/resources/resourcereader.cs +++ b/mscorlib/system/resources/resourcereader.cs @@ -7,7 +7,7 @@ ** ** Class: ResourceReader ** -** Microsoft +** [....] ** ** ** Purpose: Default way to read streams of resources on @@ -831,7 +831,7 @@ private Object DeserializeObject(int typeIndex) // types which do demand serialization permission in their // deserialization .cctors will fail. // Also, use a serialization binder to limit bind requests to - // our allowed list of Microsoft types. + // our allowed list of [....] types. _objFormatter.Binder = _typeLimitingBinder; _typeLimitingBinder.ExpectingToDeserialize(type); graph = _objFormatter.UnsafeDeserialize(_store.BaseStream, null); @@ -1128,7 +1128,7 @@ private void InitSafeToDeserializeArray() } else { // Enums should be safe to deserialize, and this helps out - // partially trusted, localized Microsoft apps. + // partially trusted, localized [....] apps. if (resourceType.BaseType == typeof(Enum)) { _safeToDeserialize[i] = true; continue; @@ -1303,7 +1303,7 @@ public override Type BindToType(string assemblyName, string typeName) } } - // Microsoft types may internally use some enums that aren't + // [....] types may internally use some enums that aren't // on our safe to deserialize list, like Font using FontStyle. Type t = ObjectReader.FastBindToType(assemblyName, typeName); if (t.IsEnum) @@ -1314,7 +1314,7 @@ public override Type BindToType(string assemblyName, string typeName) // Throw instead of returning null. // If you're looking at this in a debugger, you've either - // got a hacked .resources file on your hands, or Microsoft + // got a hacked .resources file on your hands, or [....] // types have taken a new dependency on another type. Check // whether assemblyName & typeName refer to a trustworthy type, // & consider adding it to the TypesSafeToDeserialize list. @@ -1400,7 +1400,7 @@ public DictionaryEntry Entry { value = _reader.LoadObject(_dataPosition); // If enumeration and subsequent lookups happen very // frequently in the same process, add a ResourceLocator - // to _resCache here. But Microsoft enumerates and + // to _resCache here. But [....] enumerates and // just about everyone else does lookups. So caching // here may bloat working set. } diff --git a/mscorlib/system/resources/resourceset.cs b/mscorlib/system/resources/resourceset.cs index 0d1234cb6..c722cfb36 100644 --- a/mscorlib/system/resources/resourceset.cs +++ b/mscorlib/system/resources/resourceset.cs @@ -7,7 +7,7 @@ ** ** Class: ResourceSet ** -** Microsoft +** [....] ** ** ** Purpose: Culture-specific collection of resources. diff --git a/mscorlib/system/resources/resourcewriter.cs b/mscorlib/system/resources/resourcewriter.cs index b2b8af7cd..56b84ac25 100644 --- a/mscorlib/system/resources/resourcewriter.cs +++ b/mscorlib/system/resources/resourcewriter.cs @@ -7,7 +7,7 @@ ** ** Class: ResourceWriter ** -** Microsoft +** [....] ** ** ** Purpose: Default way to write strings to a CLR resource diff --git a/mscorlib/system/resources/runtimeresourceset.cs b/mscorlib/system/resources/runtimeresourceset.cs index 0c51f6039..d9cdd07df 100644 --- a/mscorlib/system/resources/runtimeresourceset.cs +++ b/mscorlib/system/resources/runtimeresourceset.cs @@ -7,7 +7,7 @@ ** ** Class: RuntimeResourceSet ** -** Microsoft +** [....] ** ** ** Purpose: CultureInfo-specific collection of resources. diff --git a/mscorlib/system/resources/satellitecontractversionattribute.cs b/mscorlib/system/resources/satellitecontractversionattribute.cs index c0c004568..4987dc9e6 100644 --- a/mscorlib/system/resources/satellitecontractversionattribute.cs +++ b/mscorlib/system/resources/satellitecontractversionattribute.cs @@ -7,7 +7,7 @@ ** ** Class: SatelliteContractVersionAttribute ** -** Microsoft +** [....] ** ** ** Purpose: Specifies which version of a satellite assembly diff --git a/mscorlib/system/rttype.cs b/mscorlib/system/rttype.cs index 490a786f5..55238e66b 100644 --- a/mscorlib/system/rttype.cs +++ b/mscorlib/system/rttype.cs @@ -6,7 +6,7 @@ // // File: RtType.cs // -// Microsoft +// [....] // // Implements System.RuntimeType // @@ -50,7 +50,7 @@ namespace System internal delegate void CtorDelegate(Object instance); - // Keep this in sync with FormatFlags defined in typestring.h + // Keep this in [....] with FormatFlags defined in typestring.h internal enum TypeNameFormatFlags { FormatBasic = 0x00000000, // Not a bitmask, simply the tersest flag settings possible @@ -589,8 +589,8 @@ private void MergeWithGlobalList(T[] list) // Grow the list by exactly one element in this case to avoid null entries at the end. // - // DevDiv #339308 is fixed, but we are keeping this code here for Dev11 in case there are other instances of this - + // DevDiv #339308 is fixed, but we are keeping this code here for Dev11 in case there are other instances of this bug. + // Remove for Dev12. Contract.Assert(false); @@ -5752,7 +5752,7 @@ private OleAutBinder ForwardCallBinder [Flags] private enum DispatchWrapperType : int { - // This enum must stay in sync with the DispatchWrapperType enum defined in MLInfo.h + // This enum must stay in [....] with the DispatchWrapperType enum defined in MLInfo.h Unknown = 0x00000001, Dispatch = 0x00000002, Record = 0x00000004, diff --git a/mscorlib/system/runtime/compilerservices/AsyncMethodBuilder.cs b/mscorlib/system/runtime/compilerservices/AsyncMethodBuilder.cs index b2d762d0c..7e0ed8e89 100644 --- a/mscorlib/system/runtime/compilerservices/AsyncMethodBuilder.cs +++ b/mscorlib/system/runtime/compilerservices/AsyncMethodBuilder.cs @@ -7,7 +7,7 @@ // // AsyncMethodBuilder.cs // -// Microsoft +// [....] // // Compiler-targeted types that build tasks for use as the return types of asynchronous methods. // @@ -49,7 +49,7 @@ public struct AsyncVoidMethodBuilder /// The initialized . public static AsyncVoidMethodBuilder Create() { - // Capture the current sync context. If there isn't one, use the dummy s_noContextCaptured + // Capture the current [....] context. If there isn't one, use the dummy s_noContextCaptured // instance; this allows us to tell the state of no captured context apart from the state // of an improperly constructed builder instance. SynchronizationContext sc = SynchronizationContext.CurrentNoFlow; diff --git a/mscorlib/system/runtime/compilerservices/ConditionalWeakTable.cs b/mscorlib/system/runtime/compilerservices/ConditionalWeakTable.cs index 2f7814328..bae239fea 100644 --- a/mscorlib/system/runtime/compilerservices/ConditionalWeakTable.cs +++ b/mscorlib/system/runtime/compilerservices/ConditionalWeakTable.cs @@ -6,7 +6,7 @@ /*============================================================ ** Class: ConditionalWeakTable ** -** Microsoft +** [....] ** ** Description: Compiler support for runtime-generated "object fields." ** diff --git a/mscorlib/system/runtime/compilerservices/TaskAwaiter.cs b/mscorlib/system/runtime/compilerservices/TaskAwaiter.cs index ec1f77d91..ee78acad6 100644 --- a/mscorlib/system/runtime/compilerservices/TaskAwaiter.cs +++ b/mscorlib/system/runtime/compilerservices/TaskAwaiter.cs @@ -7,7 +7,7 @@ // // TaskAwaiter.cs // -// Microsoft +// [....] // // Types for awaiting Task and Task. These types are emitted from Task{}.GetAwaiter // and Task{}.ConfigureAwait. They are meant to be used only by the compiler, e.g. diff --git a/mscorlib/system/runtime/compilerservices/YieldAwaitable.cs b/mscorlib/system/runtime/compilerservices/YieldAwaitable.cs index 0e04facc0..d1ab22fe9 100644 --- a/mscorlib/system/runtime/compilerservices/YieldAwaitable.cs +++ b/mscorlib/system/runtime/compilerservices/YieldAwaitable.cs @@ -7,7 +7,7 @@ // // YieldAwaitable.cs // -// Microsoft +// [....] // // Compiler-targeted type for switching back into the current execution context, e.g. // diff --git a/mscorlib/system/runtime/compilerservices/compilationrelaxations.cs b/mscorlib/system/runtime/compilerservices/compilationrelaxations.cs index cce631b1c..73d602086 100644 --- a/mscorlib/system/runtime/compilerservices/compilationrelaxations.cs +++ b/mscorlib/system/runtime/compilerservices/compilationrelaxations.cs @@ -11,7 +11,7 @@ namespace System.Runtime.CompilerServices using System; - /// IMPORTANT: Keep this in sync with corhdr.h + /// IMPORTANT: Keep this in [....] with corhdr.h [Serializable] [Flags] [System.Runtime.InteropServices.ComVisible(true)] diff --git a/mscorlib/system/runtime/compilerservices/runtimehelpers.cs b/mscorlib/system/runtime/compilerservices/runtimehelpers.cs index a6d4f8a8a..c9cc8f42f 100644 --- a/mscorlib/system/runtime/compilerservices/runtimehelpers.cs +++ b/mscorlib/system/runtime/compilerservices/runtimehelpers.cs @@ -169,7 +169,7 @@ public static int OffsetToStringData // a String to the first 16-bit character in the String. Skip // over the MethodTable pointer, & String // length. Of course, the String reference points to the memory - // after the sync block, so don't count that. + // after the [....] block, so don't count that. // This property allows C#'s fixed statement to work on Strings. // On 64 bit platforms, this should be 12 (8+4) and on 32 bit 8 (4+4). #if WIN32 diff --git a/mscorlib/system/runtime/exceptionservices/corruptingexceptioncommon.cs b/mscorlib/system/runtime/exceptionservices/corruptingexceptioncommon.cs index 7cc021dbd..13b30a0f2 100644 --- a/mscorlib/system/runtime/exceptionservices/corruptingexceptioncommon.cs +++ b/mscorlib/system/runtime/exceptionservices/corruptingexceptioncommon.cs @@ -13,7 +13,7 @@ ** ** Created: 06/20/2008 ** -** Microsoft +** [....] ** =============================================================================*/ diff --git a/mscorlib/system/runtime/exceptionservices/exceptionnotification.cs b/mscorlib/system/runtime/exceptionservices/exceptionnotification.cs index 57ea2c178..acda22b5d 100644 --- a/mscorlib/system/runtime/exceptionservices/exceptionnotification.cs +++ b/mscorlib/system/runtime/exceptionservices/exceptionnotification.cs @@ -13,7 +13,7 @@ ** ** Created: 10/07/2008 ** -** Microsoft +** [....] ** =============================================================================*/ diff --git a/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs b/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs index b8050ced0..1b5eb8953 100644 --- a/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs +++ b/mscorlib/system/runtime/exceptionservices/exceptionservicescommon.cs @@ -13,7 +13,7 @@ ** ** Created: 11/2/2010 ** -** Microsoft +** [....] ** =============================================================================*/ diff --git a/mscorlib/system/runtime/interopservices/attributes.cs b/mscorlib/system/runtime/interopservices/attributes.cs index 57ce266a9..d3c16ca27 100644 --- a/mscorlib/system/runtime/interopservices/attributes.cs +++ b/mscorlib/system/runtime/interopservices/attributes.cs @@ -439,7 +439,7 @@ public enum VarEnum [Serializable] [System.Runtime.InteropServices.ComVisible(true)] - // Note that this enum should remain in-sync with the CorNativeType enum in corhdr.h + // Note that this enum should remain in-[....] with the CorNativeType enum in corhdr.h public enum UnmanagedType { Bool = 0x2, // 4 byte boolean value (true != 0, false == 0) diff --git a/mscorlib/system/runtime/interopservices/gchandle.cs b/mscorlib/system/runtime/interopservices/gchandle.cs index 5fcee00f2..5480f22e9 100644 --- a/mscorlib/system/runtime/interopservices/gchandle.cs +++ b/mscorlib/system/runtime/interopservices/gchandle.cs @@ -44,7 +44,7 @@ public enum GCHandleType [System.Runtime.InteropServices.ComVisible(true)] public struct GCHandle { - // IMPORTANT: This must be kept in sync with the GCHandleType enum. + // IMPORTANT: This must be kept in [....] with the GCHandleType enum. private const GCHandleType MaxHandleType = GCHandleType.Pinned; #if MDA_SUPPORTED diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs b/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs index 8dfd4c70c..8be810c56 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/attributes.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs index 248643a3c..ad818c93a 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Runtime; @@ -85,7 +85,7 @@ internal void CopyTo(Array array, int arrayIndex) throw new ArgumentOutOfRangeException("arrayIndex"); // Does the dimension in question have sufficient space to copy the expected number of entries? - // We perform this check before valid index check to ensure the exception message is in sync with + // We perform this check before valid index check to ensure the exception message is in [....] with // the following snippet that uses regular framework code: // // ArrayList list = new ArrayList(); diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs index e8aa7ecb1..f86568feb 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/bindablevectortolistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Runtime; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs b/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs index 44b63f911..25c318406 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/clrikeyvaluepairimpl.cs @@ -4,8 +4,8 @@ // // ==--== // -// Microsoft -// Microsoft +// [....] +// [....] using System; using System.Collections.Generic; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs b/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs index 3dc29580b..c7781abf0 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/clripropertyvalueimpl.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Diagnostics.Contracts; @@ -475,7 +475,7 @@ private static T CoerceScalarValue(PropertyType type, object value) { return (T)(object)ipv.GetDouble(); } else { - BCLDebug.Assert(false, "T in coersion function wasn't understood as a type that can be coerced - make sure that CoerceScalarValue and NumericScalarTypes are in sync"); + BCLDebug.Assert(false, "T in coersion function wasn't understood as a type that can be coerced - make sure that CoerceScalarValue and NumericScalarTypes are in [....]"); } } diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs b/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs index 831358e2d..edb419c91 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/clrireferenceimpl.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Collections; @@ -107,7 +107,7 @@ public CLRIReferenceArrayImpl(PropertyType type, T[] obj) _value = obj; // This should not fail but I'm making a cast here anyway just in case - // we have a + // we have a bug (that _value is not an array) or there is a runtime failure _list = (IList) _value; } diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs b/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs index bf762dbef..82e901d71 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/custompropertyimpl.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs index 94a0d9e60..db7e01476 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/dictionarytomapadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs index 60e229954..a4ee4b1ed 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/enumeratortoiteratoradapter.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Collections; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs b/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs index 092e43a2b..5f96a90e7 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtoken.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs b/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs index 152e46f34..2de657df7 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/eventregistrationtokentable.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Collections.Generic; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs b/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs index d505dfac3..5ef1d8c06 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/icustompropertyprovider.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] using System; using System.StubHelpers; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs index cd73d355f..4817cbcf2 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/imapviewtoireadonlydictionaryadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; @@ -98,7 +98,7 @@ internal bool TryGetValue(K key, out V value) value = _this.Lookup(key); return true; } - catch (Exception ex) // Still may hit this case due to a ----, or a potential + catch (Exception ex) // Still may hit this case due to a ----, or a potential bug. { if (__HResults.E_BOUNDS == ex._HResult) { diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs index 9a9c98ab4..32433c99c 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlydictionarytoimapviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs index 1bf26b164..bec4e3e70 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/ireadonlylisttoivectorviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs index e1460806c..08d11e672 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/iteratortoenumeratoradapter.cs @@ -4,8 +4,8 @@ // // ==--== // -// Microsoft -// Microsoft +// [....] +// [....] using System; using System.Collections; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs index 14e43b37e..2e0631196 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/ivectorviewtoireadonlylistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs index fa9e01eb2..7212db3e4 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectoradapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs index 08e99c526..80cd46fb6 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/listtobindablevectorviewadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs index a093837c5..7f5e9cf83 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/listtovectoradapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs b/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs index dd963c54a..e676a47a5 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/managedactivationfactory.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Diagnostics.Contracts; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs index c04a9a0cf..ecaedd87b 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/maptocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs index 8b68eca2b..320397249 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/maptodictionaryadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs index 8854c87e3..d9ea83ecb 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/mapviewtoreadonlycollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs index 0443ed2d1..af4674c3a 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/vectortocollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs index 51858b000..edc20f2b6 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/vectortolistadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs b/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs index f1e95611b..b704460e7 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/vectorviewtoreadonlycollectionadapter.cs @@ -5,7 +5,7 @@ // ==--== // // GPaperin -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs b/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs index c186cf73f..aacf09fdb 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemarshal.cs @@ -4,9 +4,9 @@ // // ==--== // -// Microsoft -// Microsoft -// Microsoft +// [....] +// [....] +// [....] using System; using System.Collections.Generic; diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs b/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs index ff320ed95..137a190b6 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/windowsruntimemetadata.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Runtime.InteropServices.WindowsRuntime { diff --git a/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs b/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs index 0aa99ce42..3de33410c 100644 --- a/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs +++ b/mscorlib/system/runtime/interopservices/windowsruntime/winrtclassactivator.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/runtime/remoting/activationservices.cs b/mscorlib/system/runtime/remoting/activationservices.cs index 4e57e1e55..74b3c5804 100644 --- a/mscorlib/system/runtime/remoting/activationservices.cs +++ b/mscorlib/system/runtime/remoting/activationservices.cs @@ -1745,7 +1745,7 @@ internal void Push(Type typ, Object[] attr) // Need to grow our arrays ... this will be exceedingly rare Object[] newTypes = new Object[activationTypes.Length * 2]; Object[] newAttr = new Object[activationAttributes.Length * 2]; - Contract.Assert(newAttr.Length == newTypes.Length,"These should be in sync!"); + Contract.Assert(newAttr.Length == newTypes.Length,"These should be in [....]!"); Array.Copy(activationTypes, newTypes, activationTypes.Length); Array.Copy(activationAttributes, newAttr, activationAttributes.Length); activationTypes = newTypes; diff --git a/mscorlib/system/runtime/remoting/channelservices.cs b/mscorlib/system/runtime/remoting/channelservices.cs index cc38933cf..0b17b2475 100644 --- a/mscorlib/system/runtime/remoting/channelservices.cs +++ b/mscorlib/system/runtime/remoting/channelservices.cs @@ -6,7 +6,7 @@ // ==--== //* File: Channel.cs //* -//* Author: Tarun Anand (Microsoft) +//* Author: Tarun Anand ([....]) //* //* Purpose: Defines the general purpose remoting proxy //* diff --git a/mscorlib/system/runtime/remoting/channelsinkstacks.cs b/mscorlib/system/runtime/remoting/channelsinkstacks.cs index 95d3b542f..20709a5bd 100644 --- a/mscorlib/system/runtime/remoting/channelsinkstacks.cs +++ b/mscorlib/system/runtime/remoting/channelsinkstacks.cs @@ -453,7 +453,7 @@ public void ServerCallback(IAsyncResult ar) } // ServerChannelSinkStack - // helper class for transforming sync message parameter lists into its + // helper class for transforming [....] message parameter lists into its // async counterparts internal static class AsyncMessageHelper { diff --git a/mscorlib/system/runtime/remoting/clientsponsor.cs b/mscorlib/system/runtime/remoting/clientsponsor.cs index d20b7b9ef..07758b177 100644 --- a/mscorlib/system/runtime/remoting/clientsponsor.cs +++ b/mscorlib/system/runtime/remoting/clientsponsor.cs @@ -7,9 +7,9 @@ // // File: ClientSponsor.cs // -// Contents: Agent for keeping Server Object's lifetime in sync with a client's lifetime +// Contents: Agent for keeping Server Object's lifetime in [....] with a client's lifetime // -// History: 8/9/00 Microsoft Created +// History: 8/9/00 [....] Created // //+---------------------------------------------------------------------------- diff --git a/mscorlib/system/runtime/remoting/configuration.cs b/mscorlib/system/runtime/remoting/configuration.cs index dc299d089..5eb083130 100644 --- a/mscorlib/system/runtime/remoting/configuration.cs +++ b/mscorlib/system/runtime/remoting/configuration.cs @@ -844,7 +844,7 @@ internal static void RegisterWellKnownServiceType(WellKnownServiceTypeEntry entr lock (Info) { // We make an entry in our config tables so as to keep - // both the file-based and programmatic config in sync. + // both the file-based and programmatic config in [....]. Info.AddWellKnownEntry(entry); } } // RegisterWellKnownServiceType diff --git a/mscorlib/system/runtime/remoting/context.cs b/mscorlib/system/runtime/remoting/context.cs index 7ee42e4f6..91d0bbecf 100644 --- a/mscorlib/system/runtime/remoting/context.cs +++ b/mscorlib/system/runtime/remoting/context.cs @@ -436,7 +436,7 @@ internal virtual IMessageSink GetClientContextChain() } iSink++; } - // now check if we raced and set appropriately + // now check if we ----d and set appropriately lock (this) { if (_clientContextChain==null) diff --git a/mscorlib/system/runtime/remoting/crossappdomainchannel.cs b/mscorlib/system/runtime/remoting/crossappdomainchannel.cs index a6c628de3..010996b9e 100644 --- a/mscorlib/system/runtime/remoting/crossappdomainchannel.cs +++ b/mscorlib/system/runtime/remoting/crossappdomainchannel.cs @@ -284,7 +284,7 @@ internal static CrossAppDomainSink FindOrCreateSink(CrossAppDomainData xadData) // warning in CrossAppDomainSink::.ctor above // lock(staticSyncObject) { - // Note: keep this in sync with DomainUnloaded below + // Note: keep this in [....] with DomainUnloaded below int key = xadData.DomainID; if (_sinks == null) { @@ -321,7 +321,7 @@ internal static void DomainUnloaded(Int32 domainID) { return; } - // Note: keep this in sync with FindOrCreateSink + // Note: keep this in [....] with FindOrCreateSink int i = 0; int remove = -1; while (_sinks[i] != null) @@ -476,7 +476,7 @@ internal byte[] DoTransitionDispatch( [System.Security.SecurityCritical] // auto-generated public virtual IMessage SyncProcessMessage(IMessage reqMsg) { - Message.DebugOut("\n::::::::::::::::::::::::: CrossAppDomain Channel: Sync call starting"); + Message.DebugOut("\n::::::::::::::::::::::::: CrossAppDomain Channel: [....] call starting"); IMessage errMsg = InternalSink.ValidateMessage(reqMsg); if (errMsg != null) { @@ -520,7 +520,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) // will terminate the security stackwalk caused when // serialization checks for the correct permissions at the // remoting stack frame so the check won't continue on to - // the user and fail. [from Microsoft] + // the user and fail. [from [....]] // We will hold off from doing this for x-process channels // until the big picture of distributed security is finalized. @@ -560,7 +560,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) if (responseBytes != null) { retStm = new MemoryStream(responseBytes); - Message.DebugOut("::::::::::::::::::::::::::: CrossAppDomain Channel: Sync call returning!!\n"); + Message.DebugOut("::::::::::::::::::::::::::: CrossAppDomain Channel: [....] call returning!!\n"); //*********************** DESERIALIZE RET-MSG ************** desRetMsg = CrossAppDomainSerializer.DeserializeMessage(retStm, reqMsg as IMethodCallMessage); } diff --git a/mscorlib/system/runtime/remoting/crosscontextchannel.cs b/mscorlib/system/runtime/remoting/crosscontextchannel.cs index 52aaf451e..154fc9839 100644 --- a/mscorlib/system/runtime/remoting/crosscontextchannel.cs +++ b/mscorlib/system/runtime/remoting/crosscontextchannel.cs @@ -133,7 +133,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) try { - Message.DebugOut("\n::::::::::::::::::::::::: CrossContext Channel: Sync call starting"); + Message.DebugOut("\n::::::::::::::::::::::::: CrossContext Channel: [....] call starting"); IMessage errMsg = ValidateMessage(reqMsg); if (errMsg != null) { @@ -163,7 +163,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) } } - Message.DebugOut("::::::::::::::::::::::::::: CrossContext Channel: Sync call returning!!\n"); + Message.DebugOut("::::::::::::::::::::::::::: CrossContext Channel: [....] call returning!!\n"); return replyMsg; } diff --git a/mscorlib/system/runtime/remoting/identityholder.cs b/mscorlib/system/runtime/remoting/identityholder.cs index 6959edaf9..3e3650d85 100644 --- a/mscorlib/system/runtime/remoting/identityholder.cs +++ b/mscorlib/system/runtime/remoting/identityholder.cs @@ -449,7 +449,7 @@ internal static Identity FindOrCreateIdentity( if (takeAndRelease) rwlock.AcquireWriterLock(INFINITE); - // SetIdentity will give the correct Id if we raced + // SetIdentity will give the correct Id if we ----d // between the ResolveIdentity call above and now. // (we are unmarshaling, and the server should guarantee // that the uri is unique, so we will use an existing identity diff --git a/mscorlib/system/runtime/remoting/lease.cs b/mscorlib/system/runtime/remoting/lease.cs index cafb08d70..a0884ce4e 100644 --- a/mscorlib/system/runtime/remoting/lease.cs +++ b/mscorlib/system/runtime/remoting/lease.cs @@ -10,7 +10,7 @@ // // Contents: Lease class // -// History: 1/5/00 Microsoft Created +// History: 1/5/00 [....] Created // //+---------------------------------------------------------------------------- diff --git a/mscorlib/system/runtime/remoting/leasemanager.cs b/mscorlib/system/runtime/remoting/leasemanager.cs index 8acbeb049..464f27515 100644 --- a/mscorlib/system/runtime/remoting/leasemanager.cs +++ b/mscorlib/system/runtime/remoting/leasemanager.cs @@ -10,7 +10,7 @@ // // Contents: Administers the leases in an appdomain // -// History: 1/5/00 Microsoft Created +// History: 1/5/00 [....] Created // //+---------------------------------------------------------------------------- diff --git a/mscorlib/system/runtime/remoting/message.cs b/mscorlib/system/runtime/remoting/message.cs index dda57505b..4cba7cf9b 100644 --- a/mscorlib/system/runtime/remoting/message.cs +++ b/mscorlib/system/runtime/remoting/message.cs @@ -48,7 +48,7 @@ internal class Message : IMethodCallMessage, IInternalMessage, ISerializable { // *** NOTE *** - // Keep these in sync with the flags in Message.h + // Keep these in [....] with the flags in Message.h // flags internal const int Sync = 0; // Synchronous call internal const int BeginAsync = 1; // Async Begin call @@ -2018,7 +2018,7 @@ public virtual Object this[Object key] } return null; } - [System.Security.SecuritySafeCritical] // + [System.Security.SecuritySafeCritical] // TODO: review - implements transparent public method set { if (ContainsSpecialKey(key)) @@ -5502,7 +5502,7 @@ internal static void GetParameterMaps(ParameterInfo[] parameters, // // Helper methods for expanding and contracting argument lists - // when translating from async methods to sync methods and back. + // when translating from async methods to [....] methods and back. // internal static Object[] ExpandAsyncEndArgsToSyncArgs(RemotingMethodCachedData syncMethod, diff --git a/mscorlib/system/runtime/remoting/objref.cs b/mscorlib/system/runtime/remoting/objref.cs index a88d0220a..a822b3afe 100644 --- a/mscorlib/system/runtime/remoting/objref.cs +++ b/mscorlib/system/runtime/remoting/objref.cs @@ -642,21 +642,21 @@ private IChannelInfo GetChannelInfoHelper() String urlToBash = bashInfo[0]; String replacementUrl = bashInfo[1]; - // Copy channel info and go Microsoft urls. + // Copy channel info and go [....] urls. ChannelInfo newChInfo = new ChannelInfo(); newChInfo.ChannelData = new Object[oldChannelData.Length]; for (int co = 0; co < oldChannelData.Length; co++) { newChInfo.ChannelData[co] = oldChannelData[co]; - // see if this is one of the ones that we need to Microsoft + // see if this is one of the ones that we need to [....] ChannelDataStore channelDataStore = newChInfo.ChannelData[co] as ChannelDataStore; if (channelDataStore != null) { String[] urls = channelDataStore.ChannelUris; if ((urls != null) && (urls.Length == 1) && urls[0].Equals(urlToBash)) { - // We want to Microsoft just the url, so we do a shallow copy + // We want to [....] just the url, so we do a shallow copy // and replace the url array with the replacementUrl. ChannelDataStore newChannelDataStore = channelDataStore.InternalShallowCopy(); newChannelDataStore.ChannelUris = new String[1]; @@ -1023,7 +1023,7 @@ internal void Init(Object o, Identity idObj, RuntimeType requestedType) Object[] channelData = chan.ChannelData; int channelDataLength = channelData.Length; Object[] newChannelData = new Object[channelDataLength]; - // Clone the data so that we dont Microsoft the current appdomain data which is stored + // Clone the data so that we dont [....] the current appdomain data which is stored // as a static Array.Copy(channelData, newChannelData, channelDataLength); for (int i = 0; i < channelDataLength; i++) diff --git a/mscorlib/system/runtime/remoting/realproxy.cs b/mscorlib/system/runtime/remoting/realproxy.cs index c574c9327..b58d140e2 100644 --- a/mscorlib/system/runtime/remoting/realproxy.cs +++ b/mscorlib/system/runtime/remoting/realproxy.cs @@ -35,7 +35,7 @@ namespace System.Runtime.Remoting.Proxies { using System.Diagnostics.Contracts; - // NOTE: Keep this in sync with unmanaged enum definition in Remoting.h + // NOTE: Keep this in [....] with unmanaged enum definition in Remoting.h [Serializable] internal enum CallType { @@ -52,7 +52,7 @@ internal enum RealProxyFlags Initialized = 0x2 }; - // NOTE: Keep this in sync with unmanaged struct "messageData" in Remoting.h + // NOTE: Keep this in [....] with unmanaged struct "messageData" in Remoting.h [System.Runtime.InteropServices.StructLayout(LayoutKind.Sequential)] internal struct MessageData { @@ -742,7 +742,7 @@ private void PrivateInvoke(ref MessageData msgData, int type) // but the constructormessage hasn't been setup. // so let us just bail out.. // this is currently used by ServicedComponent's for cross appdomain - // pooling: Microsoft + // pooling: [....] // ctorMsg = new ConstructorCallMessage(null, null, null, (RuntimeType)GetProxiedType()); // Set the constructor frame info in the CCM @@ -834,7 +834,7 @@ private void PrivateInvoke(ref MessageData msgData, int type) { // This was a begin-async on a non-Remoting Proxy. For V-1 they - // cannot support Async and end up doing a Sync call. We need + // cannot support Async and end up doing a [....] call. We need // to fill up here to make the call look like async to // the caller. // Create the async result to return diff --git a/mscorlib/system/runtime/remoting/remotingattributes.cs b/mscorlib/system/runtime/remoting/remotingattributes.cs index a11ffd983..244006ea4 100644 --- a/mscorlib/system/runtime/remoting/remotingattributes.cs +++ b/mscorlib/system/runtime/remoting/remotingattributes.cs @@ -258,7 +258,7 @@ private enum MethodCacheFlags // parameter maps // NOTE: these fields are all initialized at the same time however access to // the internal property of each field is locked only on that specific field - // having been initialized. - Microsoft + // having been initialized. - [....] private int[] _inRefArgMap = null; // parameter map of input and ref parameters private int[] _outRefArgMap = null; // parameter map of out and ref parameters (exactly all byref parameters) private int[] _outOnlyArgMap = null; // parameter map of only output parameters diff --git a/mscorlib/system/runtime/remoting/remotingproxy.cs b/mscorlib/system/runtime/remoting/remotingproxy.cs index 3898b45af..c91d22897 100644 --- a/mscorlib/system/runtime/remoting/remotingproxy.cs +++ b/mscorlib/system/runtime/remoting/remotingproxy.cs @@ -233,7 +233,7 @@ public override IMessage Invoke(IMessage reqMsg) // This is called for all remoted calls on a TP except Ctors - // The method called may be Sync, Async or OneWay(special case of Async) + // The method called may be [....], Async or OneWay(special case of Async) // In the Async case we come here for both BeginInvoke & EndInvoke internal virtual IMessage InternalInvoke( IMethodCallMessage reqMcmMsg, bool useDispatchMessage, int callType) diff --git a/mscorlib/system/runtime/remoting/remotingservices.cs b/mscorlib/system/runtime/remoting/remotingservices.cs index 679d4eff4..13b799dbb 100644 --- a/mscorlib/system/runtime/remoting/remotingservices.cs +++ b/mscorlib/system/runtime/remoting/remotingservices.cs @@ -6,7 +6,7 @@ // // File: RemotingServices.cs // -// Microsoft +// [....] // // Author(s): Gopal Kakivaya (GopalK) // @@ -616,7 +616,7 @@ internal static ObjRef MarshalInternal(MarshalByRefObject Obj, String ObjURI, Ty { int channelDataLength = channelData.Length; Object[] newChannelData = new Object[channelDataLength]; - // Clone the data so that we dont Microsoft the current appdomain data which is stored + // Clone the data so that we dont [....] the current appdomain data which is stored // as a static Array.Copy(channelData, newChannelData, channelDataLength); for (int i = 0; i < channelDataLength; i++) diff --git a/mscorlib/system/runtime/remoting/soapinteroptypes.cs b/mscorlib/system/runtime/remoting/soapinteroptypes.cs index 21de0d6cd..07d820acf 100644 --- a/mscorlib/system/runtime/remoting/soapinteroptypes.cs +++ b/mscorlib/system/runtime/remoting/soapinteroptypes.cs @@ -231,7 +231,7 @@ public sealed class SoapDuration { // Convert from ISO/xsd TimeDuration to urt TimeSpan // The form of the time duration is PxxYxxDTxxHxxMxx.xxxS or PxxYxxDTxxHxxMxxS - // Keep in sync with Message.cs + // Keep in [....] with Message.cs public static String XsdType diff --git a/mscorlib/system/runtime/remoting/synchronizeddispatch.cs b/mscorlib/system/runtime/remoting/synchronizeddispatch.cs index 7ade238a0..dc03e3ee7 100644 --- a/mscorlib/system/runtime/remoting/synchronizeddispatch.cs +++ b/mscorlib/system/runtime/remoting/synchronizeddispatch.cs @@ -271,7 +271,7 @@ internal virtual void InitIfNecessary() /* * Call back function -- executed for each work item that * was enqueued. This is invoked by a thread-pool thread for - * async work items and the caller thread for sync items. + * async work items and the caller thread for [....] items. */ private void DispatcherCallBack(Object stateIgnored, bool ignored) { @@ -356,7 +356,7 @@ internal virtual void HandleWorkCompletion() // See if we found a non-signaled work item at the head. if (bNotify) { - // In both sync and async cases we just hand off the _locked state to + // In both [....] and async cases we just hand off the _locked state to // the next thread which will execute. if (nextWork.IsAsync()) { @@ -366,7 +366,7 @@ internal virtual void HandleWorkCompletion() } else { - // Sync-WorkItem: notify the waiting sync-thread. + // [....]-WorkItem: notify the waiting [....]-thread. lock(nextWork) { Monitor.Pulse(nextWork); @@ -419,7 +419,7 @@ internal virtual void HandleWorkRequest(WorkItem work) } else { - // Sync work is queued only if there are other items + // [....] work is queued only if there are other items // already in the queue. lock(work) { @@ -434,7 +434,7 @@ internal virtual void HandleWorkRequest(WorkItem work) } else { - //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] ~~~ ENQUEUE Sync!" + (work.IsDummy()?" DUMMY ":" REAL ") + work._thread); + //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] ~~~ ENQUEUE [....]!" + (work.IsDummy()?" DUMMY ":" REAL ") + work._thread); bQueued = true; work.SetWaiting(); _workItemQueue.Enqueue(work); @@ -514,7 +514,7 @@ internal bool IsNestedCall(IMessage reqMsg) // This returns TRUE only if it is a non-reEntrant context // AND // (the LCID of the reqMsg matches that of - // the top level sync call lcid associated with the context. + // the top level [....] call lcid associated with the context. // OR // it matches one of the async call out lcids) @@ -668,7 +668,7 @@ public IMessageSink NextSink //*************************************** WORK ITEM ********************************// /* - * A work item holds the info about a call to Sync or + * A work item holds the info about a call to [....] or * Async-ProcessMessage. */ internal class WorkItem @@ -681,9 +681,9 @@ internal class WorkItem internal int _flags; internal IMessage _reqMsg; internal IMessageSink _nextSink; - // ReplySink will be null for an sync work item. + // ReplySink will be null for an [....] work item. internal IMessageSink _replySink; - // ReplyMsg is set once the sync call is completed + // ReplyMsg is set once the [....] call is completed internal IMessage _replyMsg; // Context in which the work should execute. @@ -778,14 +778,14 @@ internal static Object ExecuteCallback(Object[] args) } /* - * Execute is called to complete a work item (sync or async). + * Execute is called to complete a work item ([....] or async). * Execute assumes that the context is set correctly and the lock * is taken (i.e. it makes no policy decisions) * * It is called from the following 3 points: * 1. thread pool thread executing the callback for an async item - * 2. calling thread executing the callback for a queued sync item - * 3. calling thread directly calling Execute for a non-queued sync item + * 2. calling thread executing the callback for a queued [....] item + * 3. calling thread directly calling Execute for a non-queued [....] item */ [System.Security.SecurityCritical] // auto-generated internal virtual void Execute() @@ -842,20 +842,20 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) // Notify the property that we are leaving _property.HandleThreadExit(); - //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] R: Sync call-out"); + //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] R: [....] call-out"); replyMsg = _nextSink.SyncProcessMessage(reqMsg); // We will just block till we are given permission to re-enter // Notify the property that we wish to re-enter the domain. // This will block the thread here if someone is in the domain. - //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] R: Sync call-out returned, waiting for lock"); + //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] R: [....] call-out returned, waiting for lock"); _property.HandleThreadReEntry(); Contract.Assert(_property.Locked == true,"_property.Locked == true"); } else { // In the non-reentrant case we are just a pass-through sink - //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] NR: Sync call-out (pass through)"); + //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] NR: [....] call-out (pass through)"); // We should mark the domain with our LCID so that call-backs are allowed to enter.. LogicalCallContext cctx = (LogicalCallContext) reqMsg.Properties[Message.CallContextKey]; @@ -868,7 +868,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) // start of each Invoke. As an optimization we now do it // here in a delayed fashion... since currently only // Synchronization needs it - // Note that for Sync-calls we would just inherit an LCID + // Note that for [....]-calls we would just inherit an LCID // if the call has one, if not we create one. However for // async calls we always generate a new LCID. lcid = Identity.GetNewLogicalCallID(); @@ -896,7 +896,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) { _property.SyncCallOutLCID = null; - // The sync callOut is done, we do not need the lcid + // The [....] callOut is done, we do not need the lcid // that was associated with the call any more. // (clear it only if we added one to the reqMsg) if (bClear) @@ -914,7 +914,7 @@ public virtual IMessage SyncProcessMessage(IMessage reqMsg) } } - //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] NR: Sync call-out returned"); + //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] NR: [....] call-out returned"); } return replyMsg; } @@ -952,7 +952,7 @@ public virtual IMessageCtrl AsyncProcessMessage(IMessage reqMsg, IMessageSink re Contract.Assert( _property.SyncCallOutLCID == null, - "Cannot handle async call outs when already in a top-level sync call out"); + "Cannot handle async call outs when already in a top-level [....] call out"); //DBGConsole.WriteLine(Thread.CurrentThread.GetHashCode()+"] NR: Async CallOut: adding to lcidList: " + lcid); _property.AsyncCallOutLCIDList.Add(lcid); } @@ -1012,7 +1012,7 @@ internal AsyncReplySink(IMessageSink nextSink, SynchronizationAttribute prop) public virtual IMessage SyncProcessMessage(IMessage reqMsg) { - // We handle this as a regular new Sync workItem + // We handle this as a regular new [....] workItem // 1. Create a work item WorkItem work = new WorkItem(reqMsg, _nextSink, diff --git a/mscorlib/system/runtime/remoting/urlattribute.cs b/mscorlib/system/runtime/remoting/urlattribute.cs index d900c5222..37f9d0f7a 100644 --- a/mscorlib/system/runtime/remoting/urlattribute.cs +++ b/mscorlib/system/runtime/remoting/urlattribute.cs @@ -7,12 +7,12 @@ ** ** File: UrlAttribute.cs ** -** Author: Tarun Anand (Microsoft) +** Author: Tarun Anand ([....]) ** ** Purpose: Defines an attribute which can be used at the callsite to ** specify the URL at which the activation will happen. ** -** Date: Microsoft 30, 2000 +** Date: [....] 30, 2000 ** ===========================================================*/ namespace System.Runtime.Remoting.Activation { diff --git a/mscorlib/system/runtime/serialization/formatters/soapfault.cs b/mscorlib/system/runtime/serialization/formatters/soapfault.cs index c610f69b6..849b0644e 100644 --- a/mscorlib/system/runtime/serialization/formatters/soapfault.cs +++ b/mscorlib/system/runtime/serialization/formatters/soapfault.cs @@ -7,7 +7,7 @@ ** ** Class: SoapFault ** - ** Author: Peter de Jong (Microsoft) + ** Author: Peter de Jong ([....]) ** ** Purpose: Specifies information for a Soap Fault ** diff --git a/mscorlib/system/runtime/serialization/objectclonehelper.cs b/mscorlib/system/runtime/serialization/objectclonehelper.cs index 154d0bbd8..2ab12c782 100644 --- a/mscorlib/system/runtime/serialization/objectclonehelper.cs +++ b/mscorlib/system/runtime/serialization/objectclonehelper.cs @@ -92,7 +92,7 @@ internal static object GetObjectData(object serObj, out string typeName, out str } else { - // Getting here means a + // Getting here means a bug in cloner throw new ArgumentException(Environment.GetResourceString("Arg_SerializationException")); } diff --git a/mscorlib/system/runtime/serialization/safeserializationmanager.cs b/mscorlib/system/runtime/serialization/safeserializationmanager.cs index 5f1b03000..8dbe02ab7 100644 --- a/mscorlib/system/runtime/serialization/safeserializationmanager.cs +++ b/mscorlib/system/runtime/serialization/safeserializationmanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] using System; using System.Collections; diff --git a/mscorlib/system/runtime/serialization/streamingcontext.cs b/mscorlib/system/runtime/serialization/streamingcontext.cs index 978d9ce78..0f223e74b 100644 --- a/mscorlib/system/runtime/serialization/streamingcontext.cs +++ b/mscorlib/system/runtime/serialization/streamingcontext.cs @@ -56,7 +56,7 @@ public StreamingContextStates State { } // ********************************************************** - // Keep these in sync with the version in vm\runtimehandles.h + // Keep these in [....] with the version in vm\runtimehandles.h // ********************************************************** [Serializable] [Flags] diff --git a/mscorlib/system/runtime/versioning/binarycompatibility.cs b/mscorlib/system/runtime/versioning/binarycompatibility.cs index e9f6817ab..441988f30 100644 --- a/mscorlib/system/runtime/versioning/binarycompatibility.cs +++ b/mscorlib/system/runtime/versioning/binarycompatibility.cs @@ -7,7 +7,7 @@ ** ** Class: BinaryCompatibility ** -** Microsoft +** [....] ** ** ** Purpose: This class is used to determine which binary compatibility diff --git a/mscorlib/system/runtime/versioning/multitargetinghelpers.cs b/mscorlib/system/runtime/versioning/multitargetinghelpers.cs index 4d6f0b3ff..51f68edb9 100644 --- a/mscorlib/system/runtime/versioning/multitargetinghelpers.cs +++ b/mscorlib/system/runtime/versioning/multitargetinghelpers.cs @@ -7,7 +7,7 @@ ** ** Class: MultitargetingHelpers ** -** Microsoft +** [....] ** ** ** Purpose: Central repository for helpers supporting diff --git a/mscorlib/system/runtimehandles.cs b/mscorlib/system/runtimehandles.cs index 5d5818e30..05cecb7b1 100644 --- a/mscorlib/system/runtimehandles.cs +++ b/mscorlib/system/runtimehandles.cs @@ -2149,7 +2149,7 @@ private extern void GetSignature( #region Private Data Members // - // Keep the layout in sync with SignatureNative in the VM + // Keep the layout in [....] with SignatureNative in the VM // internal RuntimeType[] m_arguments; internal RuntimeType m_declaringType; diff --git a/mscorlib/system/security/accesscontrol/ace.cs b/mscorlib/system/security/accesscontrol/ace.cs index 4776e5f6d..f0dcbd619 100644 --- a/mscorlib/system/security/accesscontrol/ace.cs +++ b/mscorlib/system/security/accesscontrol/ace.cs @@ -137,8 +137,8 @@ internal void MarshalHeader( byte[] binaryForm, int offset ) { // // Only have two bytes to store the length in. - // Indicates a - + // Indicates a bug in the implementation, not in user's code. + // Contract.Assert( false, "Length > ushort.MaxValue" ); throw new SystemException(); @@ -395,8 +395,8 @@ public static GenericAce CreateFromBinaryForm( byte[] binaryForm, int offset ) if (((!( result is ObjectAce )) && (( binaryForm[offset + 2] << 0 ) + ( binaryForm[offset + 3] << 8 ) != result.BinaryLength )) // // This is needed because object aces created through ADSI have the advertised ACE length - // greater than the actual length by 32 ( - + // greater than the actual length by 32 (bug in ADSI). + // || (( result is ObjectAce ) && (( binaryForm[offset + 2] << 0 ) + ( binaryForm[offset + 3] << 8 ) != result.BinaryLength ) && ((( binaryForm[offset + 2] << 0 ) + ( binaryForm[offset + 3] << 8 ) - 32 ) != result.BinaryLength ))) { goto InvalidParameter; @@ -1199,8 +1199,8 @@ private AceQualifier QualifierFromType( AceType type, out bool isCallback ) default: // - // Indicates a - + // Indicates a bug in the implementation, not in user's code + // Contract.Assert( false, "Invalid ACE type" ); throw new SystemException(); diff --git a/mscorlib/system/security/accesscontrol/acl.cs b/mscorlib/system/security/accesscontrol/acl.cs index 71d016bdd..674cdd485 100644 --- a/mscorlib/system/security/accesscontrol/acl.cs +++ b/mscorlib/system/security/accesscontrol/acl.cs @@ -373,9 +373,9 @@ internal void SetBinaryForm( byte[] binaryForm, int offset ) if ( aceLength % 4 != 0 ) { // - // This indicates a - - + // This indicates a bug in one of the ACE classes. + // Binary length of an ace must ALWAYS be divisible by 4. + // Contract.Assert( false, "aceLength % 4 != 0" ); throw new SystemException(); @@ -389,8 +389,8 @@ internal void SetBinaryForm( byte[] binaryForm, int offset ) // Increment the offset by the advertised length rather than the // actual binary length. (Ideally these two should match, but for // object aces created through ADSI, the actual length is 32 bytes - // less than the allocated size of the ACE. This is a - + // less than the allocated size of the ACE. This is a bug in ADSI.) + // offset += (binaryForm[offset + 2] << 0) + (binaryForm[offset + 3] << 8); } else @@ -512,9 +512,9 @@ public override void GetBinaryForm( byte[] binaryForm, int offset ) if ( aceLength % 4 != 0 ) { // - // This indicates a - - + // This indicates a bug in one of the ACE classes. + // Binary length of an ace must ALWAYS be divisible by 4. + // Contract.Assert( false, "aceLength % 4 != 0" ); throw new SystemException(); @@ -548,9 +548,9 @@ public override GenericAce this[int index] if ( value.BinaryLength % 4 != 0 ) { // - // This indicates a - - + // This indicates a bug in one of the ACE classes. + // Binary length of an ace must ALWAYS be divisible by 4. + // Contract.Assert( false, "aceLength % 4 != 0" ); throw new SystemException(); @@ -1787,7 +1787,7 @@ private bool CanonicalCheck( bool isDacl ) if ( ace == null ) { // - // Afraid to yank this statement now + // <[....]-9/19/2004> Afraid to yank this statement now // for fear of destabilization, so adding an assert instead // diff --git a/mscorlib/system/security/accesscontrol/securitydescriptor.cs b/mscorlib/system/security/accesscontrol/securitydescriptor.cs index cf75b4a7d..099ebdec1 100644 --- a/mscorlib/system/security/accesscontrol/securitydescriptor.cs +++ b/mscorlib/system/security/accesscontrol/securitydescriptor.cs @@ -913,7 +913,7 @@ private void CreateFromParts( bool isContainer, bool isDS, ControlFlags flags, S ControlFlags actualFlags = flags | ControlFlags.DiscretionaryAclPresent; // - // Keep SACL and the flag bit in sync. + // Keep SACL and the flag bit in [....]. // if (systemAcl == null) @@ -1263,7 +1263,7 @@ internal void UpdateControlFlags(ControlFlags flagsToUpdate, ControlFlags newFla // // These two add/remove method must be called with great care (and thus it is internal) - // The caller is responsible for keeping the SaclPresent and DaclPresent bits in sync + // The caller is responsible for keeping the SaclPresent and DaclPresent bits in [....] // with the actual SACL and DACL. // diff --git a/mscorlib/system/security/attributes.cs b/mscorlib/system/security/attributes.cs index d1d5ec45c..19e46de5b 100644 --- a/mscorlib/system/security/attributes.cs +++ b/mscorlib/system/security/attributes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] using System.Runtime.InteropServices; namespace System.Security diff --git a/mscorlib/system/security/builtinpermissionsets.cs b/mscorlib/system/security/builtinpermissionsets.cs index b3f656376..be1d10fdc 100644 --- a/mscorlib/system/security/builtinpermissionsets.cs +++ b/mscorlib/system/security/builtinpermissionsets.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/claims/Claim.cs b/mscorlib/system/security/claims/Claim.cs index 9a49bc497..decc52ecf 100644 --- a/mscorlib/system/security/claims/Claim.cs +++ b/mscorlib/system/security/claims/Claim.cs @@ -7,7 +7,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/claims/ClaimsIdentity.cs b/mscorlib/system/security/claims/ClaimsIdentity.cs index 87a8604ab..5b8627cd9 100644 --- a/mscorlib/system/security/claims/ClaimsIdentity.cs +++ b/mscorlib/system/security/claims/ClaimsIdentity.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/claims/ClaimsPrincipal.cs b/mscorlib/system/security/claims/ClaimsPrincipal.cs index 3512df9da..a8b807d69 100644 --- a/mscorlib/system/security/claims/ClaimsPrincipal.cs +++ b/mscorlib/system/security/claims/ClaimsPrincipal.cs @@ -7,7 +7,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/claims/RoleClaimProvider.cs b/mscorlib/system/security/claims/RoleClaimProvider.cs index 3664f9142..3a061e99c 100644 --- a/mscorlib/system/security/claims/RoleClaimProvider.cs +++ b/mscorlib/system/security/claims/RoleClaimProvider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // // RoleClaimProvider.cs diff --git a/mscorlib/system/security/codeaccesspermission.cs b/mscorlib/system/security/codeaccesspermission.cs index e1d1bb12c..98fb570b4 100644 --- a/mscorlib/system/security/codeaccesspermission.cs +++ b/mscorlib/system/security/codeaccesspermission.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Security { using System.IO; diff --git a/mscorlib/system/security/codeaccesssecurityengine.cs b/mscorlib/system/security/codeaccesssecurityengine.cs index 804cc50b1..45b3eccba 100644 --- a/mscorlib/system/security/codeaccesssecurityengine.cs +++ b/mscorlib/system/security/codeaccesssecurityengine.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security { @@ -20,7 +20,7 @@ namespace System.Security { using System.Diagnostics.Contracts; // Used in DemandInternal, to remember the result of previous demands - // KEEP IN SYNC WITH DEFINITIONS IN SECURITYPOLICY.H + // KEEP IN [....] WITH DEFINITIONS IN SECURITYPOLICY.H [Serializable] internal enum PermissionType { diff --git a/mscorlib/system/security/cryptography/asymmetricalgorithm.cs b/mscorlib/system/security/cryptography/asymmetricalgorithm.cs index ec0636390..1e2184537 100644 --- a/mscorlib/system/security/cryptography/asymmetricalgorithm.cs +++ b/mscorlib/system/security/cryptography/asymmetricalgorithm.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/asymmetrickeyexchangedeformatter.cs b/mscorlib/system/security/cryptography/asymmetrickeyexchangedeformatter.cs index 1492e46ba..f9272ee23 100644 --- a/mscorlib/system/security/cryptography/asymmetrickeyexchangedeformatter.cs +++ b/mscorlib/system/security/cryptography/asymmetrickeyexchangedeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/asymmetrickeyexchangeformatter.cs b/mscorlib/system/security/cryptography/asymmetrickeyexchangeformatter.cs index 5dca811ed..1da8d9b89 100644 --- a/mscorlib/system/security/cryptography/asymmetrickeyexchangeformatter.cs +++ b/mscorlib/system/security/cryptography/asymmetrickeyexchangeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/asymmetricsignaturedeformatter.cs b/mscorlib/system/security/cryptography/asymmetricsignaturedeformatter.cs index df836d2b0..232e711da 100644 --- a/mscorlib/system/security/cryptography/asymmetricsignaturedeformatter.cs +++ b/mscorlib/system/security/cryptography/asymmetricsignaturedeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/asymmetricsignatureformatter.cs b/mscorlib/system/security/cryptography/asymmetricsignatureformatter.cs index 37f1d65f6..6911141f4 100644 --- a/mscorlib/system/security/cryptography/asymmetricsignatureformatter.cs +++ b/mscorlib/system/security/cryptography/asymmetricsignatureformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/base64transforms.cs b/mscorlib/system/security/cryptography/base64transforms.cs index 05efe3c3e..91ffbd4f4 100644 --- a/mscorlib/system/security/cryptography/base64transforms.cs +++ b/mscorlib/system/security/cryptography/base64transforms.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/crypto.cs b/mscorlib/system/security/cryptography/crypto.cs index 5d2e6a321..b3868d468 100644 --- a/mscorlib/system/security/cryptography/crypto.cs +++ b/mscorlib/system/security/cryptography/crypto.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // @@ -20,7 +20,7 @@ namespace System.Security.Cryptography { // and ciphertext-stealing (CTS). Not all implementations will support all modes. [Serializable] [System.Runtime.InteropServices.ComVisible(true)] - public enum CipherMode { // Please keep in sync with wincrypt.h + public enum CipherMode { // Please keep in [....] with wincrypt.h CBC = 1, ECB = 2, OFB = 3, diff --git a/mscorlib/system/security/cryptography/cryptoapitransform.cs b/mscorlib/system/security/cryptography/cryptoapitransform.cs index 6855436bf..5f430f311 100644 --- a/mscorlib/system/security/cryptography/cryptoapitransform.cs +++ b/mscorlib/system/security/cryptography/cryptoapitransform.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/cryptoconfig.cs b/mscorlib/system/security/cryptography/cryptoconfig.cs index 7a81d9b05..7d3eb777e 100644 --- a/mscorlib/system/security/cryptography/cryptoconfig.cs +++ b/mscorlib/system/security/cryptography/cryptoconfig.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/cryptostream.cs b/mscorlib/system/security/cryptography/cryptostream.cs index 71cd2fd18..efbe8b773 100644 --- a/mscorlib/system/security/cryptography/cryptostream.cs +++ b/mscorlib/system/security/cryptography/cryptostream.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/derivebytes.cs b/mscorlib/system/security/cryptography/derivebytes.cs index ee2265e72..c7ed830c8 100644 --- a/mscorlib/system/security/cryptography/derivebytes.cs +++ b/mscorlib/system/security/cryptography/derivebytes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/des.cs b/mscorlib/system/security/cryptography/des.cs index 7297ffa3e..7bd6d2f72 100644 --- a/mscorlib/system/security/cryptography/des.cs +++ b/mscorlib/system/security/cryptography/des.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/descryptoserviceprovider.cs b/mscorlib/system/security/cryptography/descryptoserviceprovider.cs index 52c51a758..c3a674873 100644 --- a/mscorlib/system/security/cryptography/descryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/descryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/dsa.cs b/mscorlib/system/security/cryptography/dsa.cs index d51bf2f78..7f4b4a31a 100644 --- a/mscorlib/system/security/cryptography/dsa.cs +++ b/mscorlib/system/security/cryptography/dsa.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/dsacryptoserviceprovider.cs b/mscorlib/system/security/cryptography/dsacryptoserviceprovider.cs index 469b1f49d..318b09813 100644 --- a/mscorlib/system/security/cryptography/dsacryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/dsacryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/dsasignaturedeformatter.cs b/mscorlib/system/security/cryptography/dsasignaturedeformatter.cs index bf57d241c..3f8d457d9 100644 --- a/mscorlib/system/security/cryptography/dsasignaturedeformatter.cs +++ b/mscorlib/system/security/cryptography/dsasignaturedeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/dsasignatureformatter.cs b/mscorlib/system/security/cryptography/dsasignatureformatter.cs index 260113a9e..8bc61b1c3 100644 --- a/mscorlib/system/security/cryptography/dsasignatureformatter.cs +++ b/mscorlib/system/security/cryptography/dsasignatureformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hashalgorithm.cs b/mscorlib/system/security/cryptography/hashalgorithm.cs index 83d30b64a..6d9083317 100644 --- a/mscorlib/system/security/cryptography/hashalgorithm.cs +++ b/mscorlib/system/security/cryptography/hashalgorithm.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmac.cs b/mscorlib/system/security/cryptography/hmac.cs index a169beca1..d87881456 100644 --- a/mscorlib/system/security/cryptography/hmac.cs +++ b/mscorlib/system/security/cryptography/hmac.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacmd5.cs b/mscorlib/system/security/cryptography/hmacmd5.cs index 0a3347113..da536c01f 100644 --- a/mscorlib/system/security/cryptography/hmacmd5.cs +++ b/mscorlib/system/security/cryptography/hmacmd5.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacripemd160.cs b/mscorlib/system/security/cryptography/hmacripemd160.cs index 8b2aabebd..991d877ff 100644 --- a/mscorlib/system/security/cryptography/hmacripemd160.cs +++ b/mscorlib/system/security/cryptography/hmacripemd160.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacsha1.cs b/mscorlib/system/security/cryptography/hmacsha1.cs index 5dd65d6d6..f58e3cabc 100644 --- a/mscorlib/system/security/cryptography/hmacsha1.cs +++ b/mscorlib/system/security/cryptography/hmacsha1.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacsha256.cs b/mscorlib/system/security/cryptography/hmacsha256.cs index e4d045278..7a4841100 100644 --- a/mscorlib/system/security/cryptography/hmacsha256.cs +++ b/mscorlib/system/security/cryptography/hmacsha256.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacsha384.cs b/mscorlib/system/security/cryptography/hmacsha384.cs index 068944c0e..d01847ba2 100644 --- a/mscorlib/system/security/cryptography/hmacsha384.cs +++ b/mscorlib/system/security/cryptography/hmacsha384.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/hmacsha512.cs b/mscorlib/system/security/cryptography/hmacsha512.cs index 886d11bc0..e037365e1 100644 --- a/mscorlib/system/security/cryptography/hmacsha512.cs +++ b/mscorlib/system/security/cryptography/hmacsha512.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/icspasymmetricalgorithm.cs b/mscorlib/system/security/cryptography/icspasymmetricalgorithm.cs index d5b501ce5..f726d36a0 100644 --- a/mscorlib/system/security/cryptography/icspasymmetricalgorithm.cs +++ b/mscorlib/system/security/cryptography/icspasymmetricalgorithm.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/keyedhashalgorithm.cs b/mscorlib/system/security/cryptography/keyedhashalgorithm.cs index ca714da0d..a547d240a 100644 --- a/mscorlib/system/security/cryptography/keyedhashalgorithm.cs +++ b/mscorlib/system/security/cryptography/keyedhashalgorithm.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/mactripledes.cs b/mscorlib/system/security/cryptography/mactripledes.cs index 19d8be122..a0d4e7d92 100644 --- a/mscorlib/system/security/cryptography/mactripledes.cs +++ b/mscorlib/system/security/cryptography/mactripledes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/md5.cs b/mscorlib/system/security/cryptography/md5.cs index 0d2cbc5ee..894eeae6a 100644 --- a/mscorlib/system/security/cryptography/md5.cs +++ b/mscorlib/system/security/cryptography/md5.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/md5cryptoserviceprovider.cs b/mscorlib/system/security/cryptography/md5cryptoserviceprovider.cs index bbd42c334..33c71335e 100644 --- a/mscorlib/system/security/cryptography/md5cryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/md5cryptoserviceprovider.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/passwordderivebytes.cs b/mscorlib/system/security/cryptography/passwordderivebytes.cs index 634cad2bd..23183a883 100644 --- a/mscorlib/system/security/cryptography/passwordderivebytes.cs +++ b/mscorlib/system/security/cryptography/passwordderivebytes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/pkcs1maskgenerationmethod.cs b/mscorlib/system/security/cryptography/pkcs1maskgenerationmethod.cs index 52bea46e8..c48d26cb4 100644 --- a/mscorlib/system/security/cryptography/pkcs1maskgenerationmethod.cs +++ b/mscorlib/system/security/cryptography/pkcs1maskgenerationmethod.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Cryptography { diff --git a/mscorlib/system/security/cryptography/randomnumbergenerator.cs b/mscorlib/system/security/cryptography/randomnumbergenerator.cs index 7e4a29475..1b28257b5 100644 --- a/mscorlib/system/security/cryptography/randomnumbergenerator.cs +++ b/mscorlib/system/security/cryptography/randomnumbergenerator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rc2.cs b/mscorlib/system/security/cryptography/rc2.cs index 1089bf030..b4012db86 100644 --- a/mscorlib/system/security/cryptography/rc2.cs +++ b/mscorlib/system/security/cryptography/rc2.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rc2cryptoserviceprovider.cs b/mscorlib/system/security/cryptography/rc2cryptoserviceprovider.cs index 1b607ef70..88f584a51 100644 --- a/mscorlib/system/security/cryptography/rc2cryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/rc2cryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rfc2898derivebytes.cs b/mscorlib/system/security/cryptography/rfc2898derivebytes.cs index ab8edce48..89099cb26 100644 --- a/mscorlib/system/security/cryptography/rfc2898derivebytes.cs +++ b/mscorlib/system/security/cryptography/rfc2898derivebytes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rijndael.cs b/mscorlib/system/security/cryptography/rijndael.cs index 6476b4148..2964bc351 100644 --- a/mscorlib/system/security/cryptography/rijndael.cs +++ b/mscorlib/system/security/cryptography/rijndael.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rijndaelmanaged.cs b/mscorlib/system/security/cryptography/rijndaelmanaged.cs index c394cec04..b12bdfbec 100644 --- a/mscorlib/system/security/cryptography/rijndaelmanaged.cs +++ b/mscorlib/system/security/cryptography/rijndaelmanaged.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rijndaelmanagedtransform.cs b/mscorlib/system/security/cryptography/rijndaelmanagedtransform.cs index dc93a6317..79829fac6 100644 --- a/mscorlib/system/security/cryptography/rijndaelmanagedtransform.cs +++ b/mscorlib/system/security/cryptography/rijndaelmanagedtransform.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/ripemd160.cs b/mscorlib/system/security/cryptography/ripemd160.cs index b78f13433..55edf263f 100644 --- a/mscorlib/system/security/cryptography/ripemd160.cs +++ b/mscorlib/system/security/cryptography/ripemd160.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/ripemd160managed.cs b/mscorlib/system/security/cryptography/ripemd160managed.cs index 4196bd8de..bf13aabcd 100644 --- a/mscorlib/system/security/cryptography/ripemd160managed.cs +++ b/mscorlib/system/security/cryptography/ripemd160managed.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rngcryptoserviceprovider.cs b/mscorlib/system/security/cryptography/rngcryptoserviceprovider.cs index 226632e81..073f6680f 100644 --- a/mscorlib/system/security/cryptography/rngcryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/rngcryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rsa.cs b/mscorlib/system/security/cryptography/rsa.cs index dc8a6572d..4a719de5c 100644 --- a/mscorlib/system/security/cryptography/rsa.cs +++ b/mscorlib/system/security/cryptography/rsa.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs b/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs index e27577d7a..0bf87db77 100644 --- a/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/rsacryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rsaoaepkeyexchangedeformatter.cs b/mscorlib/system/security/cryptography/rsaoaepkeyexchangedeformatter.cs index 87910a4e1..416b29f50 100644 --- a/mscorlib/system/security/cryptography/rsaoaepkeyexchangedeformatter.cs +++ b/mscorlib/system/security/cryptography/rsaoaepkeyexchangedeformatter.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Cryptography { diff --git a/mscorlib/system/security/cryptography/rsaoaepkeyexchangeformatter.cs b/mscorlib/system/security/cryptography/rsaoaepkeyexchangeformatter.cs index 316266304..68746fe17 100644 --- a/mscorlib/system/security/cryptography/rsaoaepkeyexchangeformatter.cs +++ b/mscorlib/system/security/cryptography/rsaoaepkeyexchangeformatter.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Cryptography { diff --git a/mscorlib/system/security/cryptography/rsapkcs1keyexchangedeformatter.cs b/mscorlib/system/security/cryptography/rsapkcs1keyexchangedeformatter.cs index 3ea793668..ed412c64d 100644 --- a/mscorlib/system/security/cryptography/rsapkcs1keyexchangedeformatter.cs +++ b/mscorlib/system/security/cryptography/rsapkcs1keyexchangedeformatter.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Cryptography { diff --git a/mscorlib/system/security/cryptography/rsapkcs1keyexchangeformatter.cs b/mscorlib/system/security/cryptography/rsapkcs1keyexchangeformatter.cs index cfb816dbf..c0c094bb3 100644 --- a/mscorlib/system/security/cryptography/rsapkcs1keyexchangeformatter.cs +++ b/mscorlib/system/security/cryptography/rsapkcs1keyexchangeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Cryptography { diff --git a/mscorlib/system/security/cryptography/rsapkcs1signaturedeformatter.cs b/mscorlib/system/security/cryptography/rsapkcs1signaturedeformatter.cs index 3c500c5fd..01363fefb 100644 --- a/mscorlib/system/security/cryptography/rsapkcs1signaturedeformatter.cs +++ b/mscorlib/system/security/cryptography/rsapkcs1signaturedeformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/rsapkcs1signatureformatter.cs b/mscorlib/system/security/cryptography/rsapkcs1signatureformatter.cs index 9157b7bf2..249ea4b07 100644 --- a/mscorlib/system/security/cryptography/rsapkcs1signatureformatter.cs +++ b/mscorlib/system/security/cryptography/rsapkcs1signatureformatter.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/safecryptohandles.cs b/mscorlib/system/security/cryptography/safecryptohandles.cs index e7dc76c09..19b8885de 100644 --- a/mscorlib/system/security/cryptography/safecryptohandles.cs +++ b/mscorlib/system/security/cryptography/safecryptohandles.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha1.cs b/mscorlib/system/security/cryptography/sha1.cs index 583b16442..e4afdc617 100644 --- a/mscorlib/system/security/cryptography/sha1.cs +++ b/mscorlib/system/security/cryptography/sha1.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha1cryptoserviceprovider.cs b/mscorlib/system/security/cryptography/sha1cryptoserviceprovider.cs index 0b25472e2..ed886250f 100644 --- a/mscorlib/system/security/cryptography/sha1cryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/sha1cryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha1managed.cs b/mscorlib/system/security/cryptography/sha1managed.cs index 863cea2e1..ef07a4b17 100644 --- a/mscorlib/system/security/cryptography/sha1managed.cs +++ b/mscorlib/system/security/cryptography/sha1managed.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha256.cs b/mscorlib/system/security/cryptography/sha256.cs index ca193c2d2..c22be578a 100644 --- a/mscorlib/system/security/cryptography/sha256.cs +++ b/mscorlib/system/security/cryptography/sha256.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha256managed.cs b/mscorlib/system/security/cryptography/sha256managed.cs index 242bfff1b..41711c808 100644 --- a/mscorlib/system/security/cryptography/sha256managed.cs +++ b/mscorlib/system/security/cryptography/sha256managed.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha384.cs b/mscorlib/system/security/cryptography/sha384.cs index 1f6449cb2..26ed3cb0c 100644 --- a/mscorlib/system/security/cryptography/sha384.cs +++ b/mscorlib/system/security/cryptography/sha384.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha384managed.cs b/mscorlib/system/security/cryptography/sha384managed.cs index c10ab52f6..d17eaaa53 100644 --- a/mscorlib/system/security/cryptography/sha384managed.cs +++ b/mscorlib/system/security/cryptography/sha384managed.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha512.cs b/mscorlib/system/security/cryptography/sha512.cs index aa1bc2eb9..cfa001d57 100644 --- a/mscorlib/system/security/cryptography/sha512.cs +++ b/mscorlib/system/security/cryptography/sha512.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/sha512managed.cs b/mscorlib/system/security/cryptography/sha512managed.cs index 20ec6a6b7..31641440b 100644 --- a/mscorlib/system/security/cryptography/sha512managed.cs +++ b/mscorlib/system/security/cryptography/sha512managed.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/signaturedescription.cs b/mscorlib/system/security/cryptography/signaturedescription.cs index 4f02d3702..f115e8afc 100644 --- a/mscorlib/system/security/cryptography/signaturedescription.cs +++ b/mscorlib/system/security/cryptography/signaturedescription.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/symmetricalgorithm.cs b/mscorlib/system/security/cryptography/symmetricalgorithm.cs index 03a3094af..3d39a2bf3 100644 --- a/mscorlib/system/security/cryptography/symmetricalgorithm.cs +++ b/mscorlib/system/security/cryptography/symmetricalgorithm.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/tripledes.cs b/mscorlib/system/security/cryptography/tripledes.cs index 366d76260..9755966c3 100644 --- a/mscorlib/system/security/cryptography/tripledes.cs +++ b/mscorlib/system/security/cryptography/tripledes.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/tripledescryptoserviceprovider.cs b/mscorlib/system/security/cryptography/tripledescryptoserviceprovider.cs index 65655b56c..80dbd5498 100644 --- a/mscorlib/system/security/cryptography/tripledescryptoserviceprovider.cs +++ b/mscorlib/system/security/cryptography/tripledescryptoserviceprovider.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/cryptography/utils.cs b/mscorlib/system/security/cryptography/utils.cs index 802bbaaae..ffdfc91d5 100644 --- a/mscorlib/system/security/cryptography/utils.cs +++ b/mscorlib/system/security/cryptography/utils.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/framesecuritydescriptor.cs b/mscorlib/system/security/framesecuritydescriptor.cs index 92f4f22df..906443274 100644 --- a/mscorlib/system/security/framesecuritydescriptor.cs +++ b/mscorlib/system/security/framesecuritydescriptor.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Security { using System.Text; using System.Runtime.CompilerServices; diff --git a/mscorlib/system/security/hostprotectionexception.cs b/mscorlib/system/security/hostprotectionexception.cs index ee480cb7f..638ddf75b 100644 --- a/mscorlib/system/security/hostprotectionexception.cs +++ b/mscorlib/system/security/hostprotectionexception.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // /*============================================================================= diff --git a/mscorlib/system/security/hostsecuritymanager.cs b/mscorlib/system/security/hostsecuritymanager.cs index 4d90a44fc..113a75e1f 100644 --- a/mscorlib/system/security/hostsecuritymanager.cs +++ b/mscorlib/system/security/hostsecuritymanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/namedpermissionset.cs b/mscorlib/system/security/namedpermissionset.cs index 24629138d..d2baa4899 100644 --- a/mscorlib/system/security/namedpermissionset.cs +++ b/mscorlib/system/security/namedpermissionset.cs @@ -5,7 +5,7 @@ // ==--== // NamedPermissionSet.cs // -// Microsoft +// [....] // // Extends PermissionSet to allow an associated name and description // diff --git a/mscorlib/system/security/permissionlistset.cs b/mscorlib/system/security/permissionlistset.cs index 27cf6cd5a..fa855d0fa 100644 --- a/mscorlib/system/security/permissionlistset.cs +++ b/mscorlib/system/security/permissionlistset.cs @@ -7,8 +7,8 @@ ** ** Class: PermissionListSet.cs ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** Purpose: Holds state about A/G/R permissionsets in a callstack or appdomain ** (Replacement for PermissionListSet) diff --git a/mscorlib/system/security/permissions/environmentpermission.cs b/mscorlib/system/security/permissions/environmentpermission.cs index 9b86f00aa..5da4d1999 100644 --- a/mscorlib/system/security/permissions/environmentpermission.cs +++ b/mscorlib/system/security/permissions/environmentpermission.cs @@ -5,7 +5,7 @@ // ==--== // EnvironmentPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions { diff --git a/mscorlib/system/security/permissions/filedialogpermission.cs b/mscorlib/system/security/permissions/filedialogpermission.cs index 55308ce4e..a46bc0dc8 100644 --- a/mscorlib/system/security/permissions/filedialogpermission.cs +++ b/mscorlib/system/security/permissions/filedialogpermission.cs @@ -5,7 +5,7 @@ // ==--== // FileDialogPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions { diff --git a/mscorlib/system/security/permissions/fileiopermission.cs b/mscorlib/system/security/permissions/fileiopermission.cs index a1861b1f4..02ef088b5 100644 --- a/mscorlib/system/security/permissions/fileiopermission.cs +++ b/mscorlib/system/security/permissions/fileiopermission.cs @@ -5,7 +5,7 @@ // ==--== // FileIOPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions { diff --git a/mscorlib/system/security/permissions/gacidentitypermission.cs b/mscorlib/system/security/permissions/gacidentitypermission.cs index df59f63a2..0f130ad13 100644 --- a/mscorlib/system/security/permissions/gacidentitypermission.cs +++ b/mscorlib/system/security/permissions/gacidentitypermission.cs @@ -5,7 +5,7 @@ // ==--== // GacIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/hostprotectionpermission.cs b/mscorlib/system/security/permissions/hostprotectionpermission.cs index 837cac3c1..8679f29b9 100644 --- a/mscorlib/system/security/permissions/hostprotectionpermission.cs +++ b/mscorlib/system/security/permissions/hostprotectionpermission.cs @@ -5,7 +5,7 @@ // ==--== // HostProtectionPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions @@ -22,7 +22,7 @@ namespace System.Security.Permissions using System.Globalization; using System.Diagnostics.Contracts; - // Keep this enum in sync with tools\ngen\ngen.cpp and inc\mscoree.idl + // Keep this enum in [....] with tools\ngen\ngen.cpp and inc\mscoree.idl [Serializable] [Flags] diff --git a/mscorlib/system/security/permissions/isolatedstoragefilepermission.cs b/mscorlib/system/security/permissions/isolatedstoragefilepermission.cs index e52c1caf1..031cf0983 100644 --- a/mscorlib/system/security/permissions/isolatedstoragefilepermission.cs +++ b/mscorlib/system/security/permissions/isolatedstoragefilepermission.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] // // Purpose : This permission is used to controls/administer access to // IsolatedStorageFile diff --git a/mscorlib/system/security/permissions/isolatedstoragepermission.cs b/mscorlib/system/security/permissions/isolatedstoragepermission.cs index 69c7f743a..7fad3c55e 100644 --- a/mscorlib/system/security/permissions/isolatedstoragepermission.cs +++ b/mscorlib/system/security/permissions/isolatedstoragepermission.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Permissions { diff --git a/mscorlib/system/security/permissions/keycontainerpermission.cs b/mscorlib/system/security/permissions/keycontainerpermission.cs index 0afd60558..a606bf2ca 100644 --- a/mscorlib/system/security/permissions/keycontainerpermission.cs +++ b/mscorlib/system/security/permissions/keycontainerpermission.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/permissions/permissionattributes.cs b/mscorlib/system/security/permissions/permissionattributes.cs index 1e36a44ec..09f2ae386 100644 --- a/mscorlib/system/security/permissions/permissionattributes.cs +++ b/mscorlib/system/security/permissions/permissionattributes.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Security.Permissions { diff --git a/mscorlib/system/security/permissions/principalpermission.cs b/mscorlib/system/security/permissions/principalpermission.cs index 4ed6ff549..7598e6286 100644 --- a/mscorlib/system/security/permissions/principalpermission.cs +++ b/mscorlib/system/security/permissions/principalpermission.cs @@ -5,7 +5,7 @@ // ==--== // PrincipalPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/publisheridentitypermission.cs b/mscorlib/system/security/permissions/publisheridentitypermission.cs index 5f78b238d..7c41b3be1 100644 --- a/mscorlib/system/security/permissions/publisheridentitypermission.cs +++ b/mscorlib/system/security/permissions/publisheridentitypermission.cs @@ -5,7 +5,7 @@ // ==--== // PublisherIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/reflectionpermission.cs b/mscorlib/system/security/permissions/reflectionpermission.cs index 7e0d2fd27..00e79a1ee 100644 --- a/mscorlib/system/security/permissions/reflectionpermission.cs +++ b/mscorlib/system/security/permissions/reflectionpermission.cs @@ -5,7 +5,7 @@ // ==--== // ReflectionPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/registrypermission.cs b/mscorlib/system/security/permissions/registrypermission.cs index 1f7cfddeb..0805d55ac 100644 --- a/mscorlib/system/security/permissions/registrypermission.cs +++ b/mscorlib/system/security/permissions/registrypermission.cs @@ -5,7 +5,7 @@ // ==--== // RegistryPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/securitypermission.cs b/mscorlib/system/security/permissions/securitypermission.cs index 1e501c599..18b328f88 100644 --- a/mscorlib/system/security/permissions/securitypermission.cs +++ b/mscorlib/system/security/permissions/securitypermission.cs @@ -5,7 +5,7 @@ // ==--== // SecurityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/siteidentitypermission.cs b/mscorlib/system/security/permissions/siteidentitypermission.cs index a6c530be8..d08ccce13 100644 --- a/mscorlib/system/security/permissions/siteidentitypermission.cs +++ b/mscorlib/system/security/permissions/siteidentitypermission.cs @@ -5,7 +5,7 @@ // ==--== // SiteIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/strongnameidentitypermission.cs b/mscorlib/system/security/permissions/strongnameidentitypermission.cs index 1ab3804bd..31cbc1216 100644 --- a/mscorlib/system/security/permissions/strongnameidentitypermission.cs +++ b/mscorlib/system/security/permissions/strongnameidentitypermission.cs @@ -6,7 +6,7 @@ // ==--== // StrongNameIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/strongnamepublickeyblob.cs b/mscorlib/system/security/permissions/strongnamepublickeyblob.cs index ac3cac3e2..2367f8ba8 100644 --- a/mscorlib/system/security/permissions/strongnamepublickeyblob.cs +++ b/mscorlib/system/security/permissions/strongnamepublickeyblob.cs @@ -5,7 +5,7 @@ // ==--== // StrongNamePublicKeyBlob.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/uipermission.cs b/mscorlib/system/security/permissions/uipermission.cs index 6e34b8627..dea740ad6 100644 --- a/mscorlib/system/security/permissions/uipermission.cs +++ b/mscorlib/system/security/permissions/uipermission.cs @@ -5,7 +5,7 @@ // ==--== // UIPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/urlidentitypermission.cs b/mscorlib/system/security/permissions/urlidentitypermission.cs index bab282e88..ce61fad84 100644 --- a/mscorlib/system/security/permissions/urlidentitypermission.cs +++ b/mscorlib/system/security/permissions/urlidentitypermission.cs @@ -5,7 +5,7 @@ // ==--== // UrlIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissions/zoneidentitypermission.cs b/mscorlib/system/security/permissions/zoneidentitypermission.cs index 13574f3f2..6b3f6c56b 100644 --- a/mscorlib/system/security/permissions/zoneidentitypermission.cs +++ b/mscorlib/system/security/permissions/zoneidentitypermission.cs @@ -5,7 +5,7 @@ // ==--== // ZoneIdentityPermission.cs // -// Microsoft +// [....] // namespace System.Security.Permissions diff --git a/mscorlib/system/security/permissionset.cs b/mscorlib/system/security/permissionset.cs index b71188299..1edd3c8ad 100644 --- a/mscorlib/system/security/permissionset.cs +++ b/mscorlib/system/security/permissionset.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security { diff --git a/mscorlib/system/security/permissionsetenumerator.cs b/mscorlib/system/security/permissionsetenumerator.cs index c8f041739..e65e24d50 100644 --- a/mscorlib/system/security/permissionsetenumerator.cs +++ b/mscorlib/system/security/permissionsetenumerator.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security diff --git a/mscorlib/system/security/permissionsettriple.cs b/mscorlib/system/security/permissionsettriple.cs index 170cd2033..f319aa371 100644 --- a/mscorlib/system/security/permissionsettriple.cs +++ b/mscorlib/system/security/permissionsettriple.cs @@ -7,7 +7,7 @@ ** ** Class: PermissionSetTriple ** -** Microsoft +** [....] ** ** Purpose: Container class for holding an AppDomain's Grantset and Refused sets. ** Also used for CompressedStacks which brings in the third PermissionSet. diff --git a/mscorlib/system/security/permissiontoken.cs b/mscorlib/system/security/permissiontoken.cs index 92051b8ee..bb328a7e6 100644 --- a/mscorlib/system/security/permissiontoken.cs +++ b/mscorlib/system/security/permissiontoken.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Security { using System; using System.Security.Util; diff --git a/mscorlib/system/security/policy/allmembershipcondition.cs b/mscorlib/system/security/policy/allmembershipcondition.cs index e6d327d14..9b517b503 100644 --- a/mscorlib/system/security/policy/allmembershipcondition.cs +++ b/mscorlib/system/security/policy/allmembershipcondition.cs @@ -5,7 +5,7 @@ // ==--== // AllMembershipCondition.cs // -// Microsoft +// [....] // // Simple IMembershipCondition implementation that always passes // diff --git a/mscorlib/system/security/policy/applicationdirectory.cs b/mscorlib/system/security/policy/applicationdirectory.cs index 3b568460e..b521a618d 100644 --- a/mscorlib/system/security/policy/applicationdirectory.cs +++ b/mscorlib/system/security/policy/applicationdirectory.cs @@ -5,7 +5,7 @@ // ==--== // ApplicationDirectory.cs // -// Microsoft +// [....] // // ApplicationDirectory is an evidence type representing the directory the assembly // was loaded from. diff --git a/mscorlib/system/security/policy/applicationdirectorymembershipcondition.cs b/mscorlib/system/security/policy/applicationdirectorymembershipcondition.cs index 5bc3e8dff..97194d114 100644 --- a/mscorlib/system/security/policy/applicationdirectorymembershipcondition.cs +++ b/mscorlib/system/security/policy/applicationdirectorymembershipcondition.cs @@ -5,7 +5,7 @@ // ==--== // ApplicationDirectoryMembershipCondition.cs // -// Microsoft +// [....] // // Implementation of membership condition for "application directories" // diff --git a/mscorlib/system/security/policy/applicationsecurityinfo.cs b/mscorlib/system/security/policy/applicationsecurityinfo.cs index 477b44575..825d6b027 100644 --- a/mscorlib/system/security/policy/applicationsecurityinfo.cs +++ b/mscorlib/system/security/policy/applicationsecurityinfo.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/applicationsecuritymanager.cs b/mscorlib/system/security/policy/applicationsecuritymanager.cs index d3bbfbd9c..07c3d8267 100644 --- a/mscorlib/system/security/policy/applicationsecuritymanager.cs +++ b/mscorlib/system/security/policy/applicationsecuritymanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/applicationtrust.cs b/mscorlib/system/security/policy/applicationtrust.cs index c93e68a36..11092a47e 100644 --- a/mscorlib/system/security/policy/applicationtrust.cs +++ b/mscorlib/system/security/policy/applicationtrust.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // @@ -55,11 +55,11 @@ public sealed class ApplicationTrust : EvidenceBase, ISecurityEncodable private IList m_fullTrustAssemblies; // Permission special flags for the default grant set in this ApplicationTrust. This should be - // updated in sync with any updates to the default grant set. + // updated in [....] with any updates to the default grant set. // // In the general case, these values cannot be trusted - we only store a reference to the // DefaultGrantSet, and return the reference directly, which means that code can update the - // permission set without our knowledge. That would lead to the flags getting out of sync with the + // permission set without our knowledge. That would lead to the flags getting out of [....] with the // grant set. // // However, we only care about these flags when we're creating a homogenous AppDomain, and in that diff --git a/mscorlib/system/security/policy/assemblyevidencefactory.cs b/mscorlib/system/security/policy/assemblyevidencefactory.cs index df5f539e8..cdd0434f7 100644 --- a/mscorlib/system/security/policy/assemblyevidencefactory.cs +++ b/mscorlib/system/security/policy/assemblyevidencefactory.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/policy/codegroup.cs b/mscorlib/system/security/policy/codegroup.cs index a6439b552..d7e9a6533 100644 --- a/mscorlib/system/security/policy/codegroup.cs +++ b/mscorlib/system/security/policy/codegroup.cs @@ -5,7 +5,7 @@ // ==--== // CodeGroup.cs // -// Microsoft +// [....] // // Representation for code groups used for the policy mechanism // diff --git a/mscorlib/system/security/policy/evidence.cs b/mscorlib/system/security/policy/evidence.cs index a3e9ab07c..41cc55871 100644 --- a/mscorlib/system/security/policy/evidence.cs +++ b/mscorlib/system/security/policy/evidence.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security.Policy diff --git a/mscorlib/system/security/policy/evidencebase.cs b/mscorlib/system/security/policy/evidencebase.cs index 30a8fbee7..daf220938 100644 --- a/mscorlib/system/security/policy/evidencebase.cs +++ b/mscorlib/system/security/policy/evidencebase.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; @@ -166,7 +166,7 @@ public void Add(EvidenceBase evidence) { Contract.Assert(evidence != null); Contract.Assert(m_legacyEvidenceList.Count == 0 || EvidenceType == evidence.GetType() || (evidence is LegacyEvidenceWrapper && (evidence as LegacyEvidenceWrapper).EvidenceType == EvidenceType), - "LegacyEvidenceList must be homogeonous"); + "LegacyEvidenceList must be ----geonous"); Contract.Assert(evidence.GetType() != typeof(LegacyEvidenceList), "Attempt to add a legacy evidence list to another legacy evidence list"); diff --git a/mscorlib/system/security/policy/evidencetypedescriptor.cs b/mscorlib/system/security/policy/evidencetypedescriptor.cs index ce063253c..b45c54113 100644 --- a/mscorlib/system/security/policy/evidencetypedescriptor.cs +++ b/mscorlib/system/security/policy/evidencetypedescriptor.cs @@ -2,7 +2,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/policy/filecodegroup.cs b/mscorlib/system/security/policy/filecodegroup.cs index d36c6402a..e3a2bb487 100644 --- a/mscorlib/system/security/policy/filecodegroup.cs +++ b/mscorlib/system/security/policy/filecodegroup.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/firstmatchcodegroup.cs b/mscorlib/system/security/policy/firstmatchcodegroup.cs index 0afbd3c4c..4700bbbe7 100644 --- a/mscorlib/system/security/policy/firstmatchcodegroup.cs +++ b/mscorlib/system/security/policy/firstmatchcodegroup.cs @@ -5,7 +5,7 @@ // ==--== // FirstMatchCodeGroup.cs // -// Microsoft +// [....] // // Representation for code groups used for the policy mechanism // diff --git a/mscorlib/system/security/policy/gac.cs b/mscorlib/system/security/policy/gac.cs index a6abea898..78f0eea16 100644 --- a/mscorlib/system/security/policy/gac.cs +++ b/mscorlib/system/security/policy/gac.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/gacmembershipcondition.cs b/mscorlib/system/security/policy/gacmembershipcondition.cs index 84d65e5e3..fc9679358 100644 --- a/mscorlib/system/security/policy/gacmembershipcondition.cs +++ b/mscorlib/system/security/policy/gacmembershipcondition.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/hash.cs b/mscorlib/system/security/policy/hash.cs index 184faec0e..9bd73cf25 100644 --- a/mscorlib/system/security/policy/hash.cs +++ b/mscorlib/system/security/policy/hash.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/hashmembershipcondition.cs b/mscorlib/system/security/policy/hashmembershipcondition.cs index 690034bc6..befd3261f 100644 --- a/mscorlib/system/security/policy/hashmembershipcondition.cs +++ b/mscorlib/system/security/policy/hashmembershipcondition.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/iapplicationtrustmanager.cs b/mscorlib/system/security/policy/iapplicationtrustmanager.cs index 194bfbdce..46990db48 100644 --- a/mscorlib/system/security/policy/iapplicationtrustmanager.cs +++ b/mscorlib/system/security/policy/iapplicationtrustmanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/netcodegroup.cs b/mscorlib/system/security/policy/netcodegroup.cs index 5916875e6..17fe906c4 100644 --- a/mscorlib/system/security/policy/netcodegroup.cs +++ b/mscorlib/system/security/policy/netcodegroup.cs @@ -5,7 +5,7 @@ // ==--== // NetCodeGroup.cs // -// Microsoft +// [....] // // Representation for code groups used for the policy mechanism // diff --git a/mscorlib/system/security/policy/pefileevidencefactory.cs b/mscorlib/system/security/policy/pefileevidencefactory.cs index b70b1d262..266e7b5f9 100644 --- a/mscorlib/system/security/policy/pefileevidencefactory.cs +++ b/mscorlib/system/security/policy/pefileevidencefactory.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; @@ -25,7 +25,7 @@ namespace System.Security.Policy { /// - /// Arguments to the ETW evidence generation event. This enumeration should be kept in sync with + /// Arguments to the ETW evidence generation event. This enumeration should be kept in [....] with /// the VM enumeration EvidenceType in SecurityPolicy.h. /// internal enum EvidenceTypeGenerated diff --git a/mscorlib/system/security/policy/permissionrequestevidence.cs b/mscorlib/system/security/policy/permissionrequestevidence.cs index ed71bdab1..e4826330f 100644 --- a/mscorlib/system/security/policy/permissionrequestevidence.cs +++ b/mscorlib/system/security/policy/permissionrequestevidence.cs @@ -5,7 +5,7 @@ // ==--== // PermissionRequestEvidence.cs // -// Microsoft +// [....] // // Encapsulation of permission request as an evidence type. // diff --git a/mscorlib/system/security/policy/policyexception.cs b/mscorlib/system/security/policy/policyexception.cs index 11ef230b6..c0716d3c6 100644 --- a/mscorlib/system/security/policy/policyexception.cs +++ b/mscorlib/system/security/policy/policyexception.cs @@ -5,7 +5,7 @@ // ==--== // PolicyException.cs // -// Microsoft +// [....] // // Use this class to throw a PolicyException // diff --git a/mscorlib/system/security/policy/policylevel.cs b/mscorlib/system/security/policy/policylevel.cs index 10def8e68..5a766ce01 100644 --- a/mscorlib/system/security/policy/policylevel.cs +++ b/mscorlib/system/security/policy/policylevel.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/policystatement.cs b/mscorlib/system/security/policy/policystatement.cs index 9dbb1239f..35e703340 100644 --- a/mscorlib/system/security/policy/policystatement.cs +++ b/mscorlib/system/security/policy/policystatement.cs @@ -6,7 +6,7 @@ // ==--== // PolicyStatement.cs // -// Microsoft +// [....] // // Represents the policy associated with some piece of evidence // diff --git a/mscorlib/system/security/policy/publisher.cs b/mscorlib/system/security/policy/publisher.cs index 1234d776c..b28e9c13b 100644 --- a/mscorlib/system/security/policy/publisher.cs +++ b/mscorlib/system/security/policy/publisher.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/publishermembershipcondition.cs b/mscorlib/system/security/policy/publishermembershipcondition.cs index c3da15b83..3c6dda1f4 100644 --- a/mscorlib/system/security/policy/publishermembershipcondition.cs +++ b/mscorlib/system/security/policy/publishermembershipcondition.cs @@ -5,7 +5,7 @@ // ==--== // PublisherMembershipCondition.cs // -// Microsoft +// [....] // // Implementation of membership condition for X509 certificate based publishers // diff --git a/mscorlib/system/security/policy/site.cs b/mscorlib/system/security/policy/site.cs index c18dc2160..86ef1763a 100644 --- a/mscorlib/system/security/policy/site.cs +++ b/mscorlib/system/security/policy/site.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/sitemembershipcondition.cs b/mscorlib/system/security/policy/sitemembershipcondition.cs index 067d63f24..4dc9af6f3 100644 --- a/mscorlib/system/security/policy/sitemembershipcondition.cs +++ b/mscorlib/system/security/policy/sitemembershipcondition.cs @@ -6,7 +6,7 @@ // ==--== // SiteMembershipCondition.cs // -// Microsoft +// [....] // // Implementation of membership condition for zones // diff --git a/mscorlib/system/security/policy/strongname.cs b/mscorlib/system/security/policy/strongname.cs index 471482877..775d5d75d 100644 --- a/mscorlib/system/security/policy/strongname.cs +++ b/mscorlib/system/security/policy/strongname.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/strongnamemembershipcondition.cs b/mscorlib/system/security/policy/strongnamemembershipcondition.cs index c6470c861..afd302a49 100644 --- a/mscorlib/system/security/policy/strongnamemembershipcondition.cs +++ b/mscorlib/system/security/policy/strongnamemembershipcondition.cs @@ -5,7 +5,7 @@ // ==--== // StrongNameMembershipCondition.cs // -// Microsoft +// [....] // // Implementation of membership condition for zones // diff --git a/mscorlib/system/security/policy/unioncodegroup.cs b/mscorlib/system/security/policy/unioncodegroup.cs index 470d0fb8a..4d6570786 100644 --- a/mscorlib/system/security/policy/unioncodegroup.cs +++ b/mscorlib/system/security/policy/unioncodegroup.cs @@ -5,7 +5,7 @@ // ==--== // UnionCodeGroup.cs // -// Microsoft +// [....] // // Representation for code groups used for the policy mechanism // diff --git a/mscorlib/system/security/policy/url.cs b/mscorlib/system/security/policy/url.cs index 632d2ce3d..b41f2cfe5 100644 --- a/mscorlib/system/security/policy/url.cs +++ b/mscorlib/system/security/policy/url.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/urlmembershipcondition.cs b/mscorlib/system/security/policy/urlmembershipcondition.cs index a8745a5cb..2891234f9 100644 --- a/mscorlib/system/security/policy/urlmembershipcondition.cs +++ b/mscorlib/system/security/policy/urlmembershipcondition.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/zone.cs b/mscorlib/system/security/policy/zone.cs index 9942af9f2..74f60e5ce 100644 --- a/mscorlib/system/security/policy/zone.cs +++ b/mscorlib/system/security/policy/zone.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/policy/zonemembershipcondition.cs b/mscorlib/system/security/policy/zonemembershipcondition.cs index a9afd3033..329ef5e64 100644 --- a/mscorlib/system/security/policy/zonemembershipcondition.cs +++ b/mscorlib/system/security/policy/zonemembershipcondition.cs @@ -6,7 +6,7 @@ // ==--== // ZoneMembershipCondition.cs // -// Microsoft +// [....] // // Implementation of membership condition for zones // diff --git a/mscorlib/system/security/policymanager.cs b/mscorlib/system/security/policymanager.cs index 814c460ee..ff35a450c 100644 --- a/mscorlib/system/security/policymanager.cs +++ b/mscorlib/system/security/policymanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // @@ -414,7 +414,7 @@ private static QuickCacheEntryType GenerateQuickCache(PolicyLevel level) { if (FullTrustMap == null) { - // This mapping must stay in sync with the SecurityZone enumeration in SecurityZone.cs + // This mapping must stay in [....] with the SecurityZone enumeration in SecurityZone.cs FullTrustMap = new QuickCacheEntryType[] { QuickCacheEntryType.FullTrustZoneMyComputer, diff --git a/mscorlib/system/security/principal/genericidentity.cs b/mscorlib/system/security/principal/genericidentity.cs index b771a7018..02037c639 100644 --- a/mscorlib/system/security/principal/genericidentity.cs +++ b/mscorlib/system/security/principal/genericidentity.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/principal/genericprincipal.cs b/mscorlib/system/security/principal/genericprincipal.cs index ceac53d1b..f2f6cacc6 100644 --- a/mscorlib/system/security/principal/genericprincipal.cs +++ b/mscorlib/system/security/principal/genericprincipal.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // @@ -63,7 +63,7 @@ private void OnDeserializedMethod(StreamingContext context) // // 4.5 4.5 Yes There should be a ClaimsIdentity, DebugAssert if this is not the case // If there are roles, attach them to the first ClaimsIdentity. - // If there is no non-null ClaimsIdentity, add one. However, this is unusual and may be a + // If there is no non-null ClaimsIdentity, add one. However, this is unusual and may be a bug. ClaimsIdentity firstNonNullIdentity = null; foreach (var identity in base.Identities) diff --git a/mscorlib/system/security/principal/identitynotmappedexception.cs b/mscorlib/system/security/principal/identitynotmappedexception.cs index f5f9bbabe..8985f087e 100644 --- a/mscorlib/system/security/principal/identitynotmappedexception.cs +++ b/mscorlib/system/security/principal/identitynotmappedexception.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/principal/identityreference.cs b/mscorlib/system/security/principal/identityreference.cs index 727c8ea73..3be7e0e96 100644 --- a/mscorlib/system/security/principal/identityreference.cs +++ b/mscorlib/system/security/principal/identityreference.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/principal/ircollection.cs b/mscorlib/system/security/principal/ircollection.cs index 3eff01e8d..979704be5 100644 --- a/mscorlib/system/security/principal/ircollection.cs +++ b/mscorlib/system/security/principal/ircollection.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] namespace System.Security.Principal { using System; @@ -212,9 +212,9 @@ public IdentityReferenceCollection Translate( Type targetType, bool forceSuccess { // // Rare case that we have defined a type of identity reference and - // not included it in the code logic above (this is more like a - - + // not included it in the code logic above (this is more like a bug in the implementation + // but only as long as we do not allow IdentityReference to be subclassed outside of the BCL) + // Contract.Assert( false, "Source type is an IdentityReference type which has not been included in translation logic."); throw new SystemException(); } @@ -275,9 +275,9 @@ public IdentityReferenceCollection Translate( Type targetType, bool forceSuccess { // // Rare case that we have defined a type of identity reference and - // not included it in the code logic above (this is more like a - - + // not included it in the code logic above (this is more like a bug in the implementation + // but only as long as we do not allow IdentityReference to be subclassed outside of the BCL) + // Contract.Assert( false, "Source type is an IdentityReference type which has not been included in translation logic."); throw new SystemException(); } @@ -372,9 +372,9 @@ public IdentityReferenceCollection Translate( Type targetType, bool forceSuccess { // // Rare case that we have defined a type of identity reference and - // not included it in the code logic above (this is more like a - - + // not included it in the code logic above (this is more like a bug in the implementation + // but only as long as we do not allow IdentityReference to be subclassed outside of the BCL) + // Contract.Assert( false, "Source type is an IdentityReference type which has not been included in translation logic."); throw new SystemException(); } diff --git a/mscorlib/system/security/principal/ntaccount.cs b/mscorlib/system/security/principal/ntaccount.cs index 19b7ec764..291d56499 100644 --- a/mscorlib/system/security/principal/ntaccount.cs +++ b/mscorlib/system/security/principal/ntaccount.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using Microsoft.Win32; diff --git a/mscorlib/system/security/principal/sid.cs b/mscorlib/system/security/principal/sid.cs index e8558b295..bfc99ecf3 100644 --- a/mscorlib/system/security/principal/sid.cs +++ b/mscorlib/system/security/principal/sid.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/principal/win32.cs b/mscorlib/system/security/principal/win32.cs index 2aedb26bc..bac02ffb6 100644 --- a/mscorlib/system/security/principal/win32.cs +++ b/mscorlib/system/security/principal/win32.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using Microsoft.Win32; diff --git a/mscorlib/system/security/principal/windowsidentity.cs b/mscorlib/system/security/principal/windowsidentity.cs index 87c57938e..93cb25558 100644 --- a/mscorlib/system/security/principal/windowsidentity.cs +++ b/mscorlib/system/security/principal/windowsidentity.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // @@ -46,7 +46,7 @@ public enum WindowsAccountType { Anonymous = 3 } - // Keep in sync with vm\comprincipal.h + // Keep in [....] with vm\comprincipal.h internal enum WinSecurityContext { Thread = 1, // OpenAsSelf = false Process = 2, // OpenAsSelf = true @@ -370,8 +370,8 @@ public virtual bool IsAuthenticated { get { if (m_isAuthenticated == -1) { - // There is a known - + // There is a known bug where this approach will not work correctly for domain guests (will return false + // instead of true). But this is a corner-case that is not very interesting. #if !FEATURE_CORECLR m_isAuthenticated = CheckNtTokenForSid(new SecurityIdentifier(IdentifierAuthority.NTAuthority, new int[] { Win32Native.SECURITY_AUTHENTICATED_USER_RID })) ? 1 : 0; @@ -562,9 +562,9 @@ public IdentityReferenceCollection Groups { using (SafeLocalAllocHandle pGroups = GetTokenInformation(m_safeTokenHandle, TokenInformationClass.TokenGroups)) { uint groupCount = pGroups.Read(0); - // Work-around - - + // Work-around bug on WS03 that only populates the GroupCount field of TOKEN_GROUPS if the count is 0 + // In that situation, attempting to read the entire TOKEN_GROUPS structure will lead to InsufficientBuffer exception + // since the field is only 4 bytes long (uint only, for GroupCount), but we try to read more (including the pointer to GroupDetails). if (groupCount != 0) { diff --git a/mscorlib/system/security/principal/windowsimpersonationcontext.cs b/mscorlib/system/security/principal/windowsimpersonationcontext.cs index 5315ae7ba..311c3b3d4 100644 --- a/mscorlib/system/security/principal/windowsimpersonationcontext.cs +++ b/mscorlib/system/security/principal/windowsimpersonationcontext.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/principal/windowsprincipal.cs b/mscorlib/system/security/principal/windowsprincipal.cs index 6e60e7de3..d954f9f97 100644 --- a/mscorlib/system/security/principal/windowsprincipal.cs +++ b/mscorlib/system/security/principal/windowsprincipal.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/readonlypermissionset.cs b/mscorlib/system/security/readonlypermissionset.cs index 8bb357870..1b9e0ae98 100644 --- a/mscorlib/system/security/readonlypermissionset.cs +++ b/mscorlib/system/security/readonlypermissionset.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // using System; diff --git a/mscorlib/system/security/safesecurityhandles.cs b/mscorlib/system/security/safesecurityhandles.cs index 460d61994..49adc58c2 100644 --- a/mscorlib/system/security/safesecurityhandles.cs +++ b/mscorlib/system/security/safesecurityhandles.cs @@ -1,4 +1,4 @@ -// Microsoft +// [....] namespace Microsoft.Win32.SafeHandles { using System; using System.Runtime.CompilerServices; diff --git a/mscorlib/system/security/securestring.cs b/mscorlib/system/security/securestring.cs index ca2e8aea6..54d66afce 100644 --- a/mscorlib/system/security/securestring.cs +++ b/mscorlib/system/security/securestring.cs @@ -1,4 +1,4 @@ -// Microsoft +// [....] namespace System.Security { using System.Security.Cryptography; using System.Runtime.InteropServices; diff --git a/mscorlib/system/security/securitycontext.cs b/mscorlib/system/security/securitycontext.cs index d19cdeded..9ee3757ad 100644 --- a/mscorlib/system/security/securitycontext.cs +++ b/mscorlib/system/security/securitycontext.cs @@ -6,7 +6,7 @@ ** ** Class: SecurityContext ** -** Microsoft +** [....] ** ** ** Purpose: Capture security context for a thread @@ -32,7 +32,7 @@ namespace System.Security using System.Runtime.Versioning; using System.Diagnostics.Contracts; - // This enum must be kept in sync with the SecurityContextSource enum in the VM + // This enum must be kept in [....] with the SecurityContextSource enum in the VM public enum SecurityContextSource { CurrentAppDomain = 0, diff --git a/mscorlib/system/security/securitydocument.cs b/mscorlib/system/security/securitydocument.cs index 936a9e78b..72378d15c 100644 --- a/mscorlib/system/security/securitydocument.cs +++ b/mscorlib/system/security/securitydocument.cs @@ -7,7 +7,7 @@ // // CLASS: SecurityDocument.cs // -// Microsoft +// [....] // // PURPOSE: Represent an XML document // diff --git a/mscorlib/system/security/securityelement.cs b/mscorlib/system/security/securityelement.cs index e238ae5d7..8715f42ce 100644 --- a/mscorlib/system/security/securityelement.cs +++ b/mscorlib/system/security/securityelement.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security diff --git a/mscorlib/system/security/securityexception.cs b/mscorlib/system/security/securityexception.cs index d5fe35785..4b3a571a8 100644 --- a/mscorlib/system/security/securityexception.cs +++ b/mscorlib/system/security/securityexception.cs @@ -7,7 +7,7 @@ ** ** Class: SecurityException ** -** Microsoft +** [....] ** ** ** Purpose: Exception class for security diff --git a/mscorlib/system/security/securitymanager.cs b/mscorlib/system/security/securitymanager.cs index 777eb6ebf..1a60f9bc4 100644 --- a/mscorlib/system/security/securitymanager.cs +++ b/mscorlib/system/security/securitymanager.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/securityruntime.cs b/mscorlib/system/security/securityruntime.cs index 7989ee4db..1c874c243 100644 --- a/mscorlib/system/security/securityruntime.cs +++ b/mscorlib/system/security/securityruntime.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security { diff --git a/mscorlib/system/security/securitystate.cs b/mscorlib/system/security/securitystate.cs index 067073008..3097eb250 100644 --- a/mscorlib/system/security/securitystate.cs +++ b/mscorlib/system/security/securitystate.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] using System; using System.Security; diff --git a/mscorlib/system/security/util/config.cs b/mscorlib/system/security/util/config.cs index 3ddf27c3c..135979dce 100644 --- a/mscorlib/system/security/util/config.cs +++ b/mscorlib/system/security/util/config.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/util/hex.cs b/mscorlib/system/security/util/hex.cs index c07269852..9a7d22d4d 100644 --- a/mscorlib/system/security/util/hex.cs +++ b/mscorlib/system/security/util/hex.cs @@ -6,7 +6,7 @@ /* * Hex.cs // -// Microsoft +// [....] * * Operations to convert to and from Hex * diff --git a/mscorlib/system/security/util/parser.cs b/mscorlib/system/security/util/parser.cs index ef53c555f..10b7aa702 100644 --- a/mscorlib/system/security/util/parser.cs +++ b/mscorlib/system/security/util/parser.cs @@ -7,7 +7,7 @@ ** ** CLASS: Parser ** -** Microsoft +** [....] ** ** ** PURPOSE: Parse "Elementary XML", that is, XML without diff --git a/mscorlib/system/security/util/sitestring.cs b/mscorlib/system/security/util/sitestring.cs index f78b85ba7..7e705d7cb 100644 --- a/mscorlib/system/security/util/sitestring.cs +++ b/mscorlib/system/security/util/sitestring.cs @@ -5,7 +5,7 @@ // ==--== // SiteString // -// Microsoft +// [....] // namespace System.Security.Util { diff --git a/mscorlib/system/security/util/stringexpressionset.cs b/mscorlib/system/security/util/stringexpressionset.cs index ce34f9d68..101d15ee5 100644 --- a/mscorlib/system/security/util/stringexpressionset.cs +++ b/mscorlib/system/security/util/stringexpressionset.cs @@ -5,7 +5,7 @@ // ==--== // StringExpressionSet // -// Microsoft +// [....] // namespace System.Security.Util { diff --git a/mscorlib/system/security/util/tokenbasedset.cs b/mscorlib/system/security/util/tokenbasedset.cs index cbbb43c63..6f7fe1de2 100644 --- a/mscorlib/system/security/util/tokenbasedset.cs +++ b/mscorlib/system/security/util/tokenbasedset.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // // diff --git a/mscorlib/system/security/util/tokenbasedsetenumerator.cs b/mscorlib/system/security/util/tokenbasedsetenumerator.cs index a9dd114dd..4c18c5bce 100644 --- a/mscorlib/system/security/util/tokenbasedsetenumerator.cs +++ b/mscorlib/system/security/util/tokenbasedsetenumerator.cs @@ -5,7 +5,7 @@ // ==--== // TokenBasedSetEnumerator.cs // -// Microsoft +// [....] // namespace System.Security.Util diff --git a/mscorlib/system/security/util/tokenizer.cs b/mscorlib/system/security/util/tokenizer.cs index f942b027c..3a9ab6694 100644 --- a/mscorlib/system/security/util/tokenizer.cs +++ b/mscorlib/system/security/util/tokenizer.cs @@ -7,7 +7,7 @@ ** ** CLASS: Tokenizer.cs ** -** Microsoft +** [....] ** ** ** PURPOSE: Tokenize "Elementary XML", that is, XML without diff --git a/mscorlib/system/security/util/urlstring.cs b/mscorlib/system/security/util/urlstring.cs index c97e70efc..b009ff0a8 100644 --- a/mscorlib/system/security/util/urlstring.cs +++ b/mscorlib/system/security/util/urlstring.cs @@ -5,7 +5,7 @@ // ==--== // URLString // -// Microsoft +// [....] // // Implementation of membership condition for zones // diff --git a/mscorlib/system/security/util/xmlutil.cs b/mscorlib/system/security/util/xmlutil.cs index ad0a9cb25..936eaff9e 100644 --- a/mscorlib/system/security/util/xmlutil.cs +++ b/mscorlib/system/security/util/xmlutil.cs @@ -7,7 +7,7 @@ ** ** CLASS: XMLUtil ** -** Microsoft +** [....] ** ** PURPOSE: Helpers for XML input & output ** diff --git a/mscorlib/system/security/verificationexception.cs b/mscorlib/system/security/verificationexception.cs index 90fc2eb72..2e799519b 100644 --- a/mscorlib/system/security/verificationexception.cs +++ b/mscorlib/system/security/verificationexception.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security { diff --git a/mscorlib/system/security/xmlsyntaxexception.cs b/mscorlib/system/security/xmlsyntaxexception.cs index 2c64008ef..0ec69646c 100644 --- a/mscorlib/system/security/xmlsyntaxexception.cs +++ b/mscorlib/system/security/xmlsyntaxexception.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // ==--== -// Microsoft +// [....] // namespace System.Security { diff --git a/mscorlib/system/string.cs b/mscorlib/system/string.cs index 8f28f4834..09096a677 100644 --- a/mscorlib/system/string.cs +++ b/mscorlib/system/string.cs @@ -61,7 +61,7 @@ public sealed class String : IComparable, ICloneable, IConvertible, IEnumerable //private static readonly char FmtMsgMarkerChar='%'; //private static readonly char FmtMsgFmtCodeChar='!'; - //These are defined in Com99/src/vm/COMStringCommon.h and must be kept in sync. + //These are defined in Com99/src/vm/COMStringCommon.h and must be kept in [....]. private const int TrimHead = 0; private const int TrimTail = 1; private const int TrimBoth = 2; @@ -2835,10 +2835,10 @@ public String Replace(String oldValue, String newValue) if (CompatibilitySwitches.IsAppEarlierThanWindowsPhoneMango) { // Dev11 453753 quirk - // for pre-Mango this function had a - - - + // for pre-Mango this function had a bug that would cause it to + // drop all characters to the right of the first embedded NULL. + // this was quirked on Mango for pre-Mango apps however for apps + // targeting Mango the bug was fixed. int i = s.IndexOf('\0'); if (i > 0) return s.Substring(0, i); diff --git a/mscorlib/system/stubhelpers.cs b/mscorlib/system/stubhelpers.cs index 909502dc4..3f6f6fcfb 100644 --- a/mscorlib/system/stubhelpers.cs +++ b/mscorlib/system/stubhelpers.cs @@ -147,7 +147,7 @@ static internal unsafe IntPtr ConvertToNative(string strManaged, IntPtr pNativeB if (hasTrailByte) { - // this is an odd-sized string with a trailing byte stored in its sync block + // this is an odd-sized string with a trailing byte stored in its [....] block lengthInBytes++; } @@ -231,7 +231,7 @@ static internal unsafe string ConvertToManaged(IntPtr bstr) if ((length & 1) == 1) { - // odd-sized strings need to have the trailing byte saved in their sync block + // odd-sized strings need to have the trailing byte saved in their [....] block ret.SetTrailByte(((byte *)bstr.ToPointer())[length - 1]); } diff --git a/mscorlib/system/text/asciiencoding.cs b/mscorlib/system/text/asciiencoding.cs index 9c6e96720..471635e01 100644 --- a/mscorlib/system/text/asciiencoding.cs +++ b/mscorlib/system/text/asciiencoding.cs @@ -44,7 +44,7 @@ internal override void SetDefaultFallbacks() // // The following methods are copied from EncodingNLS.cs. // Unfortunately EncodingNLS.cs is internal and we're public, so we have to reimpliment them here. - // These should be kept in sync for the following classes: + // These should be kept in [....] for the following classes: // EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding // diff --git a/mscorlib/system/text/decoder.cs b/mscorlib/system/text/decoder.cs index 28ea64f93..8a5e80853 100644 --- a/mscorlib/system/text/decoder.cs +++ b/mscorlib/system/text/decoder.cs @@ -219,7 +219,7 @@ public virtual unsafe int GetChars(byte* bytes, int byteCount, // Do the work int result = GetChars(arrByte, 0, byteCount, arrChar, 0, flush); - // The only way this could fail is a + // The only way this could fail is a bug in GetChars Contract.Assert(result <= charCount, "Returned more chars than we have space for"); // Copy the char array @@ -231,7 +231,7 @@ public virtual unsafe int GetChars(byte* bytes, int byteCount, charCount = result; // We check both result and charCount so that we don't accidentally overrun - // our pointer buffer just because of any GetChars + // our pointer buffer just because of any GetChars bug. for (index = 0; index < charCount; index++) chars[index] = arrChar[index]; diff --git a/mscorlib/system/text/encoder.cs b/mscorlib/system/text/encoder.cs index 55af2cb6f..04f3ac245 100644 --- a/mscorlib/system/text/encoder.cs +++ b/mscorlib/system/text/encoder.cs @@ -212,7 +212,7 @@ public virtual unsafe int GetBytes(char* chars, int charCount, // Do the work int result = GetBytes(arrChar, 0, charCount, arrByte, 0, flush); - // The only way this could fail is a + // The only way this could fail is a bug in GetBytes Contract.Assert(result <= byteCount, "Returned more bytes than we have space for"); // Copy the byte array diff --git a/mscorlib/system/text/encoding.cs b/mscorlib/system/text/encoding.cs index 2430ddcb9..bd8805d81 100644 --- a/mscorlib/system/text/encoding.cs +++ b/mscorlib/system/text/encoding.cs @@ -107,7 +107,7 @@ public abstract class Encoding : ICloneable // // The following values are from mlang.idl. These values - // should be in sync with those in mlang.idl. + // should be in [....] with those in mlang.idl. // private const int MIMECONTF_MAILNEWS = 0x00000001; private const int MIMECONTF_BROWSER = 0x00000002; @@ -1134,7 +1134,7 @@ public virtual unsafe int GetBytes(char* chars, int charCount, // Do the work int result = GetBytes(arrChar, 0, charCount, arrByte, 0); - // The only way this could fail is a + // The only way this could fail is a bug in GetBytes Contract.Assert(result <= byteCount, "[Encoding.GetBytes]Returned more bytes than we have space for"); // Copy the byte array @@ -1294,7 +1294,7 @@ public virtual unsafe int GetChars(byte* bytes, int byteCount, // Do the work int result = GetChars(arrByte, 0, byteCount, arrChar, 0); - // The only way this could fail is a + // The only way this could fail is a bug in GetChars Contract.Assert(result <= charCount, "[Encoding.GetChars]Returned more chars than we have space for"); // Copy the char array diff --git a/mscorlib/system/text/gb18030encoding.cs b/mscorlib/system/text/gb18030encoding.cs index 63816b70b..57d2adb09 100644 --- a/mscorlib/system/text/gb18030encoding.cs +++ b/mscorlib/system/text/gb18030encoding.cs @@ -12,78 +12,78 @@ // Abstract: // // Managed implimentation of GB18030-2000 (code page 54936) ported from implimentation in c_g18030.dll -// If you find a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +// If you find a bug here you should check there (in windows) as well and visa versa. +// This file contains functions to convert GB18030-2000 (code page 54936) into Unicode, and vice versa. +// +// Notes: +// GB18030-2000 (aka GBK2K) is designed to be mostly compatible with GBK (codepage 936), +// while supports the full range of Unicode code points (BMP + 16 supplementary planes). +// +// The structure for GB18030 is: +// * Single byte: +// 0x00 ~ 0x7f +// * Two-byte: +// 0x81 ~ 0xfe, 0x40 ~ 0x7e (leading byte, trailing byte) +// 0x81 ~ 0xfe, 0x80 ~ 0xfe (leading byte, trailing byte) +// * Four-byte: +// 0x81 ~ 0xfe, 0x30 ~ 0x39, 0x81 ~ 0xfe, 0x30 ~ 0x39. +// The surrogare pair will be encoded from 0x90, 0x30, 0x81, 0x30 +// +// The BMP range is fully supported in GB18030 using 1-byte, 2-byte and 4-byte sequences. +// In valid 4-byte GB18030, there are two gaps that can not be mapped to Unicode characters. +// 0x84, 0x31, 0xa5, 0x30 (just after the GB18030 bytes for U+FFFF(*)) ~ 0x8f, 0x39, 0xfe, 0x39 (just before the first GB18030 bytes for U+D800,U+DC00) +// 0xe3, 0x32, 0x9a, 0x36 (just after the GB18030 bytes for U+DBFF U+DFFF(**)) ~ 0xfe, 0x39, 0xfe, 0x39 +// +// +// Note1: U+FFFF = 0x84, 0x31, 0xa4, 0x39 +// Note2: U+DBFF U+DFFF = 0xe3, 0x32, 0x9a, 0x35 +// +// Tables used in GB18030Encoding: +// +// Our data is similar to the 936 Code Page, so we start from there to build our tables. We build the +// normal double byte mapUnicodeToBytes and mapBytesToUnicode tables by applying differences from 936. +// We also build a map4BytesToUnicode table and a mapUnicodeTo4BytesFlags +// +// * mapUnicodeTo4BytesFlags +// This is an array of bytes, so we have to do a / 8 and << %8 to check the appropriate bit (see Is4Byte()) +// If the bit is set its true. +// +// true - If set/true this is a 4 byte code. The value in mapUnicodeToBytes will be the 4 byte offset +// false - If cleared/false this is a 1 or 2 byte code. The value in mapUnicodeToBytes will be the 2 bytes. +// +// * mapUnicodeToBytes +// Contains either the 2 byte value of double byte GB18030 or the 4 byte offset for 4 byte GB18030, +// depending on the value of the flag in mapUnicodeTo4BytesFlags +// +// * mapBytesToUnicode +// mapBytesToUnicode maps 2 byte GB 18030 to Unicode like other DBCS code pages. +// +// * map4BytesToUnicode +// map4BytesToUnicode is indexed by the 4 byte offset and contains the unicode value for each 4 byte offset +// +// +// 4 Byte sequences +// We generally use the offset for the 4 byte sequence, such as: +// +// The index value is the offset of the 4-byte GB18030. +// +// 4-byte GB18030 Index value +// ============== =========== +// 81,30,81,30 0 +// 81,30,81,31 1 +// 81,30,81,32 2 +// ... ... +// +// The value of map4BytesToUnicode cotains the Unicode codepoint for the offset of the +// corresponding 4-byte GB18030. +// +// E.g. map4BytesToUnicode[0] = 0x0080. This means that GB18030 0x81, 0x30, 0x81, 0x30 will be converted to Unicode U+0800. +// +// 4 Byte Surrogate Sequences +// Those work similarly to the normal 4 byte sequences, but start at a different offset +// +// We don't override IsAlwaysNormalized because GB18030 covers all of the unicode space, so isn't guaranteed to be normal. +// #if FEATURE_CODEPAGES_FILE // requires BaseCodePageEncooding namespace System.Text { diff --git a/mscorlib/system/text/iso2022encoding.cs b/mscorlib/system/text/iso2022encoding.cs index 39c6e68ba..6443a665f 100644 --- a/mscorlib/system/text/iso2022encoding.cs +++ b/mscorlib/system/text/iso2022encoding.cs @@ -11,7 +11,7 @@ // Abstract: // // Managed implimentation of ISO 2022 code pages, ported from the implimentation in c_is2022.dll -// This code should be kept in sync with the other implimentations +// This code should be kept in [....] with the other implimentations // This encoding wraps the basic encodings in code that adds the shift in/out wrapper methods // // Notes: diff --git a/mscorlib/system/text/unicodeencoding.cs b/mscorlib/system/text/unicodeencoding.cs index 3cd2b0f6b..80d5e2d34 100644 --- a/mscorlib/system/text/unicodeencoding.cs +++ b/mscorlib/system/text/unicodeencoding.cs @@ -81,7 +81,7 @@ internal override void SetDefaultFallbacks() // // The following methods are copied from EncodingNLS.cs. // Unfortunately EncodingNLS.cs is internal and we're public, so we have to reimpliment them here. - // These should be kept in sync for the following classes: + // These should be kept in [....] for the following classes: // EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding // diff --git a/mscorlib/system/text/utf32encoding.cs b/mscorlib/system/text/utf32encoding.cs index 3a80fa65d..6b6eaa06a 100644 --- a/mscorlib/system/text/utf32encoding.cs +++ b/mscorlib/system/text/utf32encoding.cs @@ -85,7 +85,7 @@ internal override void SetDefaultFallbacks() // // The following methods are copied from EncodingNLS.cs. // Unfortunately EncodingNLS.cs is internal and we're public, so we have to reimpliment them here. - // These should be kept in sync for the following classes: + // These should be kept in [....] for the following classes: // EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding // diff --git a/mscorlib/system/text/utf7encoding.cs b/mscorlib/system/text/utf7encoding.cs index b8d6403c2..9da1fcb52 100644 --- a/mscorlib/system/text/utf7encoding.cs +++ b/mscorlib/system/text/utf7encoding.cs @@ -149,7 +149,7 @@ public override int GetHashCode() // // The following methods are copied from EncodingNLS.cs. // Unfortunately EncodingNLS.cs is internal and we're public, so we have to reimpliment them here. - // These should be kept in sync for the following classes: + // These should be kept in [....] for the following classes: // EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding // diff --git a/mscorlib/system/text/utf8encoding.cs b/mscorlib/system/text/utf8encoding.cs index 7994224b2..b548523db 100644 --- a/mscorlib/system/text/utf8encoding.cs +++ b/mscorlib/system/text/utf8encoding.cs @@ -107,7 +107,7 @@ internal override void SetDefaultFallbacks() // // The following methods are copied from EncodingNLS.cs. // Unfortunately EncodingNLS.cs is internal and we're public, so we have to reimpliment them here. - // These should be kept in sync for the following classes: + // These should be kept in [....] for the following classes: // EncodingNLS, UTF7Encoding, UTF8Encoding, UTF32Encoding, ASCIIEncoding, UnicodeEncoding // diff --git a/mscorlib/system/threading/CDSsyncETWBCLProvider.cs b/mscorlib/system/threading/CDSsyncETWBCLProvider.cs index 6038171c5..c6ec27a13 100644 --- a/mscorlib/system/threading/CDSsyncETWBCLProvider.cs +++ b/mscorlib/system/threading/CDSsyncETWBCLProvider.cs @@ -7,12 +7,12 @@ // // CdsSyncEtwBCLProvider.cs // -// Microsoft +// [....] // // A helper class for firing ETW events related to the Coordination Data Structure -// sync primitives. This provider is used by CDS sync primitives in both mscorlib.dll +// [....] primitives. This provider is used by CDS [....] primitives in both mscorlib.dll // and system.dll. The purpose of sharing the provider class is to be able to enable -// ETW tracing on all CDS sync types with a single ETW provider GUID, and to minimize +// ETW tracing on all CDS [....] types with a single ETW provider GUID, and to minimize // the number of providers in use. // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -36,8 +36,8 @@ namespace System.Threading internal sealed class CdsSyncEtwBCLProvider : EventSource { /// - /// Defines the singleton instance for the CDS Sync ETW provider. - /// The CDS Sync Event provider GUID is {EC631D38-466B-4290-9306-834971BA0217}. + /// Defines the singleton instance for the CDS [....] ETW provider. + /// The CDS [....] Event provider GUID is {EC631D38-466B-4290-9306-834971BA0217}. /// public static CdsSyncEtwBCLProvider Log = new CdsSyncEtwBCLProvider(); /// Prevent external instantiation. All logging should go through the Log instance. diff --git a/mscorlib/system/threading/CancellationToken.cs b/mscorlib/system/threading/CancellationToken.cs index 5367d15d3..565577f0b 100644 --- a/mscorlib/system/threading/CancellationToken.cs +++ b/mscorlib/system/threading/CancellationToken.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] //////////////////////////////////////////////////////////////////////////////// #pragma warning disable 0420 // turn off 'a reference to a volatile field will not be treated as volatile' during CAS. @@ -334,8 +334,8 @@ private CancellationTokenRegistration Register(Action callback, Object s return new CancellationTokenRegistration(); // nothing to do for tokens than can never reach the canceled state. Give them a dummy registration. } - // Capture sync/execution contexts if required. - // Note: Only capture sync/execution contexts if IsCancellationRequested = false + // Capture [....]/execution contexts if required. + // Note: Only capture [....]/execution contexts if IsCancellationRequested = false // as we know that if it is true that the callback will just be called synchronously. SynchronizationContext capturedSyncContext = null; diff --git a/mscorlib/system/threading/CancellationTokenRegistration.cs b/mscorlib/system/threading/CancellationTokenRegistration.cs index 11dbf0bd3..a340d721c 100644 --- a/mscorlib/system/threading/CancellationTokenRegistration.cs +++ b/mscorlib/system/threading/CancellationTokenRegistration.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] //////////////////////////////////////////////////////////////////////////////// using System.Diagnostics.Contracts; diff --git a/mscorlib/system/threading/CancellationTokenSource.cs b/mscorlib/system/threading/CancellationTokenSource.cs index c53db2050..b656f560a 100644 --- a/mscorlib/system/threading/CancellationTokenSource.cs +++ b/mscorlib/system/threading/CancellationTokenSource.cs @@ -5,7 +5,7 @@ // // ==--== // -// Microsoft +// [....] //////////////////////////////////////////////////////////////////////////////// using System; @@ -789,7 +789,7 @@ private void ExecuteCallbackHandlers(bool throwOnFirstException) m_executingCallback = currArrayFragment[i]; if (m_executingCallback != null) { - //Transition to the target sync context (if necessary), and continue our work there. + //Transition to the target [....] context (if necessary), and continue our work there. CancellationCallbackCoreWorkArguments args = new CancellationCallbackCoreWorkArguments(currArrayFragment, i); // marshal exceptions: either aggregate or perform an immediate rethrow @@ -855,7 +855,7 @@ private void CancellationCallbackCoreWork(CancellationCallbackCoreWorkArguments { if (callback.TargetExecutionContext != null) { - // we are running via a custom sync context, so update the executing threadID + // we are running via a custom [....] context, so update the executing threadID callback.CancellationTokenSource.ThreadIDExecutingCallbacks = Thread.CurrentThread.ManagedThreadId; } callback.ExecuteCallback(); @@ -951,7 +951,7 @@ internal void WaitForCallbackToComplete(CancellationCallbackInfo callbackInfo) // ---------------------------------------------------------- // -- CancellationCallbackCoreWorkArguments -- // ---------------------------------------------------------- - // Helper struct for passing data to the target sync context + // Helper struct for passing data to the target [....] context internal struct CancellationCallbackCoreWorkArguments { internal SparselyPopulatedArrayFragment m_currArrayFragment; diff --git a/mscorlib/system/threading/CountdownEvent.cs b/mscorlib/system/threading/CountdownEvent.cs index 1f1e95ee3..4e1addf98 100644 --- a/mscorlib/system/threading/CountdownEvent.cs +++ b/mscorlib/system/threading/CountdownEvent.cs @@ -7,7 +7,7 @@ // // CountdownEvent.cs // -// Microsoft +// [....] // // A simple coordination data structure that we use for fork/join style parallelism. // @@ -115,7 +115,7 @@ public bool IsSet // The latch is "completed" if its current count has reached 0. Note that this is NOT // the same thing is checking the event's IsCompleted property. There is a tiny window // of time, after the final decrement of the current count to 0 and before setting the - // event, where the two values are out of sync. + // event, where the two values are out of [....]. return (m_currentCount <= 0); } } diff --git a/mscorlib/system/threading/LazyInitializer.cs b/mscorlib/system/threading/LazyInitializer.cs index f34e183d0..7be5f6a1a 100644 --- a/mscorlib/system/threading/LazyInitializer.cs +++ b/mscorlib/system/threading/LazyInitializer.cs @@ -7,7 +7,7 @@ // // LazyInitializer.cs // -// Microsoft +// [....] // // a set of lightweight static helpers for lazy initialization. // diff --git a/mscorlib/system/threading/ManualResetEventSlim.cs b/mscorlib/system/threading/ManualResetEventSlim.cs index 2d1278ab9..7d9e15d10 100644 --- a/mscorlib/system/threading/ManualResetEventSlim.cs +++ b/mscorlib/system/threading/ManualResetEventSlim.cs @@ -8,7 +8,7 @@ // // SlimManualResetEvent.cs // -// Microsoft +// [....] // // An manual-reset event that mixes a little spinning with a true Win32 event. // @@ -281,7 +281,7 @@ private bool LazyInitializeEvent() // guarantee only one event is actually stored in this field. if (Interlocked.CompareExchange(ref m_eventObj, newEventObj, null) != null) { - // We raced with someone else and lost. Destroy the garbage event. + // We ----d with someone else and lost. Destroy the garbage event. newEventObj.Close(); return false; diff --git a/mscorlib/system/threading/SemaphoreSlim.cs b/mscorlib/system/threading/SemaphoreSlim.cs index ddda17187..f97d1ccc8 100644 --- a/mscorlib/system/threading/SemaphoreSlim.cs +++ b/mscorlib/system/threading/SemaphoreSlim.cs @@ -7,7 +7,7 @@ // // SemaphoreSlim.cs // -// Microsoft +// [....] // // A lightweight semahore class that contains the basic semaphore functions plus some useful functions like interrupt // and wait handle exposing to allow waiting on multiple semaphores. diff --git a/mscorlib/system/threading/SpinLock.cs b/mscorlib/system/threading/SpinLock.cs index 78e7968eb..6dd635a31 100644 --- a/mscorlib/system/threading/SpinLock.cs +++ b/mscorlib/system/threading/SpinLock.cs @@ -11,7 +11,7 @@ // repeatedly checking until the lock becomes available. As the thread remains active performing a non-useful task, // the use of such a lock is a kind of busy waiting and consumes CPU resources without performing real work. // -// Microsoft +// [....] // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System; diff --git a/mscorlib/system/threading/SpinWait.cs b/mscorlib/system/threading/SpinWait.cs index 596f9885a..3fb4a1fdc 100644 --- a/mscorlib/system/threading/SpinWait.cs +++ b/mscorlib/system/threading/SpinWait.cs @@ -7,7 +7,7 @@ // // SpinWait.cs // -// Microsoft +// [....] // // Central spin logic used across the entire code-base. // diff --git a/mscorlib/system/threading/Tasks/BeginEndAwaitableAdapter.cs b/mscorlib/system/threading/Tasks/BeginEndAwaitableAdapter.cs index 73d21b566..68b89d53a 100644 --- a/mscorlib/system/threading/Tasks/BeginEndAwaitableAdapter.cs +++ b/mscorlib/system/threading/Tasks/BeginEndAwaitableAdapter.cs @@ -3,7 +3,7 @@ /// Copyright (c) Microsoft Corporation. All rights reserved. /// /// -/// Microsoft +/// [....] /// gpaperin ///----------- ----------- ----------- ----------- ----------- ----------- diff --git a/mscorlib/system/threading/Tasks/ConcurrentExclusiveSchedulerPair.cs b/mscorlib/system/threading/Tasks/ConcurrentExclusiveSchedulerPair.cs index ec8b1be4c..50e9a8122 100644 --- a/mscorlib/system/threading/Tasks/ConcurrentExclusiveSchedulerPair.cs +++ b/mscorlib/system/threading/Tasks/ConcurrentExclusiveSchedulerPair.cs @@ -7,7 +7,7 @@ // // ConcurrentExclusiveSchedulerPair.cs // -// Microsoft +// [....] // // A pair of schedulers that together support concurrent (reader) / exclusive (writer) // task scheduling. Using just the exclusive scheduler can be used to simulate a serial @@ -70,7 +70,7 @@ public class ConcurrentExclusiveSchedulerPair /// Default MaxConcurrencyLevel is the processor count if not otherwise specified. private static Int32 DefaultMaxConcurrencyLevel { get { return Environment.ProcessorCount; } } - /// Gets the sync obj used to protect all state on this instance. + /// Gets the [....] obj used to protect all state on this instance. private object ValueLock { get { return m_threadProcessingMapping; } } /// @@ -763,7 +763,7 @@ internal static void ContractAssertMonitorStatus(object syncObj, bool held) /// If this task is being created to replace another. /// /// These options should be used for all tasks that have the potential to run user code or - /// that are repeatedly spawned and thus need a modicum of fair treatment. + /// that are repeatedly spawned and thus need a modi---- of fair treatment. /// /// The options to use. internal static TaskCreationOptions GetCreationOptionsForTask(bool isReplacementReplica = false) diff --git a/mscorlib/system/threading/Tasks/Future.cs b/mscorlib/system/threading/Tasks/Future.cs index b04813409..f8011808b 100644 --- a/mscorlib/system/threading/Tasks/Future.cs +++ b/mscorlib/system/threading/Tasks/Future.cs @@ -7,7 +7,7 @@ // // Future.cs // -// Microsoft +// [....] // // A task that produces a value. // diff --git a/mscorlib/system/threading/Tasks/FutureFactory.cs b/mscorlib/system/threading/Tasks/FutureFactory.cs index 44f6ac04d..cd3bc163a 100644 --- a/mscorlib/system/threading/Tasks/FutureFactory.cs +++ b/mscorlib/system/threading/Tasks/FutureFactory.cs @@ -7,7 +7,7 @@ // // FutureFactory.cs // -// Microsoft +// [....] // // As with TaskFactory, TaskFactory encodes common factory patterns into helper methods. // diff --git a/mscorlib/system/threading/Tasks/Parallel.cs b/mscorlib/system/threading/Tasks/Parallel.cs index d2358ec09..55aa15974 100644 --- a/mscorlib/system/threading/Tasks/Parallel.cs +++ b/mscorlib/system/threading/Tasks/Parallel.cs @@ -7,7 +7,7 @@ // // Parallel.cs // -// Microsoft +// [....] // // A helper class that contains parallel versions of various looping constructs. This // internally uses the task parallel library, but takes care to expose very little @@ -1103,7 +1103,7 @@ private static ParallelLoopResult ForWorker( fromInclusive, toExclusive); } - ParallelForReplicatingTask rootTask = null; // eliminates "Use of unassigned local variable" compiler + ParallelForReplicatingTask rootTask = null; // eliminates "Use of unassigned local variable" compiler bug below. try { @@ -1418,7 +1418,7 @@ private static ParallelLoopResult ForWorker64( fromInclusive, toExclusive); } - ParallelForReplicatingTask rootTask = null; // eliminates "Use of unassigned local variable" compiler + ParallelForReplicatingTask rootTask = null; // eliminates "Use of unassigned local variable" compiler bug below. try { diff --git a/mscorlib/system/threading/Tasks/ParallelLoopState.cs b/mscorlib/system/threading/Tasks/ParallelLoopState.cs index 4fd15a87a..2ae0c8790 100644 --- a/mscorlib/system/threading/Tasks/ParallelLoopState.cs +++ b/mscorlib/system/threading/Tasks/ParallelLoopState.cs @@ -7,7 +7,7 @@ // // ParallelState.cs // -// Microsoft +// [....] // // A non-generic and generic parallel state class, used by the Parallel helper class // for parallel loop management. diff --git a/mscorlib/system/threading/Tasks/ParallelRangeManager.cs b/mscorlib/system/threading/Tasks/ParallelRangeManager.cs index 7c625cf22..89d3b65b4 100644 --- a/mscorlib/system/threading/Tasks/ParallelRangeManager.cs +++ b/mscorlib/system/threading/Tasks/ParallelRangeManager.cs @@ -7,7 +7,7 @@ // // ParallelRangeManager.cs // -// Microsoft +// [....] // // Implements the algorithm for distributing loop indices to parallel loop workers // diff --git a/mscorlib/system/threading/Tasks/ProducerConsumerQueues.cs b/mscorlib/system/threading/Tasks/ProducerConsumerQueues.cs index b0b8db284..50febfcbc 100644 --- a/mscorlib/system/threading/Tasks/ProducerConsumerQueues.cs +++ b/mscorlib/system/threading/Tasks/ProducerConsumerQueues.cs @@ -7,7 +7,7 @@ // // ProducerConsumerQueues.cs // -// Microsoft, Microsoft +// [....], [....] // // Specialized producer/consumer queues. // @@ -58,7 +58,7 @@ internal interface IProducerConsumerQueue : IEnumerable int Count { get; } /// A thread-safe way to get the number of items in the collection. May synchronize access by locking the provided synchronization object. - /// The sync object used to lock + /// The [....] object used to lock /// The collection count int GetCountSafe(object syncObj); } diff --git a/mscorlib/system/threading/Tasks/TPLETWProvider.cs b/mscorlib/system/threading/Tasks/TPLETWProvider.cs index 005e7d385..aed9c00a5 100644 --- a/mscorlib/system/threading/Tasks/TPLETWProvider.cs +++ b/mscorlib/system/threading/Tasks/TPLETWProvider.cs @@ -7,7 +7,7 @@ // // TplEtwProvider.cs // -// Microsoft +// [....] // // EventSource for TPL. // diff --git a/mscorlib/system/threading/Tasks/Task.cs b/mscorlib/system/threading/Tasks/Task.cs index f204a2ae8..1dec12dee 100644 --- a/mscorlib/system/threading/Tasks/Task.cs +++ b/mscorlib/system/threading/Tasks/Task.cs @@ -7,7 +7,7 @@ // // Task.cs // -// Microsoft +// [....] // // A schedulable unit of work. // diff --git a/mscorlib/system/threading/Tasks/TaskCanceledException.cs b/mscorlib/system/threading/Tasks/TaskCanceledException.cs index 256bd0294..fe647cdb3 100644 --- a/mscorlib/system/threading/Tasks/TaskCanceledException.cs +++ b/mscorlib/system/threading/Tasks/TaskCanceledException.cs @@ -7,7 +7,7 @@ // // TaskCanceledException.cs // -// Microsoft +// [....] // // An exception for task cancellations. // diff --git a/mscorlib/system/threading/Tasks/TaskCompletionSource.cs b/mscorlib/system/threading/Tasks/TaskCompletionSource.cs index 7d1487a7c..8c5edf097 100644 --- a/mscorlib/system/threading/Tasks/TaskCompletionSource.cs +++ b/mscorlib/system/threading/Tasks/TaskCompletionSource.cs @@ -7,7 +7,7 @@ // // TaskCompletionSource.cs // -// Microsoft +// [....] // // TaskCompletionSource is the producer end of an unbound future. Its // Task member may be distributed as the consumer end of the future. diff --git a/mscorlib/system/threading/Tasks/TaskContinuation.cs b/mscorlib/system/threading/Tasks/TaskContinuation.cs index eecbd9e12..eb106a785 100644 --- a/mscorlib/system/threading/Tasks/TaskContinuation.cs +++ b/mscorlib/system/threading/Tasks/TaskContinuation.cs @@ -7,7 +7,7 @@ // // TaskContinuation.cs // -// Microsoft +// [....] // // Implementation of task continuations, TaskContinuation, and its descendants. // @@ -223,7 +223,7 @@ internal override void InnerInvoke() // - StandardTaskContinuation: wraps a task,options,and scheduler, and overrides Run to process the task with that configuration // - AwaitTaskContinuation: base for continuations created through TaskAwaiter; targets default scheduler by default // - TaskSchedulerAwaitTaskContinuation: awaiting with a non-default TaskScheduler - // - SynchronizationContextAwaitTaskContinuation: awaiting with a "current" sync ctx + // - SynchronizationContextAwaitTaskContinuation: awaiting with a "current" [....] ctx /// Represents a continuation. internal abstract class TaskContinuation diff --git a/mscorlib/system/threading/Tasks/TaskExceptionHolder.cs b/mscorlib/system/threading/Tasks/TaskExceptionHolder.cs index 3ba61491b..32d121d16 100644 --- a/mscorlib/system/threading/Tasks/TaskExceptionHolder.cs +++ b/mscorlib/system/threading/Tasks/TaskExceptionHolder.cs @@ -7,7 +7,7 @@ // // TaskExceptionHolder.cs // -// Microsoft +// [....] // // An abstraction for holding and aggregating exceptions. // diff --git a/mscorlib/system/threading/Tasks/TaskFactory.cs b/mscorlib/system/threading/Tasks/TaskFactory.cs index b15df277a..3c8e798e0 100644 --- a/mscorlib/system/threading/Tasks/TaskFactory.cs +++ b/mscorlib/system/threading/Tasks/TaskFactory.cs @@ -7,7 +7,7 @@ // // TaskFactory.cs // -// Microsoft +// [....] // // There are a plethora of common patterns for which Tasks are created. TaskFactory encodes // these patterns into helper methods. These helpers also pick up default configuration settings diff --git a/mscorlib/system/threading/Tasks/TaskScheduler.cs b/mscorlib/system/threading/Tasks/TaskScheduler.cs index e459c1e80..3b27ed26d 100644 --- a/mscorlib/system/threading/Tasks/TaskScheduler.cs +++ b/mscorlib/system/threading/Tasks/TaskScheduler.cs @@ -7,7 +7,7 @@ // // TaskScheduler.cs // -// Microsoft +// [....] // // This file contains the primary interface and management of tasks and queues. // diff --git a/mscorlib/system/threading/Tasks/TaskSchedulerException.cs b/mscorlib/system/threading/Tasks/TaskSchedulerException.cs index 5d2f9ad79..61b75ea7f 100644 --- a/mscorlib/system/threading/Tasks/TaskSchedulerException.cs +++ b/mscorlib/system/threading/Tasks/TaskSchedulerException.cs @@ -7,7 +7,7 @@ // // TaskSchedulerException.cs // -// Microsoft +// [....] // // An exception for task schedulers. // diff --git a/mscorlib/system/threading/Tasks/TaskToApm.cs b/mscorlib/system/threading/Tasks/TaskToApm.cs index e518055ee..952d539a7 100644 --- a/mscorlib/system/threading/Tasks/TaskToApm.cs +++ b/mscorlib/system/threading/Tasks/TaskToApm.cs @@ -7,7 +7,7 @@ // // TaskToApm.cs // -// Microsoft +// [....] // // Helper methods for using Tasks to implement the APM pattern. // diff --git a/mscorlib/system/threading/Tasks/ThreadPoolTaskScheduler.cs b/mscorlib/system/threading/Tasks/ThreadPoolTaskScheduler.cs index 87b5a06c2..0da781819 100644 --- a/mscorlib/system/threading/Tasks/ThreadPoolTaskScheduler.cs +++ b/mscorlib/system/threading/Tasks/ThreadPoolTaskScheduler.cs @@ -7,7 +7,7 @@ // // TaskScheduler.cs // -// Microsoft +// [....] // // This file contains the primary interface and management of tasks and queues. // diff --git a/mscorlib/system/threading/ThreadLocal.cs b/mscorlib/system/threading/ThreadLocal.cs index aa8425fd9..544b0cdb6 100644 --- a/mscorlib/system/threading/ThreadLocal.cs +++ b/mscorlib/system/threading/ThreadLocal.cs @@ -8,7 +8,7 @@ // // ThreadLocal.cs // -// Microsoft +// [....] // // A class that provides a simple, lightweight implementation of thread-local lazy-initialization, where a value is initialized once per accessing // thread; this provides an alternative to using a ThreadStatic static variable and having diff --git a/mscorlib/system/threading/abandonedmutexexception.cs b/mscorlib/system/threading/abandonedmutexexception.cs index 593f215f1..d32f45303 100644 --- a/mscorlib/system/threading/abandonedmutexexception.cs +++ b/mscorlib/system/threading/abandonedmutexexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] // // AbandonedMutexException // Thrown when a wait completes because one or more mutexes was abandoned. diff --git a/mscorlib/system/threading/asynclocal.cs b/mscorlib/system/threading/asynclocal.cs index 3e1f5f9f6..600a4b0ee 100644 --- a/mscorlib/system/threading/asynclocal.cs +++ b/mscorlib/system/threading/asynclocal.cs @@ -2,7 +2,7 @@ // // Copyright (c) Microsoft Corporation. All rights reserved. // -// Microsoft +// [....] using System; using System.Collections.Generic; diff --git a/mscorlib/system/threading/autoresetevent.cs b/mscorlib/system/threading/autoresetevent.cs index 1ed58d271..e7506554e 100644 --- a/mscorlib/system/threading/autoresetevent.cs +++ b/mscorlib/system/threading/autoresetevent.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: AutoResetEvent diff --git a/mscorlib/system/threading/compressedstack.cs b/mscorlib/system/threading/compressedstack.cs index 5c18afbbb..d6c584d82 100644 --- a/mscorlib/system/threading/compressedstack.cs +++ b/mscorlib/system/threading/compressedstack.cs @@ -7,8 +7,8 @@ ** ** Class: CompressedStack ** -** Microsoft -** Microsoft +** [....] +** [....] ** ** Purpose: Managed wrapper for the security stack compression implementation ** diff --git a/mscorlib/system/threading/eventwaithandle.cs b/mscorlib/system/threading/eventwaithandle.cs index 65151cff7..08426b232 100644 --- a/mscorlib/system/threading/eventwaithandle.cs +++ b/mscorlib/system/threading/eventwaithandle.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: EventWaitHandle diff --git a/mscorlib/system/threading/executioncontext.cs b/mscorlib/system/threading/executioncontext.cs index 0f93e1626..b5564b99e 100644 --- a/mscorlib/system/threading/executioncontext.cs +++ b/mscorlib/system/threading/executioncontext.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] /*============================================================ ** ** Class: ExecutionContext @@ -447,7 +447,7 @@ public void Undo() public override int GetHashCode() { - // review - Microsoft + // review - [....] return _thread == null ? ToString().GetHashCode() : _thread.GetHashCode(); } @@ -1234,7 +1234,7 @@ static internal ExecutionContext Capture(ref StackCrawlMark stackMark, CaptureOp if (!ecCurrent.IsNull) { - // capture the sync context + // capture the [....] context if (0 == (options & CaptureOptions.IgnoreSyncCtx)) syncCtxNew = (ecCurrent.SynchronizationContext == null) ? null : ecCurrent.SynchronizationContext.CreateCopy(); diff --git a/mscorlib/system/threading/hostexecutioncontextmanager.cs b/mscorlib/system/threading/hostexecutioncontextmanager.cs index 2f5ccc667..981b2889b 100644 --- a/mscorlib/system/threading/hostexecutioncontextmanager.cs +++ b/mscorlib/system/threading/hostexecutioncontextmanager.cs @@ -4,7 +4,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] /*============================================================ ** ** Class: ExecutionContext diff --git a/mscorlib/system/threading/interlocked.cs b/mscorlib/system/threading/interlocked.cs index 441460b70..fad5b4625 100644 --- a/mscorlib/system/threading/interlocked.cs +++ b/mscorlib/system/threading/interlocked.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Threading { using System; diff --git a/mscorlib/system/threading/lockcookie.cs b/mscorlib/system/threading/lockcookie.cs index 32c976097..86f818222 100644 --- a/mscorlib/system/threading/lockcookie.cs +++ b/mscorlib/system/threading/lockcookie.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================ ** ** Class: LockCookie @@ -29,7 +29,7 @@ public struct LockCookie public override int GetHashCode() { - // review - Microsoft! + // review - [....]! return _dwFlags + _dwWriterSeqNum + _wReaderAndWriterLevel + _dwThreadID; } diff --git a/mscorlib/system/threading/lockrecursionexception.cs b/mscorlib/system/threading/lockrecursionexception.cs index a8391a001..5598d810b 100644 --- a/mscorlib/system/threading/lockrecursionexception.cs +++ b/mscorlib/system/threading/lockrecursionexception.cs @@ -13,8 +13,8 @@ // acquire a lock, because the particular lock kind doesn't // support it in its current state. // -// Microsoft -// Microsoft +// [....] +// [....] // ============================================================*/ diff --git a/mscorlib/system/threading/manualresetevent.cs b/mscorlib/system/threading/manualresetevent.cs index 1586fb44a..40db6655c 100644 --- a/mscorlib/system/threading/manualresetevent.cs +++ b/mscorlib/system/threading/manualresetevent.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: ManualResetEvent diff --git a/mscorlib/system/threading/monitor.cs b/mscorlib/system/threading/monitor.cs index 9ceade566..923223080 100644 --- a/mscorlib/system/threading/monitor.cs +++ b/mscorlib/system/threading/monitor.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: Monitor diff --git a/mscorlib/system/threading/mutex.cs b/mscorlib/system/threading/mutex.cs index 9e403c08a..bfd5458ca 100644 --- a/mscorlib/system/threading/mutex.cs +++ b/mscorlib/system/threading/mutex.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: Mutex diff --git a/mscorlib/system/threading/overlapped.cs b/mscorlib/system/threading/overlapped.cs index 2a19f42f0..eb22b0a8c 100644 --- a/mscorlib/system/threading/overlapped.cs +++ b/mscorlib/system/threading/overlapped.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /* * This files defines the following types: diff --git a/mscorlib/system/threading/readerwriterlock.cs b/mscorlib/system/threading/readerwriterlock.cs index 50f61b25f..cc5a736be 100644 --- a/mscorlib/system/threading/readerwriterlock.cs +++ b/mscorlib/system/threading/readerwriterlock.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================ ** ** Class: RWLock diff --git a/mscorlib/system/threading/semaphorefullexception.cs b/mscorlib/system/threading/semaphorefullexception.cs index 5a61c8f79..19b0632ca 100644 --- a/mscorlib/system/threading/semaphorefullexception.cs +++ b/mscorlib/system/threading/semaphorefullexception.cs @@ -7,7 +7,7 @@ ** ** Class: SemaphoreFullException ** -** Microsoft +** [....] ** =============================================================================*/ namespace System.Threading { diff --git a/mscorlib/system/threading/synchronizationcontext.cs b/mscorlib/system/threading/synchronizationcontext.cs index 0b78784ef..47036f1b1 100644 --- a/mscorlib/system/threading/synchronizationcontext.cs +++ b/mscorlib/system/threading/synchronizationcontext.cs @@ -3,7 +3,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // // -// Microsoft +// [....] /*============================================================ ** ** Class: SynchronizationContext @@ -79,7 +79,7 @@ public SynchronizationContext() static Type s_cachedPreparedType4; static Type s_cachedPreparedType5; - // protected so that only the derived sync context class can enable these flags + // protected so that only the derived [....] context class can enable these flags [System.Security.SecuritySafeCritical] // auto-generated [SuppressMessage("Microsoft.Concurrency", "CA8001", Justification = "We never dereference s_cachedPreparedType*, so ordering is unimportant")] protected void SetWaitNotificationRequired() @@ -93,7 +93,7 @@ protected void SetWaitNotificationRequired() // So we keep track of a few types we've already prepared in this AD. It is uncommon to have more than // a few SynchronizationContext implementations, so we only cache the first five we encounter; this lets // our cache be much faster than a more general cache might be. This is important, because this - // is a *very* hot code path for many WPF and Microsoft apps. + // is a *very* hot code path for many WPF and [....] apps. // Type type = this.GetType(); if (s_cachedPreparedType1 != type && @@ -178,11 +178,11 @@ public virtual int Wait(IntPtr[] waitHandles, bool waitAll, int millisecondsTime private static SynchronizationContext s_threadStaticContext; // - // NetCF had a - - - - + // NetCF had a bug where SynchronizationContext.SetThreadStaticContext would set the SyncContext for every thread in the process. + // This was because they stored the value in a regular static field (NetCF has no support for ThreadStatic fields). This was fixed in + // Mango, but some apps built against pre-Mango WP7 do depend on the broken behavior. So for those apps we need an AppDomain-wide static + // to hold whatever context was last set on any thread. + // private static SynchronizationContext s_appDomainStaticContext; [System.Security.SecurityCritical] diff --git a/mscorlib/system/threading/synchronizationlockexception.cs b/mscorlib/system/threading/synchronizationlockexception.cs index 91d4ac363..884005d21 100644 --- a/mscorlib/system/threading/synchronizationlockexception.cs +++ b/mscorlib/system/threading/synchronizationlockexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: SynchronizationLockException diff --git a/mscorlib/system/threading/thread.cs b/mscorlib/system/threading/thread.cs index bd98bbfd8..b98798c48 100644 --- a/mscorlib/system/threading/thread.cs +++ b/mscorlib/system/threading/thread.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: Thread @@ -1141,12 +1141,12 @@ public CultureInfo CurrentUICulture { if (CompatibilitySwitches.IsAppEarlierThanWindowsPhone8) { // - // NetCF had a - - - - - + // NetCF had a bug where Thread.Current{UI}Culture would set the culture for every thread in the process. + // This was because they stored the value in a regular static field (NetCF has no support for ThreadStatic fields). + // Some apps depend on the broken behavior. We will emulate this behavior by redirecting setters to + // DefaultThreadCurrentUICulture. (Note that this property did not existed in NetCF and so it is fine to piggy back + // on it for the quirk.) + // CultureInfo.SetCurrentUICultureQuirk(value); return; } diff --git a/mscorlib/system/threading/threadabortexception.cs b/mscorlib/system/threading/threadabortexception.cs index 657f41103..c3adf9ac2 100644 --- a/mscorlib/system/threading/threadabortexception.cs +++ b/mscorlib/system/threading/threadabortexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: ThreadAbortException diff --git a/mscorlib/system/threading/threadinterruptedexception.cs b/mscorlib/system/threading/threadinterruptedexception.cs index af9a03dc3..28e1eed10 100644 --- a/mscorlib/system/threading/threadinterruptedexception.cs +++ b/mscorlib/system/threading/threadinterruptedexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: ThreadInterruptedException diff --git a/mscorlib/system/threading/threadpool.cs b/mscorlib/system/threading/threadpool.cs index d3e28d1e6..b58432102 100644 --- a/mscorlib/system/threading/threadpool.cs +++ b/mscorlib/system/threading/threadpool.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: ThreadPool @@ -101,7 +101,7 @@ internal int Add(T e) } else if (i == array.Length - 1) { - // Must resize. If we raced and lost, we start over again. + // Must resize. If we ----d and lost, we start over again. if (array != m_array) continue; diff --git a/mscorlib/system/threading/threadstartexception.cs b/mscorlib/system/threading/threadstartexception.cs index 99163d89b..a04134946 100644 --- a/mscorlib/system/threading/threadstartexception.cs +++ b/mscorlib/system/threading/threadstartexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Threading { diff --git a/mscorlib/system/threading/threadstateexception.cs b/mscorlib/system/threading/threadstateexception.cs index fecd34441..3fa634c23 100644 --- a/mscorlib/system/threading/threadstateexception.cs +++ b/mscorlib/system/threading/threadstateexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: ThreadStateException diff --git a/mscorlib/system/threading/timeout.cs b/mscorlib/system/threading/timeout.cs index 9b7d3562a..bf070e1d3 100644 --- a/mscorlib/system/threading/timeout.cs +++ b/mscorlib/system/threading/timeout.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Threading { using System.Threading; diff --git a/mscorlib/system/threading/timer.cs b/mscorlib/system/threading/timer.cs index 02e1d5ba1..5e7368331 100644 --- a/mscorlib/system/threading/timer.cs +++ b/mscorlib/system/threading/timer.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Threading { @@ -71,7 +71,7 @@ private TimerQueue() // We need to keep our notion of time synchronized with the calls to SleepEx that drive // the underlying native timer. In Win8, SleepEx does not count the time the machine spends // sleeping/hibernating. Environment.TickCount (GetTickCount) *does* count that time, - // so we will get out of sync with SleepEx if we use that method. + // so we will get out of [....] with SleepEx if we use that method. // // So, on Win8, we use QueryUnbiasedInterruptTime instead; this does not count time spent // in sleep/hibernate mode. diff --git a/mscorlib/system/threading/volatile.cs b/mscorlib/system/threading/volatile.cs index 5682b2973..abf6cb7cc 100644 --- a/mscorlib/system/threading/volatile.cs +++ b/mscorlib/system/threading/volatile.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] using System; using System.Runtime.InteropServices; using System.Runtime.Versioning; diff --git a/mscorlib/system/threading/waithandle.cs b/mscorlib/system/threading/waithandle.cs index e85d72f3c..026d7c6a3 100644 --- a/mscorlib/system/threading/waithandle.cs +++ b/mscorlib/system/threading/waithandle.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] /*============================================================================= ** ** Class: WaitHandle (this name is NOT definitive) @@ -106,7 +106,7 @@ public virtual IntPtr Handle // ideally do these things: // *) Expose a settable SafeHandle property on WaitHandle. // *) Expose a settable OwnsHandle property on SafeHandle. - // We're looking into this. -- Microsoft + // We're looking into this. -- [....] if (safeWaitHandle != null) { safeWaitHandle.SetHandleAsInvalid(); diff --git a/mscorlib/system/threading/waithandlecannotbeopenedexception.cs b/mscorlib/system/threading/waithandlecannotbeopenedexception.cs index 06c941d6e..b7b80e060 100644 --- a/mscorlib/system/threading/waithandlecannotbeopenedexception.cs +++ b/mscorlib/system/threading/waithandlecannotbeopenedexception.cs @@ -4,7 +4,7 @@ // // ==--== // -// Microsoft +// [....] namespace System.Threading { using System; diff --git a/mscorlib/system/type.cs b/mscorlib/system/type.cs index 4eada4a29..0f605083d 100644 --- a/mscorlib/system/type.cs +++ b/mscorlib/system/type.cs @@ -6,7 +6,7 @@ // // File: Type.cs // -// Microsoft +// [....] // // Implements System.Type //