Remove dynamic loading of Garnet.resources.dll + Update version to 1.…

…0.33 (#723) * fix * format + update version * small fixes * format
microsoft · Oct 15, 2024 · 80fae44 · 80fae44
1 parent 274d36e
commit 80fae44
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 47 deletions.
diff --git a/.azure/pipelines/azure-pipelines-external-release.yml b/.azure/pipelines/azure-pipelines-external-release.yml
@@ -3,7 +3,7 @@
 #      1) update the name: string below (line 6)     -- this is the version for the nuget package (e.g. 1.0.0)
 #      2) update \libs\host\GarnetServer.cs readonly string version  (~line 32)   -- NOTE - these two values need to be the same 
 ###################################### 
-name: 1.0.32
+name: 1.0.33
 trigger:
   branches:
     include:

diff --git a/libs/host/GarnetServer.cs b/libs/host/GarnetServer.cs
@@ -29,7 +29,7 @@ namespace Garnet
     public class GarnetServer : IDisposable
     {
         // IMPORTANT: Keep the version in sync with .azure\pipelines\azure-pipelines-external-release.yml line ~6.
-        readonly string version = "1.0.32";
+        readonly string version = "1.0.33";
 
         internal GarnetProvider Provider;
 

diff --git a/libs/resources/Garnet.resources.csproj b/libs/resources/Garnet.resources.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>../../Garnet.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="RespCommandsDocs.json" />
-    <None Remove="RespCommandsInfo.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="RespCommandsDocs.json" />
     <EmbeddedResource Include="RespCommandsInfo.json" />

diff --git a/libs/resources/ResourceUtils.cs b/libs/resources/ResourceUtils.cs
@@ -0,0 +1,9 @@
+namespace Garnet.resources
+{
+    /// <summary>
+    /// Dummy class for externally referencing this assembly
+    /// </summary>
+    public class ResourceUtils
+    {
+    }
+}
diff --git a/libs/server/Resp/RespCommandDataCommon.cs b/libs/server/Resp/RespCommandDataCommon.cs
@@ -1,27 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Loader;
+using System.Reflection;
 using Garnet.common;
+using Garnet.resources;
 using Microsoft.Extensions.Logging;
 
 namespace Garnet.server.Resp
 {
     internal class RespCommandDataCommon
     {
-        /// <summary>
-        /// Path to Garnet.resources.dll, where command data is found
-        /// </summary>
-        private static readonly string ResourcesAssemblyPath = Path.Combine(AppContext.BaseDirectory, @"Garnet.resources.dll");
-
-        /// <summary>
-        /// Synchronize loading and unloading of resources assembly
-        /// </summary>
-        private static readonly object ResourcesAssemblyLock = new object();
-
         /// <summary>
         /// Safely imports commands data from embedded resource in dynamically loaded/unloaded assembly
         /// </summary>
@@ -33,32 +22,15 @@ internal class RespCommandDataCommon
         internal static bool TryImportRespCommandsData<TData>(string path,
             out IReadOnlyDictionary<string, TData> commandsData, ILogger logger = null) where TData : class, IRespCommandData<TData>
         {
-            lock (ResourcesAssemblyLock)
-            {
-                // Create a new unloadable assembly load context
-                var assemblyLoadContext = new AssemblyLoadContext(null, true);
-
-                try
-                {
-                    // Load the assembly within the context and import the data
-                    var assembly = assemblyLoadContext.LoadFromAssemblyPath(ResourcesAssemblyPath);
-
-                    var streamProvider = StreamProviderFactory.GetStreamProvider(FileLocationType.EmbeddedResource, null, assembly);
-                    var commandsDocsProvider = RespCommandsDataProviderFactory.GetRespCommandsDataProvider<TData>();
+            // Garnet.resources assembly, where command data is found
+            var resourcesAssembly = Assembly.GetAssembly(typeof(ResourceUtils));
 
-                    return commandsDocsProvider.TryImportRespCommandsData(path,
-                        streamProvider, out commandsData, logger);
-                }
-                finally
-                {
-                    // Unload the context
-                    assemblyLoadContext.Unload();
+            var streamProvider =
+                StreamProviderFactory.GetStreamProvider(FileLocationType.EmbeddedResource, null, resourcesAssembly);
+            var commandsDocsProvider = RespCommandsDataProviderFactory.GetRespCommandsDataProvider<TData>();
 
-                    // Force GC to release the loaded assembly
-                    GC.Collect();
-                    GC.WaitForPendingFinalizers();
-                }
-            }
+            return commandsDocsProvider.TryImportRespCommandsData(path,
+                streamProvider, out commandsData, logger);
         }
     }
 }