diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2022-02-08 23:43:38 +0300 |
|---|---|---|
| committer | Sandy Armstrong <sandy@xamarin.com> | 2022-02-16 23:14:06 +0300 |
| commit | 4b9df9b967ba13db7d83fb6e8cacf3d9ad559dc1 (patch) | |
| tree | a658b7db9108adac764302f21d439fd0506b9909 | |
| parent | 36c89b26f75bf820c831b684a5cc82498f646025 (diff) | |
Prepare for nfloat moving to ObjCRuntime namespace
This change landed in the macOS workload between preview 10 and 11.
| -rw-r--r-- | Xwt.XamMac/Xwt.Mac/AlertDialogBackend.cs | 2 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.Mac/OutlineViewBackend.cs | 2 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.Mac/WindowBackend.cs | 2 | ||||
| -rw-r--r-- | Xwt.XamMac/Xwt.XamMac.csproj | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Xwt.XamMac/Xwt.Mac/AlertDialogBackend.cs b/Xwt.XamMac/Xwt.Mac/AlertDialogBackend.cs index 99efaaaa..7c2b2e56 100644 --- a/Xwt.XamMac/Xwt.Mac/AlertDialogBackend.cs +++ b/Xwt.XamMac/Xwt.Mac/AlertDialogBackend.cs @@ -117,7 +117,7 @@ namespace Xwt.Mac public bool ApplyToAll { get; set; } #endregion - public override bool ConformsToProtocol (IntPtr protocol) + public override bool ConformsToProtocol (NativeHandle protocol) { // HACK: for some reason on systems with a TouchBar this might be called // after the window has been closed and released, resulting in diff --git a/Xwt.XamMac/Xwt.Mac/OutlineViewBackend.cs b/Xwt.XamMac/Xwt.Mac/OutlineViewBackend.cs index d424dec6..d24917aa 100644 --- a/Xwt.XamMac/Xwt.Mac/OutlineViewBackend.cs +++ b/Xwt.XamMac/Xwt.Mac/OutlineViewBackend.cs @@ -26,6 +26,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +global using ObjCRuntime; + using System; using System.Linq; using AppKit; diff --git a/Xwt.XamMac/Xwt.Mac/WindowBackend.cs b/Xwt.XamMac/Xwt.Mac/WindowBackend.cs index 2d874eb1..709b689c 100644 --- a/Xwt.XamMac/Xwt.Mac/WindowBackend.cs +++ b/Xwt.XamMac/Xwt.Mac/WindowBackend.cs @@ -567,7 +567,7 @@ namespace Xwt.Mac } } - public override bool ConformsToProtocol (IntPtr protocol) + public override bool ConformsToProtocol (NativeHandle protocol) { // HACK: for some reason on systems with a TouchBar this might be called // after the window has been closed and released, resulting in diff --git a/Xwt.XamMac/Xwt.XamMac.csproj b/Xwt.XamMac/Xwt.XamMac.csproj index b790f931..5da321c0 100644 --- a/Xwt.XamMac/Xwt.XamMac.csproj +++ b/Xwt.XamMac/Xwt.XamMac.csproj @@ -22,7 +22,6 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> - <LangVersion>6</LangVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -32,7 +31,6 @@ <WarningLevel>4</WarningLevel> <AllowUnsafeBlocks>True</AllowUnsafeBlocks> <DebugSymbols>true</DebugSymbols> - <LangVersion>6</LangVersion> </PropertyGroup> <PropertyGroup Condition="!$(Net6)"> <XamMacPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll</XamMacPath> |