Merge pull request #598 from mcneel/AndyPayne/Rhino8Compat2

Andy payne/rhino8 compat2
mcneel · Aug 23, 2023 · 7f73ab6 · 7f73ab6
2 parents 63b3c85 + 2cb1ce2
commit 7f73ab6
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 32 deletions.
diff --git a/.github/workflows/workflow_ci.yml b/.github/workflows/workflow_ci.yml
@@ -60,7 +60,7 @@ jobs:
           echo ${{ steps.revision.outputs.revision }}
           (get-content .\src\compute.geometry\FixedEndpoints.cs).replace('git_sha = null', 'git_sha = "${{ steps.revision.outputs.revision }}"') | set-content .\src\compute.geometry\FixedEndpoints.cs
       - name: build
-        run: dotnet publish src/compute.sln -c Release -p:PublishTrimmed=true --self-contained true -r win-x64
+        run: dotnet publish src/hops.sln -c Release
       - name: artifacts
         if: github.ref == format('refs/heads/{0}', github.event.repository.default_branch)
         uses: actions/upload-artifact@v2

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -39,6 +39,18 @@
             },
             "cwd": "${workspaceFolder}",
             "console": "internalConsole"
+        },
+        {
+            "name": "Launch compute.geometry",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build",
+            "program": "${workspaceFolder}/src/bin/Debug/compute.geometry/compute.geometry.exe",
+            "targetArchitecture": "x86_64",
+            "justMyCode": false,
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "console": "internalConsole"
         }
     ],
     "compounds": []

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,6 +12,30 @@
                 "clear": true
             },
             "group": "build"
+        },
+        {
+            "label": "Build",
+            "command": "dotnet build ${workspaceFolder}/src/Hops.sln",
+            "type": "shell",
+            "args": [],
+            "problemMatcher": "$msCompile",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
+            },
+            "group": "build"
+        },
+        {
+            "label": "Publish",
+            "command": "dotnet publish ${workspaceFolder}/src/Hops.sln -c Release",
+            "type": "shell",
+            "args": [],
+            "problemMatcher": "$msCompile",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
+            },
+            "group": "build"
         }
     ]
 }
diff --git a/src/compute.geometry/Config.cs b/src/compute.geometry/Config.cs
@@ -53,6 +53,8 @@ public static void Load()
 
 #if DEBUG
             Debug = true;
+#elif RELEASE
+            Debug = false;
 #endif
             Debug = GetEnvironmentVariable(RHINO_COMPUTE_DEBUG, Debug);
 

diff --git a/src/compute.geometry/DataCache.cs b/src/compute.geometry/DataCache.cs
@@ -3,6 +3,7 @@
 using GH_IO.Serialization;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Serilog;
 
 namespace compute.geometry
 {
@@ -90,7 +91,7 @@ static void CGCacheDirectory()
             }
             catch(Exception ex)
             {
-                Serilog.Log.Error(ex, "exception while GC on cache directory");
+                Log.Error(ex, "exception while GC on cache directory");
             }
         }
 
@@ -121,8 +122,8 @@ public static GrasshopperDefinition GetCachedDefinition(string key)
                     }
                     catch(Exception ex)
                     {
-                        Serilog.Log.Error($"Unable to read cache file: {filename}");
-                        Serilog.Log.Error(ex, "File error exception");
+                        Log.Error($"Unable to read cache file: {filename}");
+                        Log.Error(ex, "File error exception");
                     }
                 }
                 return null;
@@ -162,8 +163,8 @@ public static void SetCachedDefinition(string key, GrasshopperDefinition definit
                     }
                     catch(Exception ex)
                     {
-                        Serilog.Log.Error($"Unable to write cache file: {filename}");
-                        Serilog.Log.Error(ex, "File error exception");
+                        Log.Error($"Unable to write cache file: {filename}");
+                        Log.Error(ex, "File error exception");
                     }
                 }
             }

diff --git a/src/compute.geometry/GrasshopperDefinition.cs b/src/compute.geometry/GrasshopperDefinition.cs
@@ -69,8 +69,8 @@ private static void Fsw_Changed(object sender, FileSystemEventArgs e)
                 _watchedFileRuntimeSerialNumber++;
         }
 
-        static void LogDebug(string message) { Serilog.Log.Debug(message); }
-        static void LogError(string message) { Serilog.Log.Error(message); }
+        static void LogDebug(string message) { Log.Debug(message); }
+        static void LogError(string message) { Log.Error(message); }
 
         public static GrasshopperDefinition FromUrl(string url, bool cache)
         {

diff --git a/src/compute.geometry/Logging.cs b/src/compute.geometry/Logging.cs
@@ -31,7 +31,6 @@ public static void Init()
             var logger = new LoggerConfiguration()
                 .MinimumLevel.Is(level)
                 .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
-                .Filter.ByExcluding("RequestPath in ['/healthcheck', '/favicon.ico']")
                 .Enrich.FromLogContext()
                 .WriteTo.Console(outputTemplate: "CG {Port} [{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj}{NewLine}{Exception}")
                 .WriteTo.File(new JsonFormatter(renderMessage: true), path, rollingInterval: RollingInterval.Day, retainedFileCountLimit: limit);

diff --git a/src/compute.geometry/Program.cs b/src/compute.geometry/Program.cs
@@ -43,7 +43,6 @@ static void Main(string[] args)
             RhinoInside.Resolver.LoadRhino();
 
             var host = Host.CreateDefaultBuilder(args)
-                .UseSerilog()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     var b = webBuilder.ConfigureKestrel((context, options) =>
@@ -63,7 +62,9 @@ static void Main(string[] args)
                     //    ComputeChildren.ParentPort = port;
                     //}
 
-                }).Build();
+                })
+                .UseSerilog(Log.Logger)
+                .Build();
             Shutdown.StartTimer(host);
             host.Run();
 

diff --git a/src/compute.geometry/Resolver.cs b/src/compute.geometry/Resolver.cs
@@ -6,6 +6,8 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using compute.geometry;
+using Serilog;
 
 namespace RhinoInside
 {
@@ -20,14 +22,6 @@ public static void Initialize()
             if (System.IntPtr.Size != 8)
                 throw new Exception("Only 64 bit applications can use RhinoInside");
             AppDomain.CurrentDomain.AssemblyResolve += ResolveForRhinoAssemblies;
-
-            // Force load WindowsBase from the WindowsDesktop set of assemblies
-            var path = typeof(int).Assembly.Location;
-            string directory =Path.GetDirectoryName(path);
-            int index = directory.IndexOf("NETCORE", StringComparison.OrdinalIgnoreCase);
-            directory = directory.Substring(0, index) + "WindowsDesktop" + directory.Substring(index + "NETCORE".Length);
-            string windowsBase = Path.Combine(directory, "WindowsBase.dll");
-            Assembly.LoadFrom(windowsBase);
         }
 
         static string _rhinoSystemDirectory;

diff --git a/src/compute.geometry/Startup.cs b/src/compute.geometry/Startup.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Carter;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection.KeyManagement;
@@ -28,7 +29,6 @@ public void Configure(IApplicationBuilder app)
         {
             RhinoCoreStartup();
 
-            app.UseSerilogRequestLogging();
             app.UseRouting();
             app.UseCors();
             //if (!String.IsNullOrEmpty(Config.ApiKey))

diff --git a/src/compute.geometry/compute.geometry.csproj b/src/compute.geometry/compute.geometry.csproj
@@ -1,10 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <AssemblyName>compute.geometry</AssemblyName>
     <OutputType>Exe</OutputType>
-    <Platforms>x64</Platforms>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeFrameworkVersion>7.0.0</RuntimeFrameworkVersion>
+    <RollForward>LatestMinor</RollForward>
+    <UseWpf>True</UseWpf>
+    <UseWindowsForms>True</UseWindowsForms>
+    <SelfContained>False</SelfContained>
+    <PublishSingleFile>False</PublishSingleFile>
+    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>False</AppendRuntimeIdentifierToOutputPath>
+    <EnableWindowsTargeting>True</EnableWindowsTargeting>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <OutputPath>..\bin\Debug\$(AssemblyName)</OutputPath>
@@ -13,18 +21,22 @@
     <OutputPath>..\bin\Release\$(AssemblyName)</OutputPath>
     <PublishDir>..\dist\$(AssemblyName)</PublishDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Optimize>True</Optimize>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Carter" Version="7.0.0" />
-    <PackageReference Include="Grasshopper" Version="8.0.23031.14305-wip" />
+    <PackageReference Include="Grasshopper" Version="8.0.23031.14305-wip" ExcludeAssets="runtime"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="RhinoCommon" Version="8.0.23031.14305-wip" />
-    <PackageReference Include="Serilog" Version="2.12.0" />
+    <PackageReference Include="RhinoCommon" Version="8.0.23031.14305-wip" ExcludeAssets="runtime"/>
+    <PackageReference Include="Serilog" Version="3.0.2-dev-02044" />
     <PackageReference Include="Serilog.AspNetCore" Version="6.1.0" />
     <PackageReference Include="Serilog.Expressions" Version="3.4.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="System.Runtime.Caching" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/hops/RemoteDefinition.cs b/src/hops/RemoteDefinition.cs
@@ -287,7 +287,7 @@ public void GetRemoteDescription()
 
                         if (svg != null)
                         {
-                            var method = typeof(Rhino.UI.DrawingUtilities).GetMethod("BitmapFromSvg");
+                            var method = typeof(Rhino.UI.DrawingUtilities).GetMethod("BitmapFromSvg", new[] {typeof(string), typeof(int), typeof(int)} );
                             if (method != null)
                             {
                                 _customIcon = method.Invoke(null, new object[] { svg, 24, 24 }) as System.Drawing.Bitmap;

diff --git a/src/rhino.compute/rhino.compute.csproj b/src/rhino.compute/rhino.compute.csproj
@@ -3,16 +3,21 @@
     <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>rhino.compute</AssemblyName>
     <OutputType>Exe</OutputType>
-    <Platforms>x64</Platforms>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeFrameworkVersion>7.0.0</RuntimeFrameworkVersion>
+    <RollForward>LatestMinor</RollForward>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
     <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
+    <SelfContained>True</SelfContained>
+    <PublishTrimmed>False</PublishTrimmed>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <OutputPath>..\bin\Debug\$(AssemblyName)</OutputPath>
     <DefineConstants>TRACE;RHINO_COMPUTE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <OutputPath>..\bin\Release\$(AssemblyName)</OutputPath>
     <DefineConstants>TRACE;RHINO_COMPUTE</DefineConstants>
     <PublishDir>..\dist\$(AssemblyName)</PublishDir>