fix(rhino): cleaning up version numbers (#1800)

* fix(rhino): cleaning up version numbers * fix(rhino): re-adds the plugin id field
specklesystems · Oct 28, 2022 · 8758767 · 8758767
1 parent 69b8a55
commit 8758767
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 198 deletions.
diff --git a/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj b/ConnectorGrasshopper/ConnectorGrasshopper/ConnectorGrasshopper.csproj
@@ -22,10 +22,6 @@
     <ProjectReference Include="..\ConnectorGrasshopperUtils\ConnectorGrasshopperUtils.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="RhinoCommon" Version="6.28.20199.17141" IncludeAssets="compile;build" />
     <PackageReference Include="Grasshopper" Version="6.28.20199.17141" IncludeAssets="compile;build" />
     <PackageReference Include="GrasshopperAsyncComponent" Version="1.2.3" />

diff --git 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
@@ -6,14 +6,15 @@
     <Title>SpeckleRhino</Title>
     <Description>Description of SpeckleRhino</Description>
     <TargetExt>.rhp</TargetExt>
+    <Product>ConnectorRhino6</Product>
     <RhinoMacLauncher>/Applications/Rhinoceros.app</RhinoMacLauncher>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>SpeckleConnectorRhino</AssemblyName>
     <Configurations>Debug;Release;Debug Mac;Release Mac</Configurations>
     <RootNamespace>SpeckleRhino</RootNamespace>
     <PlatformTarget>x64</PlatformTarget>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <Version>2.0.0-dev</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,10 +29,6 @@
     <PackageReference Include="Avalonia" Version="0.10.18" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
     </PackageReference>
     <PackageReference Include="RhinoCommon" Version="6.28.20199.17141">

diff --git a/ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs b/ConnectorRhino/ConnectorRhino6/Properties/AssemblyInfo.cs
diff --git a/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj b/ConnectorRhino/ConnectorRhino7/ConnectorRhino7.csproj
@@ -6,12 +6,13 @@
     <Title>SpeckleRhino</Title>
     <Description>Description of SpeckleRhino</Description>
     <TargetExt>.rhp</TargetExt>
+    <Product>ConnectorRhino7</Product>
     <RhinoMacLauncher>/Applications/Rhino 7.app</RhinoMacLauncher>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AssemblyName>SpeckleConnectorRhino</AssemblyName>
     <Configurations>Debug;Release;Debug Mac;Release Mac</Configurations>
     <RootNamespace>SpeckleRhino</RootNamespace>
+    <Version>2.0.0-dev</Version>
     <!--NOTE-->
   <!--
     Since Rhino uses mono we build for win-x64 also on mac
@@ -35,10 +36,6 @@
     <PackageReference Include="Avalonia" Version="0.10.18" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1">
     </PackageReference>
     <PackageReference Include="RhinoCommon" Version="7.4.21078.1001">

diff --git a/ConnectorRhino/ConnectorRhino7/Properties/AssemblyInfo.cs b/ConnectorRhino/ConnectorRhino7/Properties/AssemblyInfo.cs
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterGrasshopper7/ConverterGrasshopper7.csproj b/Objects/Converters/ConverterRhinoGh/ConverterGrasshopper7/ConverterGrasshopper7.csproj
@@ -9,7 +9,6 @@
         <Authors>Speckle</Authors>
         <Company />
         <Product />
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <PackageProjectUrl>https://speckle.systems/</PackageProjectUrl>
         <PackageIcon>logo.png</PackageIcon>
@@ -27,10 +26,6 @@
 
     <ItemGroup>
         <PackageReference Include="Grasshopper" Version="7.4.21078.1001" />
-        <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0" Condition="$([MSBuild]::IsOSPlatform(Windows))">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="RhinoCommon" Version="7.4.21078.1001" IncludeAssets="compile;build" />
     </ItemGroup>
 
@@ -50,10 +45,6 @@
         </ProjectReference>
     </ItemGroup>
 
-    <ItemGroup>
-        <Folder Include="Properties\" />
-    </ItemGroup>
-
     <ItemGroup>
         <None Include="..\..\..\..\logo.png">
             <Pack>True</Pack>

diff --git a/Objects/Converters/ConverterRhinoGh/ConverterGrasshopper7/Properties/AssemblyInfo.cs b/Objects/Converters/ConverterRhinoGh/ConverterGrasshopper7/Properties/AssemblyInfo.cs
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhino6/Properties/launchSettings.json b/Objects/Converters/ConverterRhinoGh/ConverterRhino6/Properties/launchSettings.json
diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhino7/ConverterRhino7.csproj b/Objects/Converters/ConverterRhinoGh/ConverterRhino7/ConverterRhino7.csproj
@@ -10,7 +10,6 @@
     <Authors>Speckle</Authors>
     <Company />
     <Product />
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://speckle.systems/</PackageProjectUrl>
     <PackageIcon>logo.png</PackageIcon>
@@ -28,10 +27,6 @@
 
   <ItemGroup>
     <PackageReference Include="Grasshopper" Version="7.4.21078.1001" />
-    <PackageReference Include="MSBuild.AssemblyVersion" Version="1.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="RhinoCommon" Version="7.4.21078.1001" IncludeAssets="compile;build" />
   </ItemGroup>
 
@@ -50,10 +45,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\..\..\logo.png">
       <Pack>True</Pack>

diff --git a/Objects/Converters/ConverterRhinoGh/ConverterRhino7/Properties/AssemblyInfo.cs b/Objects/Converters/ConverterRhinoGh/ConverterRhino7/Properties/AssemblyInfo.cs