From 8758767c5773f9d69606e027df6f8696d762a8f0 Mon Sep 17 00:00:00 2001 From: Matteo Cominetti Date: Fri, 28 Oct 2022 16:56:58 +0100 Subject: [PATCH] fix(rhino): cleaning up version numbers (#1800) * fix(rhino): cleaning up version numbers * fix(rhino): re-adds the plugin id field --- .../ConnectorGrasshopper.csproj | 4 -- .../ConnectorRhinoShared/Entry/Plugin.cs | 25 +++++++------ .../ConnectorRhino6/ConnectorRhino6.csproj | 7 +--- .../Properties/AssemblyInfo.cs | 37 ------------------- .../ConnectorRhino7/ConnectorRhino7.csproj | 7 +--- .../Properties/AssemblyInfo.cs | 36 ------------------ .../ConverterGrasshopper7.csproj | 9 ----- .../Properties/AssemblyInfo.cs | 37 ------------------- .../Properties/launchSettings.json | 7 ---- .../ConverterRhino7/ConverterRhino7.csproj | 9 ----- .../Properties/AssemblyInfo.cs | 37 ------------------- 11 files changed, 17 insertions(+), 198 deletions(-) delete mode 100644 ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs delete mode 100644 ConnectorRhino/ConnectorRhino7/Properties/AssemblyInfo.cs delete mode 100644 Objects/Converters/ConverterRhinoGh/ConverterGrasshopper7/Properties/AssemblyInfo.cs delete mode 100644 Objects/Converters/ConverterRhinoGh/ConverterRhino6/Properties/launchSettings.json delete mode 100644 Objects/Converters/ConverterRhinoGh/ConverterRhino7/Properties/AssemblyInfo.cs diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj b/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj index d4f7801b70..99d32e2298 100644 --- a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj +++ b/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj @@ -22,10 +22,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs index 6e8341c8b5..62facd225e 100644 --- a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs +++ b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/Plugin.cs @@ -2,18 +2,19 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using Avalonia; using Avalonia.ReactiveUI; using ConnectorRhinoShared; -using DesktopUI2; -using DesktopUI2.ViewModels; using Rhino; using Rhino.PlugIns; using Rhino.Runtime; using Speckle.Core.Api; using Speckle.Core.Models.Extensions; +[assembly: Guid("8dd5f30b-a13d-4a24-abdc-3e05c8c87143")] + namespace SpeckleRhino { public class SpeckleRhinoConnectorPlugin : PlugIn @@ -63,17 +64,17 @@ public void Init() public static void InitAvaloniaMac() { - var rhinoMenuPtr = MacOSHelpers.MainMenu; - var rhinoDelegate = MacOSHelpers.AppDelegate; - var titlePtr = MacOSHelpers.MenuItemGetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0))); + var rhinoMenuPtr = MacOSHelpers.MainMenu; + var rhinoDelegate = MacOSHelpers.AppDelegate; + var titlePtr = MacOSHelpers.MenuItemGetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0))); - appBuilder = BuildAvaloniaApp().SetupWithoutStarting(); + appBuilder = BuildAvaloniaApp().SetupWithoutStarting(); - // don't use Avalonia's AppDelegate.. not sure what consequences this might have to Avalonia functionality - MacOSHelpers.AppDelegate = rhinoDelegate; - MacOSHelpers.MainMenu = rhinoMenuPtr; - MacOSHelpers.MenuItemSetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0)), MacOSHelpers.NewObject("NSString")); - MacOSHelpers.MenuItemSetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0)), titlePtr); + // don't use Avalonia's AppDelegate.. not sure what consequences this might have to Avalonia functionality + MacOSHelpers.AppDelegate = rhinoDelegate; + MacOSHelpers.MainMenu = rhinoMenuPtr; + MacOSHelpers.MenuItemSetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0)), MacOSHelpers.NewObject("NSString")); + MacOSHelpers.MenuItemSetTitle(MacOSHelpers.MenuItemGetSubmenu(MacOSHelpers.MenuItemAt(rhinoMenuPtr, 0)), titlePtr); } @@ -155,7 +156,7 @@ protected override LoadReturnCode OnLoad(ref string errorMessage) Init(); #if !MAC - System.Type panelType = typeof(Panel); + System.Type panelType = typeof(Panel); Rhino.UI.Panels.RegisterPanel(this, panelType, "Speckle", Resources.icon); #endif // Get the version number of our plugin, that was last used, from our settings file. diff --git a/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj b/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj index 0462badd31..85032f033b 100644 --- a/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj +++ b/ConnectorRhino/ConnectorRhino6/ConnectorRhino6.csproj @@ -6,14 +6,15 @@ SpeckleRhino Description of SpeckleRhino .rhp + ConnectorRhino6 /Applications/Rhinoceros.app - false false SpeckleConnectorRhino Debug;Release;Debug Mac;Release Mac SpeckleRhino x64 win-x64 + 2.0.0-dev @@ -28,10 +29,6 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs b/ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs deleted file mode 100644 index 632f7b6bf8..0000000000 --- a/ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ConnectorRhino6")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ConnectorRhino6")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8dd5f30b-a13d-4a24-abdc-3e05c8c87143")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: AssemblyInformationalVersion("1.0.0.0")] diff --git a/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj b/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj index 71cc24a0f8..5116070d8f 100644 --- a/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj +++ b/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj @@ -6,12 +6,13 @@ SpeckleRhino Description of SpeckleRhino .rhp + ConnectorRhino7 /Applications/Rhino 7.app - false false SpeckleConnectorRhino Debug;Release;Debug Mac;Release Mac SpeckleRhino + 2.0.0-dev