Merge pull request #1 from IvoKrugers/develop

IvoKrugers · web-flow · commit 63eabeb833af · 2022-05-25T15:58:03.000+02:00
port to vs2022
diff --git a/.gitignore b/.gitignore
@@ -348,3 +348,4 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+*.mpack
diff --git a/VisualStudioMac.OneClickToOpenFile/CommandHandlers/Node/OneClickNodeCommandHandler.cs b/VisualStudioMac.OneClickToOpenFile/CommandHandlers/Node/OneClickNodeCommandHandler.cs
@@ -4,7 +4,7 @@
 using MonoDevelop.Ide.Gui.Components;
 using MonoDevelop.Projects;
 
-namespace VisualStudioMac.OneClickToOpenFile
+namespace VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node
 {
     public class OneClickNodeCommandHandler : NodeCommandHandler
     {
@@ -22,5 +22,15 @@ public override void OnItemSelected()
                 }
             }
         }
+
+        public override void OnRenameStarting(ref string startingText, ref int selectionStart, ref int selectionLength)
+        {
+            base.OnRenameStarting(ref startingText, ref selectionStart, ref selectionLength);
+        }
+
+        public override void OnRenameStarting(ref int selectionStart, ref int selectionLength)
+        {
+            base.OnRenameStarting(ref selectionStart, ref selectionLength);
+        }
     }
 }
diff --git a/VisualStudioMac.OneClickToOpenFile/Constants.cs b/VisualStudioMac.OneClickToOpenFile/Constants.cs
@@ -1,9 +1,8 @@
-﻿using System;
-namespace VisualStudioMac.OneClickToOpenFile
+﻿namespace VisualStudioMac.OneClickToOpenFile
 {
     public static class Constants
     {
-        public const string Version = "1.0";
+        public const string Version = "17.0";
         public const string OneClickChar
 #if DEBUG
          = "-->>";
diff --git a/VisualStudioMac.OneClickToOpenFile/NodeBuilderExtensions/OneClickFileNodeBuilderExt.cs b/VisualStudioMac.OneClickToOpenFile/NodeBuilderExtensions/OneClickFileNodeBuilderExt.cs
@@ -0,0 +1,32 @@
+﻿using System;
+using System.IO;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Projects;
+using VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node;
+
+namespace VisualStudioMac.OneClickToOpenFile.NodeBuilderExtensions
+{
+    public class OneClickFileNodeBuilderExt : NodeBuilderExtension
+    {
+        public override bool CanBuildNode(Type dataType)
+            => typeof(ProjectFile).IsAssignableFrom(dataType);
+
+        public override void BuildNode(ITreeBuilder treeBuilder, object dataObject, NodeInfo nodeInfo)
+        {
+            if (dataObject is ProjectFile file)
+            {
+                var ext = Path.GetExtension(file.FilePath);
+                if (Constants.ExcludedExtensionsFromOneClick.FindIndex((s) => s == ext) == -1)
+                {
+                    if (!nodeInfo.Label.Contains(Constants.OneClickChar))
+                    {
+                        nodeInfo.Label = $"{nodeInfo.Label} {Constants.OneClickChar}";
+                    }
+                }
+            }
+        }
+
+        public override Type CommandHandlerType
+            => typeof(OneClickNodeCommandHandler);
+    }
+}
diff --git a/VisualStudioMac.OneClickToOpenFile/OneClickFileNodeBuilderExt.cs b/VisualStudioMac.OneClickToOpenFile/OneClickFileNodeBuilderExt.cs
diff --git a/VisualStudioMac.OneClickToOpenFile/Properties/AddinInfo.cs b/VisualStudioMac.OneClickToOpenFile/Properties/AddinInfo.cs
@@ -9,13 +9,10 @@
     Category = "IDE extensions"
 )]
 
-[assembly: AddinName("One Click To Open File")]
+[assembly: AddinName("SolutionTree One Click To Open File")]
 [assembly: AddinDescription("This extension opens a file with only one click on the solutiontree.\n\nby Ivo Krugers")]
 [assembly: AddinAuthor("Ivo Krugers")]
 [assembly: AddinUrl("https://github.com/IvoKrugers/EssentialsAddin")]
 
-//[assembly: AddinDependency("::MonoDevelop.Core", MonoDevelop.BuildInfo.Version)]
-//[assembly: AddinDependency("::MonoDevelop.Ide", MonoDevelop.BuildInfo.Version)]
-
-[assembly: AddinDependency("Core", "17.0")]
-[assembly: AddinDependency("Ide", "17.0")]
+[assembly: AddinDependency("::MonoDevelop.Core", MonoDevelop.BuildInfo.Version)]
+[assembly: AddinDependency("::MonoDevelop.Ide", MonoDevelop.BuildInfo.Version)]
diff --git a/VisualStudioMac.OneClickToOpenFile/Properties/VisualStudioMac.OneClickToOpenFile.addin.xml b/VisualStudioMac.OneClickToOpenFile/Properties/VisualStudioMac.OneClickToOpenFile.addin.xml
@@ -6,6 +6,6 @@
 
 	<!-- ProjectPad NodeBuilders -->
 	<Extension path="/MonoDevelop/Ide/Pads/ProjectPad">
-		<NodeBuilder class="VisualStudioMac.OneClickToOpenFile.OneClickFileNodeBuilderExt" />
+		<NodeBuilder class="VisualStudioMac.OneClickToOpenFile.NodeBuilderExtensions.OneClickFileNodeBuilderExt" />
 	</Extension>
 </ExtensionModel>
diff --git a/VisualStudioMac.OneClickToOpenFile/VisualStudioMac.OneClickToOpenFile.csproj b/VisualStudioMac.OneClickToOpenFile/VisualStudioMac.OneClickToOpenFile.csproj
@@ -4,19 +4,16 @@
    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>..\..\bin</OutputPath>
+    <OutputPath>.\bin</OutputPath>
+     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType></DebugType>
-    <OutputPath>bin</OutputPath>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\VisualStudioMac.OneClickToOpenFile.addin.xml">
-        <LogicalName>VisualStudioMac.OneClickToOpenFile.addin.xml</LogicalName>
-        </EmbeddedResource>
+
+   <ItemGroup>
+        <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.0.0-preview.7955" />
+
+        <Reference Include="Xamarin.Mac">
+            <HintPath>\Applications\Visual Studio %28Preview%http://29.app\Contents\MonoBundle\Xamarin.Mac.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
   </ItemGroup>
 </Project>
diff --git a/pack.sh b/pack.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+clear
+
+SCRIPTFILE=$0
+
+#Get the absolute path to the containing folder
+PROJECTFOLDER=${SCRIPTFILE%/*}
+
+cd ${PROJECTFOLDER}
+
+pwd
+
+rm *.mpack
+mono /Applications/Visual\ Studio.app/Contents/Resources/lib/monodevelop/bin/vstool.exe setup pack ./VisualStudioMac.OneClickToOpenFile/bin/VisualStudioMac.OneClickToOpenFile.dll

Original file line number	Diff line number	Diff line change
`@@ -348,3 +348,4 @@ MigrationBackup/`
`348`	`348`
`349`	`349`	`# Ionide (cross platform F# VS Code tools) working folder`
`350`	`350`	`.ionide/`
	`351`	`+*.mpack`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using MonoDevelop.Ide.Gui.Components;`
`5`	`5`	`using MonoDevelop.Projects;`
`6`	`6`
`7`		`-namespace VisualStudioMac.OneClickToOpenFile`
	`7`	`+namespace VisualStudioMac.OneClickToOpenFile.CommandHandlers.Node`
`8`	`8`	`{`
`9`	`9`	`public class OneClickNodeCommandHandler : NodeCommandHandler`
`10`	`10`	`{`
`@@ -22,5 +22,15 @@ public override void OnItemSelected()`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+ public override void OnRenameStarting(ref string startingText, ref int selectionStart, ref int selectionLength)`
	`27`	`+ {`
	`28`	`+ base.OnRenameStarting(ref startingText, ref selectionStart, ref selectionLength);`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ public override void OnRenameStarting(ref int selectionStart, ref int selectionLength)`
	`32`	`+ {`
	`33`	`+ base.OnRenameStarting(ref selectionStart, ref selectionLength);`
	`34`	`+ }`
`25`	`35`	`}`
`26`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`		`-using System;`
`2`		`-namespace VisualStudioMac.OneClickToOpenFile`
	`1`	`+namespace VisualStudioMac.OneClickToOpenFile`
`3`	`2`	`{`
`4`	`3`	`public static class Constants`
`5`	`4`	`{`
`6`		`- public const string Version = "1.0";`
	`5`	`+ public const string Version = "17.0";`
`7`	`6`	`public const string OneClickChar`
`8`	`7`	`#if DEBUG`
`9`	`8`	`= "-->>";`