From 7fdc4a8af53175135f08cefda58926154f13c2f1 Mon Sep 17 00:00:00 2001 From: Rob Ward Date: Wed, 22 Feb 2017 11:21:01 -0800 Subject: [PATCH] Updated API Baseline based on VS2013 build related ot the following commits: - commit 990d5b700836bdc241d451be47b943ae72ca40d1 - commit c568afc0a94d699d0fcedebf638cabb926a7aaf6 - commit 12b0b51ca07fcce82ef685b6789aacbf39fa9f26 Verfied UTs are passing. --- .../PublicApi/System.Web.OData.PublicApi.bsl | 70 +------------------ 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/OData/test/UnitTest/System.Web.OData.Test/PublicApi/System.Web.OData.PublicApi.bsl b/OData/test/UnitTest/System.Web.OData.Test/PublicApi/System.Web.OData.PublicApi.bsl index 807812d25b..016ac3e29d 100644 --- a/OData/test/UnitTest/System.Web.OData.Test/PublicApi/System.Web.OData.PublicApi.bsl +++ b/OData/test/UnitTest/System.Web.OData.Test/PublicApi/System.Web.OData.PublicApi.bsl @@ -966,7 +966,7 @@ public abstract class System.Web.OData.Builder.ProcedureConfiguration { string Namespace { public get; public set; } NavigationSourceConfiguration NavigationSource { public get; public set; } bool OptionalReturn { public get; public set; } - System.Collections.Generic.IEnumerable`1[[System.Web.OData.Builder.ParameterConfiguration]] Parameters { [IteratorStateMachineAttribute(),]public virtual get; } + System.Collections.Generic.IEnumerable`1[[System.Web.OData.Builder.ParameterConfiguration]] Parameters { public virtual get; } ProcedureLinkBuilder ProcedureLinkBuilder { protected get; protected set; } IEdmTypeConfiguration ReturnType { public get; public set; } string Title { public get; public set; } @@ -2606,81 +2606,21 @@ public class System.Web.OData.Routing.ODataPathSegmentTranslator : Microsoft.ODa public ODataPathSegmentTranslator (Microsoft.OData.Edm.IEdmModel model, bool enableUriTemplateParsing, System.Collections.Generic.IDictionary`2[[System.String],[Microsoft.OData.Core.UriParser.Semantic.SingleValueNode]] parameterAliasNodes) public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.BatchReferenceSegment segment) - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.BatchSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.CountSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.EntitySetSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.KeySegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.MetadataSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.NavigationPropertyLinkSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.NavigationPropertySegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.OpenPropertySegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.OperationImportSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.OperationSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.PathTemplateSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.PropertySegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.SingletonSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.TypeSegment segment) - - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.Generic.IEnumerable`1[[System.Web.OData.Routing.ODataPathSegment]] Translate (Microsoft.OData.Core.UriParser.Semantic.ValueSegment segment) - public static ODataPath TranslateODataLibPathToWebApiPath (Microsoft.OData.Core.UriParser.Semantic.ODataPath path, Microsoft.OData.Edm.IEdmModel model, UnresolvedPathSegment unresolvedPathSegment, Microsoft.OData.Core.UriParser.Semantic.KeySegment id, bool enableUriTemplateParsing, System.Collections.Generic.IDictionary`2[[System.String],[Microsoft.OData.Core.UriParser.Semantic.SingleValueNode]] parameterAliasNodes) } @@ -2895,11 +2835,7 @@ public class System.Web.OData.Formatter.Deserialization.ODataCollectionDeseriali public ODataCollectionDeserializer (ODataDeserializerProvider deserializerProvider) public virtual object Read (Microsoft.OData.Core.ODataMessageReader messageReader, System.Type type, ODataDeserializerContext readContext) - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.IEnumerable ReadCollectionValue (Microsoft.OData.Core.ODataCollectionValue collectionValue, Microsoft.OData.Edm.IEdmTypeReference elementType, ODataDeserializerContext readContext) - public virtual object ReadInline (object item, Microsoft.OData.Edm.IEdmTypeReference edmType, ODataDeserializerContext readContext) } @@ -2958,11 +2894,7 @@ public class System.Web.OData.Formatter.Deserialization.ODataEnumDeserializer : public class System.Web.OData.Formatter.Deserialization.ODataFeedDeserializer : ODataEdmTypeDeserializer { public ODataFeedDeserializer (ODataDeserializerProvider deserializerProvider) - [ - IteratorStateMachineAttribute(), - ] public virtual System.Collections.IEnumerable ReadFeed (ODataFeedWithEntries feed, Microsoft.OData.Edm.IEdmEntityTypeReference elementType, ODataDeserializerContext readContext) - public virtual object ReadInline (object item, Microsoft.OData.Edm.IEdmTypeReference edmType, ODataDeserializerContext readContext) }