diff --git a/Directory.Build.props b/Directory.Build.props index 9470a99ed1..fc9bbe7652 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ BSD-2-Clause 0 - 3.1.0 + 4.0.0 beta-$(BuildNumber) $(VersionPrefix).$(BuildNumber) diff --git a/Directory.Packages.props b/Directory.Packages.props index 696ba032e6..96e66d0b98 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,22 +11,22 @@ - + - + - - + + - - - + + + diff --git a/Jint.Tests/Runtime/EngineTests.cs b/Jint.Tests/Runtime/EngineTests.cs index 9eea7d28ec..fcb75c010c 100644 --- a/Jint.Tests/Runtime/EngineTests.cs +++ b/Jint.Tests/Runtime/EngineTests.cs @@ -892,7 +892,7 @@ public void ShouldNotAllowModifyingSharedUndefinedDescriptor() var e = new Engine(); e.Evaluate("var x = { literal: true };"); - var pd = e.GetValue("x").AsObject().GetProperty("doesNotExist"); + var pd = e.GetValue("x").AsObject().GetOwnProperty("doesNotExist"); Assert.Throws(() => pd.Value = "oh no, assigning this breaks things"); } diff --git a/Jint/Native/Object/ObjectInstance.cs b/Jint/Native/Object/ObjectInstance.cs index 9ad75ca337..ad3e2a22c9 100644 --- a/Jint/Native/Object/ObjectInstance.cs +++ b/Jint/Native/Object/ObjectInstance.cs @@ -319,12 +319,6 @@ private List GetOwnPropertyKeysSorted(List initialOwnPropertyK internal virtual IEnumerable GetInitialOwnStringPropertyKeys() => System.Linq.Enumerable.Empty(); - [Obsolete("Will be removed")] - protected virtual void AddProperty(JsValue property, PropertyDescriptor descriptor) - { - SetProperty(property, descriptor); - } - protected virtual bool TryGetProperty(JsValue property, [NotNullWhen(true)] out PropertyDescriptor? descriptor) { descriptor = null; @@ -447,20 +441,6 @@ protected internal virtual void SetOwnProperty(JsValue property, PropertyDescrip SetProperty(property, desc); } - [Obsolete("Use Get or GetOwnProperty")] - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public PropertyDescriptor GetProperty(JsValue property) - { - var prop = GetOwnProperty(property); - - if (prop != PropertyDescriptor.Undefined) - { - return prop; - } - - return Prototype?.GetProperty(property) ?? PropertyDescriptor.Undefined; - } - public bool TryGetValue(JsValue property, out JsValue value) { value = Undefined; diff --git a/Jint/Runtime/Interop/ObjectWrapper.Specialized.cs b/Jint/Runtime/Interop/ObjectWrapper.Specialized.cs index 4418715713..5baa4317d1 100644 --- a/Jint/Runtime/Interop/ObjectWrapper.Specialized.cs +++ b/Jint/Runtime/Interop/ObjectWrapper.Specialized.cs @@ -8,13 +8,11 @@ namespace Jint.Runtime.Interop; internal abstract class ArrayLikeWrapper : ObjectWrapper { -#pragma warning disable CS0618 // Type or member is obsolete protected ArrayLikeWrapper( Engine engine, object obj, Type itemType, Type? type = null) : base(engine, obj, type) -#pragma warning restore CS0618 // Type or member is obsolete { ItemType = itemType; if (engine.Options.Interop.AttachArrayPrototype) diff --git a/Jint/Runtime/Interop/ObjectWrapper.cs b/Jint/Runtime/Interop/ObjectWrapper.cs index 669ee74edc..16889909e5 100644 --- a/Jint/Runtime/Interop/ObjectWrapper.cs +++ b/Jint/Runtime/Interop/ObjectWrapper.cs @@ -22,8 +22,7 @@ public class ObjectWrapper : ObjectInstance, IObjectWrapper, IEquatable