Merge pull request #24 from hlaueriksson/net8.0

hlaueriksson · web-flow · commit a818548e6a5b · 2025-01-06T20:08:04.000+01:00
TargetFramework
diff --git a/src/PuppeteerSharp.Contrib.Extensions/InternalExtensions.cs b/src/PuppeteerSharp.Contrib.Extensions/InternalExtensions.cs
@@ -12,21 +12,21 @@ internal static async Task<T> EvaluateFunctionWithGuardAsync<T>(this IElementHan
 
         internal static IPage GuardFromNull(this IPage page)
         {
-            if (page == null) throw new ArgumentNullException(nameof(page));
+            ArgumentNullException.ThrowIfNull(page);
 
             return page;
         }
 
         internal static IResponse GuardFromNull(this IResponse response)
         {
-            if (response == null) throw new ArgumentNullException(nameof(response));
+            ArgumentNullException.ThrowIfNull(response);
 
             return response;
         }
 
         internal static IElementHandle GuardFromNull(this IElementHandle elementHandle)
         {
-            if (elementHandle == null) throw new ArgumentNullException(nameof(elementHandle));
+            ArgumentNullException.ThrowIfNull(elementHandle);
 
             return elementHandle;
         }
diff --git a/src/PuppeteerSharp.Contrib.Extensions/PuppeteerSharp.Contrib.Extensions.csproj b/src/PuppeteerSharp.Contrib.Extensions/PuppeteerSharp.Contrib.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>6.0.0</Version>
     <PackageReleaseNotes>
 ⬆️ Bump PuppeteerSharp to 12.0.0
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/InvocationExtensions.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/InvocationExtensions.cs
@@ -20,15 +20,15 @@ public static bool IsGetterPropertyWithAttribute<T>(this IInvocation invocation)
 
             var property = invocation.TargetType.GetProperty(invocation.Method);
 
-            return property.HasAttribute<T>();
+            return property?.HasAttribute<T>() ?? false;
         }
 
-        public static T GetAttribute<T>(this IInvocation invocation)
+        public static T? GetAttribute<T>(this IInvocation invocation)
             where T : Attribute
         {
             var property = invocation.TargetType.GetProperty(invocation.Method);
 
-            return property.GetAttribute<T>();
+            return property?.GetAttribute<T>();
         }
 
         public static bool IsReturning<T>(this IInvocation invocation)
@@ -50,12 +50,14 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)
                    typeof(ElementObject[]).IsAssignableFrom(invocation.Method.ReturnType.GetGenericArguments()[0]);
         }
 
-        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, SelectorAttribute attribute)
+        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, SelectorAttribute? attribute)
         {
             var page = pageObject.Page;
 
             if (page == null) return null;
 
+            if (attribute == null) return null;
+
             if (invocation.IsReturning<IElementHandle>())
             {
                 return await page.QuerySelectorAsync(attribute.Selector).ConfigureAwait(false);
@@ -86,12 +88,14 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)
             return null;
         }
 
-        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, SelectorAttribute attribute)
+        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, SelectorAttribute? attribute)
         {
             var element = elementObject.Element;
 
             if (element == null) return null;
 
+            if (attribute == null) return null;
+
             if (invocation.IsReturning<IElementHandle>())
             {
                 return await element.QuerySelectorAsync(attribute.Selector).ConfigureAwait(false);
@@ -123,13 +127,15 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)
         }
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, XPathAttribute attribute)
+        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, XPathAttribute? attribute)
 #pragma warning restore CS0618 // Type or member is obsolete
         {
             var page = pageObject.Page;
 
             if (page == null) return null;
 
+            if (attribute == null) return null;
+
             if (invocation.IsReturning<IElementHandle[]>())
             {
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -152,13 +158,15 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)
         }
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, XPathAttribute attribute)
+        public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, XPathAttribute? attribute)
 #pragma warning restore CS0618 // Type or member is obsolete
         {
             var element = elementObject.Element;
 
             if (element == null) return null;
 
+            if (attribute == null) return null;
+
             if (invocation.IsReturning<IElementHandle[]>())
             {
 #pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ProxyFactory.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ProxyFactory.cs
@@ -19,9 +19,10 @@ public static T PageObject<T>(IPage page, IResponse? response)
             return proxy;
         }
 
-        public static T? ElementObject<T>(IPage page, IElementHandle elementHandle)
+        public static T? ElementObject<T>(IPage? page, IElementHandle elementHandle)
             where T : ElementObject
         {
+            if (page == null) return default;
             if (elementHandle == null) return default;
 
             var proxy = ProxyGenerator.CreateClassProxy<T>(Options, new SelectorInterceptor(), new XPathInterceptor());
@@ -40,8 +41,10 @@ public static T PageObject<T>(IPage page, IResponse? response)
             return proxy;
         }
 
-        public static Array ElementObjectArray(Type proxyType, IPage page, IElementHandle[] elementHandles)
+        public static Array? ElementObjectArray(Type? proxyType, IPage page, IElementHandle[] elementHandles)
         {
+            if (proxyType == null) return default;
+
             var array = Array.CreateInstance(proxyType, elementHandles.Length);
             for (var i = 0; i < elementHandles.Length; i++)
             {
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ProxyGenerationHook.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ProxyGenerationHook.cs
@@ -24,7 +24,7 @@ public bool ShouldInterceptMethod(Type type, MethodInfo methodInfo)
                     methodInfo.IsReturningAsyncResult();
         }
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj != null && obj.GetType() == typeof(ProxyGenerationHook);
         }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ReflectionExtensions.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/ReflectionExtensions.cs
@@ -13,9 +13,9 @@ public static bool IsGetterPropertyWithAttribute<T>(this MethodInfo methodInfo)
         {
             if (!methodInfo.IsGetter()) return false;
 
-            var property = methodInfo.DeclaringType.GetProperty(methodInfo);
+            var property = methodInfo.DeclaringType?.GetProperty(methodInfo);
 
-            return property.HasAttribute<T>();
+            return property?.HasAttribute<T>() ?? false;
         }
 
         public static bool IsGetter(this MethodInfo methodInfo)
@@ -29,7 +29,7 @@ public static bool HasAttribute<T>(this PropertyInfo propertyInfo)
             return propertyInfo.GetCustomAttributes<T>().Any();
         }
 
-        public static T GetAttribute<T>(this PropertyInfo propertyInfo)
+        public static T? GetAttribute<T>(this PropertyInfo propertyInfo)
             where T : Attribute
         {
             return propertyInfo.GetCustomAttribute<T>();
@@ -40,7 +40,7 @@ public static bool IsCompilerGenerated(this MemberInfo memberInfo)
             return memberInfo.GetCustomAttributes<CompilerGeneratedAttribute>().Any();
         }
 
-        public static PropertyInfo GetProperty(this Type rootType, MethodInfo methodInfo)
+        public static PropertyInfo? GetProperty(this Type rootType, MethodInfo methodInfo)
         {
             return rootType.GetProperty(methodInfo.Name.Substring(4), BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
         }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/SelectorInterceptor.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/SelectorInterceptor.cs
@@ -17,11 +17,11 @@ public void Intercept(IInvocation invocation)
 
             var tcsType = typeof(TaskCompletionSource<>).MakeGenericType(invocation.Method.ReturnType.GetGenericArguments()[0]);
             var tcs = Activator.CreateInstance(tcsType);
-            invocation.ReturnValue = tcsType.GetProperty("Task").GetValue(tcs, null);
+            invocation.ReturnValue = tcsType?.GetProperty("Task")?.GetValue(tcs, null);
 
 #pragma warning disable VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
 #pragma warning disable VSTHRD110 // Observe result of async calls
-            InterceptAsync(invocation).ContinueWith(_ => tcsType.GetMethod("SetResult").Invoke(tcs, [invocation.ReturnValue]));
+            InterceptAsync(invocation).ContinueWith(_ => tcsType?.GetMethod("SetResult")?.Invoke(tcs, [invocation.ReturnValue]), TaskScheduler.Default);
 #pragma warning restore VSTHRD110 // Observe result of async calls
 #pragma warning restore VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
         }
@@ -34,17 +34,13 @@ private static async Task InterceptAsync(IInvocation invocation)
 
                 if (invocation.InvocationTarget is PageObject pageObject)
                 {
-                    var result = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);
-
-                    invocation.ReturnValue = result;
+                    invocation.ReturnValue = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);
                     return;
                 }
 
                 if (invocation.InvocationTarget is ElementObject elementObject)
                 {
-                    var result = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);
-
-                    invocation.ReturnValue = result;
+                    invocation.ReturnValue = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);
                     return;
                 }
             }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/XPathInterceptor.cs b/src/PuppeteerSharp.Contrib.PageObjects/DynamicProxy/XPathInterceptor.cs
@@ -17,11 +17,11 @@ public void Intercept(IInvocation invocation)
 
             var tcsType = typeof(TaskCompletionSource<>).MakeGenericType(invocation.Method.ReturnType.GetGenericArguments()[0]);
             var tcs = Activator.CreateInstance(tcsType);
-            invocation.ReturnValue = tcsType.GetProperty("Task").GetValue(tcs, null);
+            invocation.ReturnValue = tcsType?.GetProperty("Task")?.GetValue(tcs, null);
 
 #pragma warning disable VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
 #pragma warning disable VSTHRD110 // Observe result of async calls
-            InterceptAsync(invocation).ContinueWith(_ => tcsType.GetMethod("SetResult").Invoke(tcs, [invocation.ReturnValue]));
+            InterceptAsync(invocation).ContinueWith(_ => tcsType?.GetMethod("SetResult")?.Invoke(tcs, [invocation.ReturnValue]), TaskScheduler.Default);
 #pragma warning restore VSTHRD110 // Observe result of async calls
 #pragma warning restore VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
         }
@@ -36,17 +36,13 @@ private static async Task InterceptAsync(IInvocation invocation)
 
                 if (invocation.InvocationTarget is PageObject pageObject)
                 {
-                    var result = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);
-
-                    invocation.ReturnValue = result;
+                    invocation.ReturnValue = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);
                     return;
                 }
 
                 if (invocation.InvocationTarget is ElementObject elementObject)
                 {
-                    var result = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);
-
-                    invocation.ReturnValue = result;
+                    invocation.ReturnValue = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);
                     return;
                 }
             }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/Extensions/ElementHandleExtensions.cs b/src/PuppeteerSharp.Contrib.PageObjects/Extensions/ElementHandleExtensions.cs
@@ -94,17 +94,17 @@ public static async Task<T[]> XPathAsync<T>(this IElementHandle elementHandle, s
             return ProxyFactory.ElementObject<T>(elementHandle.GetPage(), result);
         }
 
-        private static IPage GetPage(this IElementHandle elementHandle)
+        private static IPage? GetPage(this IElementHandle elementHandle)
         {
             var propertyInfo = elementHandle.GetType().GetProperty("Page", BindingFlags.NonPublic | BindingFlags.Instance);
-            var methodInfo = propertyInfo.GetGetMethod(nonPublic: true);
+            var methodInfo = propertyInfo?.GetGetMethod(nonPublic: true);
 
-            return (IPage)methodInfo.Invoke(elementHandle, null);
+            return methodInfo?.Invoke(elementHandle, null) as IPage;
         }
 
         private static IElementHandle GuardFromNull(this IElementHandle elementHandle)
         {
-            if (elementHandle == null) throw new ArgumentNullException(nameof(elementHandle));
+            ArgumentNullException.ThrowIfNull(elementHandle);
 
             return elementHandle;
         }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/Extensions/PageExtensions.cs b/src/PuppeteerSharp.Contrib.PageObjects/Extensions/PageExtensions.cs
@@ -322,7 +322,7 @@ public static async Task<T[]> XPathAsync<T>(this IPage page, string expression)
 
         private static IPage GuardFromNull(this IPage page)
         {
-            if (page == null) throw new ArgumentNullException(nameof(page));
+            ArgumentNullException.ThrowIfNull(page);
 
             return page;
         }
diff --git a/src/PuppeteerSharp.Contrib.PageObjects/PuppeteerSharp.Contrib.PageObjects.csproj b/src/PuppeteerSharp.Contrib.PageObjects/PuppeteerSharp.Contrib.PageObjects.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>6.0.0</Version>
     <PackageReleaseNotes>
 ⬆️ Bump PuppeteerSharp to 12.0.0
diff --git a/src/PuppeteerSharp.Contrib.Should/PageShouldExtensions.cs b/src/PuppeteerSharp.Contrib.Should/PageShouldExtensions.cs
@@ -47,7 +47,7 @@ public static async Task ShouldNotHaveContentAsync(this IPage page, string regex
         /// <seealso href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp"/>
         public static async Task ShouldHaveTitleAsync(this IPage page, string regex, string flags = "", string? because = null)
         {
-            if (!await page.HasTitleAsync(regex, flags).ConfigureAwait(false)) Throw.PageShouldHaveTitle(regex, flags, await page.GetTitleAsync().ConfigureAwait(false), because);
+            if (!await page.HasTitleAsync(regex, flags).ConfigureAwait(false)) Throw.PageShouldHaveTitle(regex, flags, await page.GuardFromNull().GetTitleAsync().ConfigureAwait(false), because);
         }
 
         /// <summary>
@@ -75,7 +75,7 @@ public static async Task ShouldNotHaveTitleAsync(this IPage page, string regex,
         /// <seealso href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp"/>
         public static async Task ShouldHaveUrlAsync(this IPage page, string regex, string flags = "", string? because = null)
         {
-            if (!await page.HasUrlAsync(regex, flags).ConfigureAwait(false)) Throw.PageShouldHaveUrl(regex, flags, page.Url, because);
+            if (!await page.HasUrlAsync(regex, flags).ConfigureAwait(false)) Throw.PageShouldHaveUrl(regex, flags, page.GuardFromNull().Url, because);
         }
 
         /// <summary>
diff --git a/src/PuppeteerSharp.Contrib.Should/PuppeteerSharp.Contrib.Should.csproj b/src/PuppeteerSharp.Contrib.Should/PuppeteerSharp.Contrib.Should.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Version>6.0.0</Version>
     <PackageReleaseNotes>
 ⬆️ Bump PuppeteerSharp to 12.0.0
diff --git a/src/PuppeteerSharp.Contrib.Should/ResponseShouldExtensions.cs b/src/PuppeteerSharp.Contrib.Should/ResponseShouldExtensions.cs
diff --git a/tests/PuppeteerSharp.Contrib.Tests/PuppeteerSharp.Contrib.Tests.csproj b/tests/PuppeteerSharp.Contrib.Tests/PuppeteerSharp.Contrib.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,21 @@ internal static async Task<T> EvaluateFunctionWithGuardAsync<T>(this IElementHan`
`12`	`12`
`13`	`13`	`internal static IPage GuardFromNull(this IPage page)`
`14`	`14`	`{`
`15`		`- if (page == null) throw new ArgumentNullException(nameof(page));`
	`15`	`+ ArgumentNullException.ThrowIfNull(page);`
`16`	`16`
`17`	`17`	`return page;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`internal static IResponse GuardFromNull(this IResponse response)`
`21`	`21`	`{`
`22`		`- if (response == null) throw new ArgumentNullException(nameof(response));`
	`22`	`+ ArgumentNullException.ThrowIfNull(response);`
`23`	`23`
`24`	`24`	`return response;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`internal static IElementHandle GuardFromNull(this IElementHandle elementHandle)`
`28`	`28`	`{`
`29`		`- if (elementHandle == null) throw new ArgumentNullException(nameof(elementHandle));`
	`29`	`+ ArgumentNullException.ThrowIfNull(elementHandle);`
`30`	`30`
`31`	`31`	`return elementHandle;`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,15 @@ public static bool IsGetterPropertyWithAttribute<T>(this IInvocation invocation)`
`20`	`20`
`21`	`21`	`var property = invocation.TargetType.GetProperty(invocation.Method);`
`22`	`22`
`23`		`- return property.HasAttribute<T>();`
	`23`	`+ return property?.HasAttribute<T>() ?? false;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static T GetAttribute<T>(this IInvocation invocation)`
	`26`	`+ public static T? GetAttribute<T>(this IInvocation invocation)`
`27`	`27`	`where T : Attribute`
`28`	`28`	`{`
`29`	`29`	`var property = invocation.TargetType.GetProperty(invocation.Method);`
`30`	`30`
`31`		`- return property.GetAttribute<T>();`
	`31`	`+ return property?.GetAttribute<T>();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public static bool IsReturning<T>(this IInvocation invocation)`
`@@ -50,12 +50,14 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)`
`50`	`50`	`typeof(ElementObject[]).IsAssignableFrom(invocation.Method.ReturnType.GetGenericArguments()[0]);`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, SelectorAttribute attribute)`
	`53`	`+ public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, SelectorAttribute? attribute)`
`54`	`54`	`{`
`55`	`55`	`var page = pageObject.Page;`
`56`	`56`
`57`	`57`	`if (page == null) return null;`
`58`	`58`
	`59`	`+ if (attribute == null) return null;`
	`60`	`+`
`59`	`61`	`if (invocation.IsReturning<IElementHandle>())`
`60`	`62`	`{`
`61`	`63`	`return await page.QuerySelectorAsync(attribute.Selector).ConfigureAwait(false);`
`@@ -86,12 +88,14 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)`
`86`	`88`	`return null;`
`87`	`89`	`}`
`88`	`90`
`89`		`- public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, SelectorAttribute attribute)`
	`91`	`+ public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, SelectorAttribute? attribute)`
`90`	`92`	`{`
`91`	`93`	`var element = elementObject.Element;`
`92`	`94`
`93`	`95`	`if (element == null) return null;`
`94`	`96`
	`97`	`+ if (attribute == null) return null;`
	`98`	`+`
`95`	`99`	`if (invocation.IsReturning<IElementHandle>())`
`96`	`100`	`{`
`97`	`101`	`return await element.QuerySelectorAsync(attribute.Selector).ConfigureAwait(false);`
`@@ -123,13 +127,15 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)`
`123`	`127`	`}`
`124`	`128`
`125`	`129`	`#pragma warning disable CS0618 // Type or member is obsolete`
`126`		`- public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, XPathAttribute attribute)`
	`130`	`+ public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, PageObject pageObject, XPathAttribute? attribute)`
`127`	`131`	`#pragma warning restore CS0618 // Type or member is obsolete`
`128`	`132`	`{`
`129`	`133`	`var page = pageObject.Page;`
`130`	`134`
`131`	`135`	`if (page == null) return null;`
`132`	`136`
	`137`	`+ if (attribute == null) return null;`
	`138`	`+`
`133`	`139`	`if (invocation.IsReturning<IElementHandle[]>())`
`134`	`140`	`{`
`135`	`141`	`#pragma warning disable CS0618 // Type or member is obsolete`
`@@ -152,13 +158,15 @@ public static bool IsReturningElementObjectArray(this IInvocation invocation)`
`152`	`158`	`}`
`153`	`159`
`154`	`160`	`#pragma warning disable CS0618 // Type or member is obsolete`
`155`		`- public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, XPathAttribute attribute)`
	`161`	`+ public static async Task<object?> GetReturnValueAsync(this IInvocation invocation, ElementObject elementObject, XPathAttribute? attribute)`
`156`	`162`	`#pragma warning restore CS0618 // Type or member is obsolete`
`157`	`163`	`{`
`158`	`164`	`var element = elementObject.Element;`
`159`	`165`
`160`	`166`	`if (element == null) return null;`
`161`	`167`
	`168`	`+ if (attribute == null) return null;`
	`169`	`+`
`162`	`170`	`if (invocation.IsReturning<IElementHandle[]>())`
`163`	`171`	`{`
`164`	`172`	`#pragma warning disable CS0618 // Type or member is obsolete`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ public static T PageObject<T>(IPage page, IResponse? response)`
`19`	`19`	`return proxy;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public static T? ElementObject<T>(IPage page, IElementHandle elementHandle)`
	`22`	`+ public static T? ElementObject<T>(IPage? page, IElementHandle elementHandle)`
`23`	`23`	`where T : ElementObject`
`24`	`24`	`{`
	`25`	`+ if (page == null) return default;`
`25`	`26`	`if (elementHandle == null) return default;`
`26`	`27`
`27`	`28`	`var proxy = ProxyGenerator.CreateClassProxy<T>(Options, new SelectorInterceptor(), new XPathInterceptor());`
`@@ -40,8 +41,10 @@ public static T PageObject<T>(IPage page, IResponse? response)`
`40`	`41`	`return proxy;`
`41`	`42`	`}`
`42`	`43`
`43`		`- public static Array ElementObjectArray(Type proxyType, IPage page, IElementHandle[] elementHandles)`
	`44`	`+ public static Array? ElementObjectArray(Type? proxyType, IPage page, IElementHandle[] elementHandles)`
`44`	`45`	`{`
	`46`	`+ if (proxyType == null) return default;`
	`47`	`+`
`45`	`48`	`var array = Array.CreateInstance(proxyType, elementHandles.Length);`
`46`	`49`	`for (var i = 0; i < elementHandles.Length; i++)`
`47`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public bool ShouldInterceptMethod(Type type, MethodInfo methodInfo)`
`24`	`24`	`methodInfo.IsReturningAsyncResult();`
`25`	`25`	`}`
`26`	`26`
`27`		`- public override bool Equals(object obj)`
	`27`	`+ public override bool Equals(object? obj)`
`28`	`28`	`{`
`29`	`29`	`return obj != null && obj.GetType() == typeof(ProxyGenerationHook);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ public static bool IsGetterPropertyWithAttribute<T>(this MethodInfo methodInfo)`
`13`	`13`	`{`
`14`	`14`	`if (!methodInfo.IsGetter()) return false;`
`15`	`15`
`16`		`- var property = methodInfo.DeclaringType.GetProperty(methodInfo);`
	`16`	`+ var property = methodInfo.DeclaringType?.GetProperty(methodInfo);`
`17`	`17`
`18`		`- return property.HasAttribute<T>();`
	`18`	`+ return property?.HasAttribute<T>() ?? false;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static bool IsGetter(this MethodInfo methodInfo)`
`@@ -29,7 +29,7 @@ public static bool HasAttribute<T>(this PropertyInfo propertyInfo)`
`29`	`29`	`return propertyInfo.GetCustomAttributes<T>().Any();`
`30`	`30`	`}`
`31`	`31`
`32`		`- public static T GetAttribute<T>(this PropertyInfo propertyInfo)`
	`32`	`+ public static T? GetAttribute<T>(this PropertyInfo propertyInfo)`
`33`	`33`	`where T : Attribute`
`34`	`34`	`{`
`35`	`35`	`return propertyInfo.GetCustomAttribute<T>();`
`@@ -40,7 +40,7 @@ public static bool IsCompilerGenerated(this MemberInfo memberInfo)`
`40`	`40`	`return memberInfo.GetCustomAttributes<CompilerGeneratedAttribute>().Any();`
`41`	`41`	`}`
`42`	`42`
`43`		`- public static PropertyInfo GetProperty(this Type rootType, MethodInfo methodInfo)`
	`43`	`+ public static PropertyInfo? GetProperty(this Type rootType, MethodInfo methodInfo)`
`44`	`44`	`{`
`45`	`45`	`return rootType.GetProperty(methodInfo.Name.Substring(4), BindingFlags.Instance \| BindingFlags.Public \| BindingFlags.NonPublic);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ public void Intercept(IInvocation invocation)`
`17`	`17`
`18`	`18`	`var tcsType = typeof(TaskCompletionSource<>).MakeGenericType(invocation.Method.ReturnType.GetGenericArguments()[0]);`
`19`	`19`	`var tcs = Activator.CreateInstance(tcsType);`
`20`		`- invocation.ReturnValue = tcsType.GetProperty("Task").GetValue(tcs, null);`
	`20`	`+ invocation.ReturnValue = tcsType?.GetProperty("Task")?.GetValue(tcs, null);`
`21`	`21`
`22`	`22`	`#pragma warning disable VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current`
`23`	`23`	`#pragma warning disable VSTHRD110 // Observe result of async calls`
`24`		`- InterceptAsync(invocation).ContinueWith(_ => tcsType.GetMethod("SetResult").Invoke(tcs, [invocation.ReturnValue]));`
	`24`	`+ InterceptAsync(invocation).ContinueWith(_ => tcsType?.GetMethod("SetResult")?.Invoke(tcs, [invocation.ReturnValue]), TaskScheduler.Default);`
`25`	`25`	`#pragma warning restore VSTHRD110 // Observe result of async calls`
`26`	`26`	`#pragma warning restore VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current`
`27`	`27`	`}`
`@@ -34,17 +34,13 @@ private static async Task InterceptAsync(IInvocation invocation)`
`34`	`34`
`35`	`35`	`if (invocation.InvocationTarget is PageObject pageObject)`
`36`	`36`	`{`
`37`		`- var result = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);`
`38`		`-`
`39`		`- invocation.ReturnValue = result;`
	`37`	`+ invocation.ReturnValue = await invocation.GetReturnValueAsync(pageObject, attribute).ConfigureAwait(false);`
`40`	`38`	`return;`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`if (invocation.InvocationTarget is ElementObject elementObject)`
`44`	`42`	`{`
`45`		`- var result = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);`
`46`		`-`
`47`		`- invocation.ReturnValue = result;`
	`43`	`+ invocation.ReturnValue = await invocation.GetReturnValueAsync(elementObject, attribute).ConfigureAwait(false);`
`48`	`44`	`return;`
`49`	`45`	`}`
`50`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,17 +94,17 @@ public static async Task<T[]> XPathAsync<T>(this IElementHandle elementHandle, s`
`94`	`94`	`return ProxyFactory.ElementObject<T>(elementHandle.GetPage(), result);`
`95`	`95`	`}`
`96`	`96`
`97`		`- private static IPage GetPage(this IElementHandle elementHandle)`
	`97`	`+ private static IPage? GetPage(this IElementHandle elementHandle)`
`98`	`98`	`{`
`99`	`99`	`var propertyInfo = elementHandle.GetType().GetProperty("Page", BindingFlags.NonPublic \| BindingFlags.Instance);`
`100`		`- var methodInfo = propertyInfo.GetGetMethod(nonPublic: true);`
	`100`	`+ var methodInfo = propertyInfo?.GetGetMethod(nonPublic: true);`
`101`	`101`
`102`		`- return (IPage)methodInfo.Invoke(elementHandle, null);`
	`102`	`+ return methodInfo?.Invoke(elementHandle, null) as IPage;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private static IElementHandle GuardFromNull(this IElementHandle elementHandle)`
`106`	`106`	`{`
`107`		`- if (elementHandle == null) throw new ArgumentNullException(nameof(elementHandle));`
	`107`	`+ ArgumentNullException.ThrowIfNull(elementHandle);`
`108`	`108`
`109`	`109`	`return elementHandle;`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ public static async Task<T[]> XPathAsync<T>(this IPage page, string expression)`
`322`	`322`
`323`	`323`	`private static IPage GuardFromNull(this IPage page)`
`324`	`324`	`{`
`325`		`- if (page == null) throw new ArgumentNullException(nameof(page));`
	`325`	`+ ArgumentNullException.ThrowIfNull(page);`
`326`	`326`
`327`	`327`	`return page;`
`328`	`328`	`}`