Correct issues with ApiInformation implementation #2305
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using System; | ||
| using Windows.Foundation.Metadata; | ||
|
|
||
| namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT | ||
| { | ||
| // .NET applications use a concept of Union WinMD, which is the union of all known types that exist in the Windows SDK | ||
| // that correspond to the MaxVersionTested setting of the app. If you're running the app on a down-level platform, | ||
| // ApiInformation will tell you the API doesn't exist, but .NET can still JIT methods based on the Union WinMD and | ||
| // perform some reflection tasks. If you actually try to call the API you will get a MissingMethodException at runtime | ||
| // because the API doesn't really exist. | ||
| // A different problem can occur if you include a higher-versioned .NET library inside a lower-versioned app and try to run | ||
| // it on the higher-versioned build of the OS. In this case, ApiInformation will succeed because the type exists in the | ||
| // system metadata, but .NET will throw a MissingMethodException at runtime because the type didn't exist in the Union WinMD | ||
| // used to build the app. | ||
| public static class ApiInformationExtensions | ||
| { | ||
| public static void ExecuteIfPropertyPresent(string typeName, string propertyName, Action action) | ||
| { | ||
| if (ApiInformation.IsPropertyPresent(typeName, propertyName)) | ||
| { | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| catch (MissingMethodException) | ||
| { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static T ExecuteIfPropertyPresent<T>(string typeName, string propertyName, Func<T> action) | ||
| { | ||
| if (ApiInformation.IsPropertyPresent(typeName, propertyName)) | ||
| { | ||
| try | ||
| { | ||
| return action(); | ||
| } | ||
| catch (MissingMethodException) | ||
| { | ||
| } | ||
| } | ||
|
|
||
| return default(T); | ||
| } | ||
|
|
||
| public static void ExecuteIfMethodPresent(string typeName, string methodName, Action action) | ||
| { | ||
| if (ApiInformation.IsMethodPresent(typeName, methodName)) | ||
| { | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| catch (MissingMethodException) | ||
| { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static void ExecuteIfMethodPresent(string typeName, string methodName, uint inputParameterCount, Action action) | ||
| { | ||
| if (ApiInformation.IsMethodPresent(typeName, methodName, inputParameterCount)) | ||
| { | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| catch (MissingMethodException) | ||
| { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static void ExecuteIfEventPresent(string typeName, string eventName, Action action) | ||
| { | ||
| if (ApiInformation.IsEventPresent(typeName, eventName)) | ||
| { | ||
| try | ||
| { | ||
| action(); | ||
| } | ||
| catch (MissingMethodException) | ||
| { | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,8 @@ namespace Microsoft.Toolkit.Win32.UI.Controls.Interop.WinRT | |
| /// </summary> | ||
| public sealed class WebViewControlProcess | ||
| { | ||
| private const string WinRtType = "Windows.Web.UI.Interop.WebViewControlProcessOptions"; | ||
|
|
||
| [SecurityCritical] | ||
| private readonly Windows.Web.UI.Interop.WebViewControlProcess _process; | ||
|
|
||
|
|
@@ -69,14 +71,10 @@ public string Partition | |
| { | ||
| get | ||
| { | ||
| return ApiInformationExtensions.ExecuteIfPropertyPresent( | ||
| WinRtType, | ||
| "Partition", | ||
| () => _process.Partition) ?? string.Empty; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -94,14 +92,10 @@ public string UserAgent | |
| { | ||
| get | ||
| { | ||
| return ApiInformationExtensions.ExecuteIfPropertyPresent( | ||
| WinRtType, | ||
| "Partition", | ||
|
There was a problem hiding this comment. This should be replaced to, no? There was a problem hiding this comment. It was in 193077d |
||
| () => _process.Partition) ?? string.Empty; | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| // See the LICENSE file in the project root for more information. | ||
|
|
||
| using Microsoft.Toolkit.Win32.UI.Controls.Test.WebView.Shared; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using Should; | ||
|
|
||
| namespace Microsoft.Toolkit.Win32.UI.Controls.Test.WinForms.WebView.FunctionalTests.UserAgent | ||
| { | ||
| [TestClass] | ||
| public class Given_a_WebView : HostFormWebViewContextSpecification | ||
| { | ||
| private string _userAgent; | ||
|
|
||
| protected override void Given() | ||
| { | ||
| base.Given(); | ||
|
|
||
| WebView.NavigationCompleted += (o, e) => | ||
| { | ||
| var wv = o as Controls.WinForms.WebView; | ||
| _userAgent = wv.Process.UserAgent; | ||
|
|
||
| Form.Close(); | ||
| }; | ||
| } | ||
|
|
||
| protected override void When() | ||
| { | ||
| NavigateAndWaitForFormClose(TestConstants.Uris.ExampleCom); | ||
| } | ||
|
|
||
|
|
||
| [TestMethod] | ||
| public void UserAgent_accessed_without_exception() | ||
| { | ||
| _userAgent.ShouldEqual(string.Empty); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be LostFocus
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 4bc5d4c