From 635f364b41b908fd7c0ffce6e1f713b94510f2e9 Mon Sep 17 00:00:00 2001 From: Garrett DeBruin Date: Tue, 23 Jan 2024 16:12:24 -0800 Subject: [PATCH 1/3] exposing DataServiceActionQuery properties for testing purposes --- .../DataServiceActionQueryOfT.cs | 41 +++++++++++++---- .../PublicAPI/net45/PublicAPI.Unshipped.txt | 2 + .../Microsoft.OData.PublicApi.net45.bsl | 46 ------------------- ...crosoft.OData.PublicApi.netstandard1.1.bsl | 37 --------------- ...crosoft.OData.PublicApi.netstandard2.0.bsl | 46 ------------------- 5 files changed, 35 insertions(+), 137 deletions(-) diff --git a/src/Microsoft.OData.Client/DataServiceActionQueryOfT.cs b/src/Microsoft.OData.Client/DataServiceActionQueryOfT.cs index ed361ad480..f549248625 100644 --- a/src/Microsoft.OData.Client/DataServiceActionQueryOfT.cs +++ b/src/Microsoft.OData.Client/DataServiceActionQueryOfT.cs @@ -20,12 +20,12 @@ public sealed class DataServiceActionQuery /// /// Context associated with this query. /// - private readonly DataServiceContext Context; + private readonly DataServiceContext context; /// /// Parameters of this action. /// - private readonly BodyOperationParameter[] Parameters; + private readonly BodyOperationParameter[] parameters; /// /// Object of an action which returns a collection. @@ -35,9 +35,34 @@ public sealed class DataServiceActionQuery /// Parameters of this action. public DataServiceActionQuery(DataServiceContext context, string requestUriString, params BodyOperationParameter[] parameters) { - this.Context = context; + this.context = context; this.RequestUri = new Uri(requestUriString); - this.Parameters = parameters; + this.parameters = parameters; + } + + /// + /// Gets the that will be used to execute the action query + /// + public DataServiceContext Context + { + get + { + return this.context; + } + } + + /// + /// Gets the s that will be provided to the action when the query is executed + /// + public IEnumerable Parameters + { + get + { + foreach (var element in this.parameters) + { + yield return element; + } + } } /// @@ -52,7 +77,7 @@ public DataServiceActionQuery(DataServiceContext context, string requestUriStrin /// Problem materializing result of query into object. public IEnumerable Execute() { - return Context.Execute(this.RequestUri, XmlConstants.HttpMethodPost, false, Parameters); + return context.Execute(this.RequestUri, XmlConstants.HttpMethodPost, false, parameters); } /// Asynchronously sends a request to the data service to execute a specific URI. @@ -62,7 +87,7 @@ public IEnumerable Execute() [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "Type is used to infer result")] public IAsyncResult BeginExecute(AsyncCallback callback, object state) { - return Context.BeginExecute(this.RequestUri, callback, state, XmlConstants.HttpMethodPost, false, Parameters); + return context.BeginExecute(this.RequestUri, callback, state, XmlConstants.HttpMethodPost, false, parameters); } /// Asynchronously sends the request so that this call does not block processing while waiting for the results from the service. @@ -77,7 +102,7 @@ public Task> ExecuteAsync() /// The token to monitor for cancellation requests. public Task> ExecuteAsync(CancellationToken cancellationToken) { - return Context.ExecuteAsync(this.RequestUri, XmlConstants.HttpMethodPost, false, cancellationToken, Parameters); + return context.ExecuteAsync(this.RequestUri, XmlConstants.HttpMethodPost, false, cancellationToken, parameters); } /// Called to complete the . @@ -92,7 +117,7 @@ public Task> ExecuteAsync(CancellationToken cancellationToken) public IEnumerable EndExecute(IAsyncResult asyncResult) { Util.CheckArgumentNull(asyncResult, "asyncResult"); - return Context.EndExecute(asyncResult); + return context.EndExecute(asyncResult); } /// diff --git a/src/Microsoft.OData.Client/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.OData.Client/PublicAPI/net45/PublicAPI.Unshipped.txt index e69de29bb2..59b8d95a10 100644 --- a/src/Microsoft.OData.Client/PublicAPI/net45/PublicAPI.Unshipped.txt +++ b/src/Microsoft.OData.Client/PublicAPI/net45/PublicAPI.Unshipped.txt @@ -0,0 +1,2 @@ +Microsoft.OData.Client.DataServiceActionQuery.Context.get -> Microsoft.OData.Client.DataServiceContext +Microsoft.OData.Client.DataServiceActionQuery.Parameters.get -> System.Collections.Generic.IEnumerable \ No newline at end of file diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl index fd85dd37bc..ea40697eea 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl @@ -1055,11 +1055,6 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } -public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { - string Path { public abstract get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } -} - public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1940,11 +1935,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) - [ - ExtensionAttribute(), - ] - public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) - [ ExtensionAttribute(), ] @@ -2055,16 +2045,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) - [ - ExtensionAttribute(), - ] - public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) - - [ - ExtensionAttribute(), - ] - public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) - [ ExtensionAttribute(), ] @@ -2851,17 +2831,6 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } -public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { - public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) - public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) - - string Path { public virtual get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } - - public virtual bool Equals (object obj) - public virtual int GetHashCode () -} - public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4857,7 +4826,6 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } - bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5654,7 +5622,6 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } - int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6516,16 +6483,12 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } -[ -DefaultMemberAttribute(), -] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } - Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () @@ -8970,15 +8933,6 @@ public sealed class Microsoft.OData.Client.UriEntityOperationParameter : Microso public UriEntityOperationParameter (string name, object value, bool useEntityReference) } -[ -AttributeUsageAttribute(), -] -public sealed class Microsoft.OData.Client.UriFunctionAttribute : System.Attribute { - public UriFunctionAttribute (params bool allowClientSideEvaluation) - - bool AllowClientSideEvaluation { public get; } -} - public sealed class Microsoft.OData.Client.WritingEntityReferenceLinkArgs { public WritingEntityReferenceLinkArgs (Microsoft.OData.ODataEntityReferenceLink entityReferenceLink, object source, object target) diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl index 79f11cb3b8..787f26974f 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl @@ -1055,11 +1055,6 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } -public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { - string Path { public abstract get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } -} - public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1940,11 +1935,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) - [ - ExtensionAttribute(), - ] - public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) - [ ExtensionAttribute(), ] @@ -2055,16 +2045,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) - [ - ExtensionAttribute(), - ] - public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) - - [ - ExtensionAttribute(), - ] - public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) - [ ExtensionAttribute(), ] @@ -2851,17 +2831,6 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } -public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { - public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) - public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) - - string Path { public virtual get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } - - public virtual bool Equals (object obj) - public virtual int GetHashCode () -} - public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4857,7 +4826,6 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } - bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5654,7 +5622,6 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } - int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6516,16 +6483,12 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } -[ -DefaultMemberAttribute(), -] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } - Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl index fd85dd37bc..ea40697eea 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl @@ -1055,11 +1055,6 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } -public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { - string Path { public abstract get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } -} - public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1940,11 +1935,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) - [ - ExtensionAttribute(), - ] - public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) - [ ExtensionAttribute(), ] @@ -2055,16 +2045,6 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) - [ - ExtensionAttribute(), - ] - public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) - - [ - ExtensionAttribute(), - ] - public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) - [ ExtensionAttribute(), ] @@ -2851,17 +2831,6 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } -public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { - public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) - public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) - - string Path { public virtual get; } - System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } - - public virtual bool Equals (object obj) - public virtual int GetHashCode () -} - public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4857,7 +4826,6 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } - bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5654,7 +5622,6 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } - int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6516,16 +6483,12 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } -[ -DefaultMemberAttribute(), -] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } - Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () @@ -8970,15 +8933,6 @@ public sealed class Microsoft.OData.Client.UriEntityOperationParameter : Microso public UriEntityOperationParameter (string name, object value, bool useEntityReference) } -[ -AttributeUsageAttribute(), -] -public sealed class Microsoft.OData.Client.UriFunctionAttribute : System.Attribute { - public UriFunctionAttribute (params bool allowClientSideEvaluation) - - bool AllowClientSideEvaluation { public get; } -} - public sealed class Microsoft.OData.Client.WritingEntityReferenceLinkArgs { public WritingEntityReferenceLinkArgs (Microsoft.OData.ODataEntityReferenceLink entityReferenceLink, object source, object target) From 7606732371e6fed19ae006a311ee1af6e2d53469 Mon Sep 17 00:00:00 2001 From: Garrett DeBruin Date: Tue, 23 Jan 2024 16:35:22 -0800 Subject: [PATCH 2/3] fixed PublicAPI --- .../PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Microsoft.OData.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Microsoft.OData.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt index e69de29bb2..59b8d95a10 100644 --- a/src/Microsoft.OData.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt +++ b/src/Microsoft.OData.Client/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt @@ -0,0 +1,2 @@ +Microsoft.OData.Client.DataServiceActionQuery.Context.get -> Microsoft.OData.Client.DataServiceContext +Microsoft.OData.Client.DataServiceActionQuery.Parameters.get -> System.Collections.Generic.IEnumerable \ No newline at end of file From 671d16377835cf3019f5a6d919333115799e12bc Mon Sep 17 00:00:00 2001 From: Garrett DeBruin Date: Tue, 23 Jan 2024 17:01:49 -0800 Subject: [PATCH 3/3] fix public api tests --- .../Microsoft.OData.PublicApi.net45.bsl | 48 +++++++++++++++++++ ...crosoft.OData.PublicApi.netstandard1.1.bsl | 37 ++++++++++++++ ...crosoft.OData.PublicApi.netstandard2.0.bsl | 48 +++++++++++++++++++ 3 files changed, 133 insertions(+) diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl index ea40697eea..f585c78775 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.net45.bsl @@ -1055,6 +1055,11 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } +public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { + string Path { public abstract get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } +} + public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1935,6 +1940,11 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) + [ + ExtensionAttribute(), + ] + public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) + [ ExtensionAttribute(), ] @@ -2045,6 +2055,16 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) + [ + ExtensionAttribute(), + ] + public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) + + [ + ExtensionAttribute(), + ] + public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) + [ ExtensionAttribute(), ] @@ -2831,6 +2851,17 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } +public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { + public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) + public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) + + string Path { public virtual get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } + + public virtual bool Equals (object obj) + public virtual int GetHashCode () +} + public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4826,6 +4857,7 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } + bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5622,6 +5654,7 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } + int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6483,12 +6516,16 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } +[ +DefaultMemberAttribute(), +] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } + Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () @@ -8610,6 +8647,8 @@ public sealed class Microsoft.OData.Client.ContainerPropertyAttribute : System.A public sealed class Microsoft.OData.Client.DataServiceActionQuery`1 { public DataServiceActionQuery`1 (Microsoft.OData.Client.DataServiceContext context, string requestUriString, Microsoft.OData.Client.BodyOperationParameter[] parameters) + Microsoft.OData.Client.DataServiceContext Context { public get; } + System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Client.BodyOperationParameter]] Parameters { public get; } System.Uri RequestUri { public get; } public System.IAsyncResult BeginExecute (System.AsyncCallback callback, object state) @@ -8933,6 +8972,15 @@ public sealed class Microsoft.OData.Client.UriEntityOperationParameter : Microso public UriEntityOperationParameter (string name, object value, bool useEntityReference) } +[ +AttributeUsageAttribute(), +] +public sealed class Microsoft.OData.Client.UriFunctionAttribute : System.Attribute { + public UriFunctionAttribute (params bool allowClientSideEvaluation) + + bool AllowClientSideEvaluation { public get; } +} + public sealed class Microsoft.OData.Client.WritingEntityReferenceLinkArgs { public WritingEntityReferenceLinkArgs (Microsoft.OData.ODataEntityReferenceLink entityReferenceLink, object source, object target) diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl index 787f26974f..79f11cb3b8 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard1.1.bsl @@ -1055,6 +1055,11 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } +public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { + string Path { public abstract get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } +} + public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1935,6 +1940,11 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) + [ + ExtensionAttribute(), + ] + public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) + [ ExtensionAttribute(), ] @@ -2045,6 +2055,16 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) + [ + ExtensionAttribute(), + ] + public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) + + [ + ExtensionAttribute(), + ] + public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) + [ ExtensionAttribute(), ] @@ -2831,6 +2851,17 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } +public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { + public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) + public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) + + string Path { public virtual get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } + + public virtual bool Equals (object obj) + public virtual int GetHashCode () +} + public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4826,6 +4857,7 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } + bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5622,6 +5654,7 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } + int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6483,12 +6516,16 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } +[ +DefaultMemberAttribute(), +] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } + Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () diff --git a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl index ea40697eea..f585c78775 100644 --- a/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl +++ b/test/PublicApiTests/BaseLine/Microsoft.OData.PublicApi.netstandard2.0.bsl @@ -1055,6 +1055,11 @@ public interface Microsoft.OData.Edm.IEdmStructuredType : IEdmElement, IEdmType public interface Microsoft.OData.Edm.IEdmStructuredTypeReference : IEdmElement, IEdmTypeReference { } +public interface Microsoft.OData.Edm.IEdmTargetPath : IEdmElement, IEdmVocabularyAnnotatable { + string Path { public abstract get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public abstract get; } +} + public interface Microsoft.OData.Edm.IEdmTemporalTypeReference : IEdmElement, IEdmPrimitiveTypeReference, IEdmTypeReference { System.Nullable`1[[System.Int32]] Precision { public abstract get; } } @@ -1935,6 +1940,11 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotatable element, string termName) + [ + ExtensionAttribute(), + ] + public static IEnumerable`1 FindVocabularyAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath, Microsoft.OData.Edm.Vocabularies.IEdmTerm term) + [ ExtensionAttribute(), ] @@ -2045,6 +2055,16 @@ public sealed class Microsoft.OData.Edm.ExtensionMethods { ] public static Microsoft.OData.Edm.IEdmOperationReturn GetReturn (Microsoft.OData.Edm.IEdmOperation operation) + [ + ExtensionAttribute(), + ] + public static Microsoft.OData.Edm.IEdmTargetPath GetTargetPath (Microsoft.OData.Edm.IEdmModel model, string targetPath, params bool ignoreCase) + + [ + ExtensionAttribute(), + ] + public static System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Vocabularies.IEdmVocabularyAnnotation]] GetTargetPathAnnotations (Microsoft.OData.Edm.IEdmModel model, string targetPath) + [ ExtensionAttribute(), ] @@ -2831,6 +2851,17 @@ public class Microsoft.OData.Edm.EdmStructuralProperty : Microsoft.OData.Edm.Edm Microsoft.OData.Edm.EdmPropertyKind PropertyKind { public virtual get; } } +public class Microsoft.OData.Edm.EdmTargetPath : IEdmElement, IEdmTargetPath, IEdmVocabularyAnnotatable { + public EdmTargetPath (Microsoft.OData.Edm.IEdmElement[] segments) + public EdmTargetPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.IEdmElement]] segments) + + string Path { public virtual get; } + System.Collections.Generic.IReadOnlyList`1[[Microsoft.OData.Edm.IEdmElement]] Segments { public virtual get; } + + public virtual bool Equals (object obj) + public virtual int GetHashCode () +} + public class Microsoft.OData.Edm.EdmTemporalTypeReference : Microsoft.OData.Edm.EdmPrimitiveTypeReference, IEdmElement, IEdmPrimitiveTypeReference, IEdmTemporalTypeReference, IEdmTypeReference { public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable) public EdmTemporalTypeReference (Microsoft.OData.Edm.IEdmPrimitiveType definition, bool isNullable, System.Nullable`1[[System.Int32]] precision) @@ -4826,6 +4857,7 @@ public abstract class Microsoft.OData.ODataResourceBase : Microsoft.OData.ODataI Microsoft.OData.ODataStreamReferenceValue MediaResource { public get; public set; } System.Collections.Generic.IEnumerable`1[[Microsoft.OData.ODataProperty]] Properties { public get; public set; } System.Uri ReadLink { public get; public set; } + bool SkipPropertyVerification { public get; public set; } string TypeName { public get; public set; } public void AddAction (Microsoft.OData.ODataAction action) @@ -5622,6 +5654,7 @@ public sealed class Microsoft.OData.ODataMessageWriterSettings { bool AlwaysAddTypeAnnotationsForDerivedTypes { public get; public set; } Microsoft.OData.Buffers.ICharArrayPool ArrayPool { public get; public set; } System.Uri BaseUri { public get; public set; } + int BufferSize { public get; public set; } bool EnableCharactersCheck { public get; public set; } bool EnableMessageStreamDisposal { public get; public set; } string JsonPCallback { public get; public set; } @@ -6483,12 +6516,16 @@ public class Microsoft.OData.UriParser.ODataExpandPath : Microsoft.OData.UriPars public ODataExpandPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) } +[ +DefaultMemberAttribute(), +] public class Microsoft.OData.UriParser.ODataPath : IEnumerable, IEnumerable`1 { public ODataPath (Microsoft.OData.UriParser.ODataPathSegment[] segments) public ODataPath (System.Collections.Generic.IEnumerable`1[[Microsoft.OData.UriParser.ODataPathSegment]] segments) int Count { public get; } Microsoft.OData.UriParser.ODataPathSegment FirstSegment { public get; } + Microsoft.OData.UriParser.ODataPathSegment Item [int index] { public get; } Microsoft.OData.UriParser.ODataPathSegment LastSegment { public get; } public virtual System.Collections.Generic.IEnumerator`1[[Microsoft.OData.UriParser.ODataPathSegment]] GetEnumerator () @@ -8610,6 +8647,8 @@ public sealed class Microsoft.OData.Client.ContainerPropertyAttribute : System.A public sealed class Microsoft.OData.Client.DataServiceActionQuery`1 { public DataServiceActionQuery`1 (Microsoft.OData.Client.DataServiceContext context, string requestUriString, Microsoft.OData.Client.BodyOperationParameter[] parameters) + Microsoft.OData.Client.DataServiceContext Context { public get; } + System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Client.BodyOperationParameter]] Parameters { public get; } System.Uri RequestUri { public get; } public System.IAsyncResult BeginExecute (System.AsyncCallback callback, object state) @@ -8933,6 +8972,15 @@ public sealed class Microsoft.OData.Client.UriEntityOperationParameter : Microso public UriEntityOperationParameter (string name, object value, bool useEntityReference) } +[ +AttributeUsageAttribute(), +] +public sealed class Microsoft.OData.Client.UriFunctionAttribute : System.Attribute { + public UriFunctionAttribute (params bool allowClientSideEvaluation) + + bool AllowClientSideEvaluation { public get; } +} + public sealed class Microsoft.OData.Client.WritingEntityReferenceLinkArgs { public WritingEntityReferenceLinkArgs (Microsoft.OData.ODataEntityReferenceLink entityReferenceLink, object source, object target)