From 6d4b2e504a88d3155e21b14b31f9eb3adbe1514e Mon Sep 17 00:00:00 2001 From: Roy Date: Mon, 31 Oct 2022 14:37:05 +0200 Subject: FSE Procedures .net developer pack elimination. --- .../Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs | 4 +++- .../Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/Scripting') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs index 665bd7ab1..13c3ae569 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ReferenceAssembly.cs @@ -12,6 +12,8 @@ namespace Tango.Scripting.Basic { public class ReferenceAssembly { + public static String DotNetFrameworkFolder { get; set; } = AssemblyHelper.GetAssemblyTargetFrameworkFolder(Assembly.GetExecutingAssembly()); + private static Dictionary _assembliesCache; static ReferenceAssembly() @@ -65,7 +67,7 @@ namespace Tango.Scripting.Basic { try { - String dotNetPath = AssemblyHelper.GetAssemblyTargetFrameworkFolder(Assembly.GetExecutingAssembly()); + String dotNetPath = DotNetFrameworkFolder; String dotNetAsm = Path.Combine(dotNetPath, Name + ".dll"); loaded = Assembly.LoadFrom(dotNetAsm); _assembliesCache.Add(Name, loaded); diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs index 2ead15d0d..e324c0edb 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/Utils.cs @@ -11,7 +11,7 @@ namespace Tango.Scripting.Editors.Intellisense { public static class Utils { - private static String dotNetXmlFolder = @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.X"; + public static String DotNetFrameworkDocsFolder = @"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.X"; private static Dictionary _assemblies_docs_cache; static Utils() @@ -39,10 +39,10 @@ namespace Tango.Scripting.Editors.Intellisense xmlDoc = new XmlDocument(); xmlDoc.Load(docuPath); } - else if (File.Exists(System.IO.Path.Combine(dotNetXmlFolder, System.IO.Path.GetFileName(docuPath)))) + else if (File.Exists(System.IO.Path.Combine(DotNetFrameworkDocsFolder, System.IO.Path.GetFileName(docuPath)))) { xmlDoc = new XmlDocument(); - xmlDoc.Load(System.IO.Path.Combine(dotNetXmlFolder, System.IO.Path.GetFileName(docuPath))); + xmlDoc.Load(System.IO.Path.Combine(DotNetFrameworkDocsFolder, System.IO.Path.GetFileName(docuPath))); } if (xmlDoc != null) -- cgit v1.3.1