Moves to TargetFramework net6.0-macos

netonjm · Jul 5, 2022 · 2434aaa · 2434aaa
1 parent e698371
commit 2434aaa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/VisualStudio.ViewInspector.Extension/HostResource.cs b/VisualStudio.ViewInspector.Extension/HostResource.cs
@@ -40,7 +40,7 @@ public NSColor GetNamedColor(string name)
                          NSColor.FromRgb(0, 0, 0) :
                          NSColor.FromRgb(217, 217, 217);
                 case NamedResources.DescriptionLabelColor:
-                    return NSColor.SecondaryLabelColor;
+                    return NSColor.SecondaryLabel;
                 case NamedResources.ForegroundColor:
                     return NSColor.ControlBackground;
                 case NamedResources.PadBackgroundColor:
@@ -62,7 +62,7 @@ public NSColor GetNamedColor(string name)
             return NSColor.FromName(name);
         }
 
-        public NSFont GetNamedFont(string name, ObjCRuntime.nfloat fontSize)
+        public NSFont GetNamedFont(string name, nfloat fontSize)
         {
             return NSFont.SystemFontOfSize(NSFont.SystemFontSize);
         }

diff --git a/VisualStudio.ViewInspector.Extension/VisualStudio.ViewInspector.Extension.csproj b/VisualStudio.ViewInspector.Extension/VisualStudio.ViewInspector.Extension.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MonoDevelop.Inspector.props" />
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-macos</TargetFramework>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/VisualStudio.ViewInspector.Mac/VisualStudio.ViewInspector.Mac.csproj b/VisualStudio.ViewInspector.Mac/VisualStudio.ViewInspector.Mac.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\MonoDevelop.Inspector.props" />
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net6.0-macos</TargetFramework>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/VisualStudio.ViewInspector.Mac/Windows/Inspector/InspectorOutlineView.cs b/VisualStudio.ViewInspector.Mac/Windows/Inspector/InspectorOutlineView.cs
@@ -22,7 +22,7 @@ class DropSelectionView : NSView
     {
         const float Offset = 1;
         CALayer circleLayer, lineLayer;
-        public NSColor Color { get; set; } = NSColor.ControlAccentColor;
+        public NSColor Color { get; set; } = NSColor.ControlAccent;
 
         public override bool WantsDefaultClipping => false;
 
@@ -306,7 +306,7 @@ private bool AllowsDropOperation(TreeNode node)
 
         class InspectorOutlineViewDelegate : OutlineViewDelegate
         {
-            public override ObjCRuntime.nfloat GetRowHeight(NSOutlineView outlineView, NSObject item)
+            public override nfloat GetRowHeight(NSOutlineView outlineView, NSObject item)
             {
                 return 22;
             }