zune/MicrosoftIris
0
0
Fork 0
mirror of https://github.com/ZuneDev/MicrosoftIris.git synced 2026-07-27 13:13:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added .NET 6 multitarget

Browse Source
This commit is contained in:
Yoshi Askharoun
2022-06-03 00:37:31 -05:00
parent d3d2bc0443
commit 72bba3fe14
5 changed files with 149 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/Accessibility/AccessibleProxy.cs
+12
View File
@@ -377,7 +377,11 @@ namespace Microsoft.Iris.Accessibility
return Help;
}
#if NET6_0_OR_GREATER
int IAccessible.get_accHelpTopic(ref string pszHelpFile, object varChild)
#else
int IAccessible.get_accHelpTopic(out string pszHelpFile, object varChild)
#endif
{
VerifyProxyAccess();
VerifySelfChildID(varChild);
@@ -461,14 +465,22 @@ namespace Microsoft.Iris.Accessibility
DoDefaultAction();
}
#if NET6_0_OR_GREATER
void IAccessible.put_accName(object varChild, string pszName)
#else
void IAccessible.set_accName(object varChild, string pszName)
#endif
{
VerifyProxyAccess();
VerifySelfChildID(varChild);
Name = pszName;
}
#if NET6_0_OR_GREATER
void IAccessible.put_accValue(object varChild, string pszValue)
#else
void IAccessible.set_accValue(object varChild, string pszValue)
#endif
{
VerifyProxyAccess();
VerifySelfChildID(varChild);
UIX/Microsoft/Iris/InputHandlers/TextEditingHandler.cs
+4
View File
@@ -17,6 +17,10 @@ using Microsoft.Iris.UI;
using Microsoft.Iris.ViewItems;
using System;
#if NET6_0_OR_GREATER
using Range = Microsoft.Iris.ModelItems.Range;
#endif
namespace Microsoft.Iris.InputHandlers
{
internal class TextEditingHandler :