chore: Reduce duplicate methods for handling .net framework and .net/…

….net core injection (#2017)
newrelic · Oct 30, 2023 · 59a75c2 · 59a75c2
1 parent 1a1bc28
commit 59a75c2
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 273 deletions.
diff --git a/src/Agent/NewRelic/Profiler/ModuleInjector/IModule.h b/src/Agent/NewRelic/Profiler/ModuleInjector/IModule.h
@@ -23,21 +23,12 @@ namespace NewRelic { namespace Profiler { namespace ModuleInjector
         virtual xstring_t GetModuleName() = 0;
         virtual void InjectPlatformInvoke(const xstring_t& methodName, const xstring_t& className, const xstring_t& moduleName, const ByteVector& signature) = 0;
         virtual void InjectStaticSecuritySafeMethod(const xstring_t& methodName, const xstring_t& className, const ByteVector& signature) = 0;
-        virtual void InjectMscorlibSecuritySafeMethodReference(const xstring_t& methodName, const xstring_t& className, const ByteVector& signature) = 0;
-        virtual void InjectSystemPrivateCoreLibSecuritySafeMethodReference(const xstring_t& methodName, const xstring_t& className, const ByteVector& signature) = 0;
+        virtual void InjectCoreLibSecuritySafeMethodReference(const xstring_t& methodName, const xstring_t& className, const ByteVector& signature) = 0;
         virtual void InjectNRHelperType() = 0;
+        virtual bool InjectReferenceToCoreLib() = 0;
 
-        virtual bool GetHasRefMscorlib() = 0;
-        virtual bool GetHasRefSysRuntime() = 0;
-        virtual bool GetHasRefNetStandard() = 0;
-        virtual bool GetHasRefSystemPrivateCoreLib() = 0;
-
-        virtual void SetMscorlibAssemblyRef(mdAssembly assemblyRefToken) = 0;
-        virtual void SetSystemPrivateCoreLibAssemblyRef(mdAssembly assemblyRefToken) = 0;
-
-        virtual bool GetIsThisTheMscorlibAssembly() = 0;
-        virtual bool GetIsThisTheNetStandardAssembly() = 0;
-        virtual bool GetIsThisTheSystemPrivateCoreLibAssembly() = 0;
+        virtual bool NeedsReferenceToCoreLib() = 0;
+        virtual bool GetIsThisTheCoreLibAssembly() = 0;
 
         virtual CComPtr<IMetaDataAssemblyEmit> GetMetaDataAssemblyEmit() = 0;