From 9a19659ee9aff3169ea35713b1f46700bbd99606 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sat, 26 Nov 2022 14:27:45 +0000 Subject: [PATCH] Support VS Mac 17.5 API has changed. The PadFontChanger no longer takes an XWT Font, it now takes an AppKit.Font. Target .NET 7.0 to match VS Mac 17.5. Update addin info to indicate it supports VS Mac 17.5. --- .../ObjectInspectorPad.cs | 3 ++- .../MonoDevelop.CSharpInteractive.csproj | 2 +- src/MonoDevelop.CSharpInteractive/Properties/AddinInfo.cs | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.Debugging/ObjectInspectorPad.cs b/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.Debugging/ObjectInspectorPad.cs index a216516..a439010 100644 --- a/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.Debugging/ObjectInspectorPad.cs +++ b/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.Debugging/ObjectInspectorPad.cs @@ -24,6 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +using AppKit; using System; using System.Reflection; using Foundation; @@ -76,7 +77,7 @@ public ObjectInspectorPad () control = scrolled; } - void SetCustomFont (Font font) + void SetCustomFont (NSFont font) { Type type = treeView.GetType (); MethodInfo method = type.GetMethod ("SetCustomFont", BindingFlags.NonPublic | BindingFlags.Instance); diff --git a/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.csproj b/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.csproj index 1964e46..762803a 100644 --- a/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.csproj +++ b/src/MonoDevelop.CSharpInteractive/MonoDevelop.CSharpInteractive.csproj @@ -4,7 +4,7 @@ false false ..\..\bin - net6.0 + net7.0 1.0.0-beta.22103.1 diff --git a/src/MonoDevelop.CSharpInteractive/Properties/AddinInfo.cs b/src/MonoDevelop.CSharpInteractive/Properties/AddinInfo.cs index 428cdfa..088d2b4 100644 --- a/src/MonoDevelop.CSharpInteractive/Properties/AddinInfo.cs +++ b/src/MonoDevelop.CSharpInteractive/Properties/AddinInfo.cs @@ -35,8 +35,8 @@ [assembly:AddinName ("CSharp Interactive")] [assembly:AddinDescription ("")] -[assembly:AddinDependency ("Core", "17.4")] -[assembly:AddinDependency ("Ide", "17.4")] -[assembly:AddinDependency ("Debugger", "17.4")] -[assembly:AddinDependency ("TextEditor", "17.4")] +[assembly:AddinDependency ("Core", "17.5")] +[assembly:AddinDependency ("Ide", "17.5")] +[assembly:AddinDependency ("Debugger", "17.5")] +[assembly:AddinDependency ("TextEditor", "17.5")]