VisualBasic Compiler updated and registered dynamically

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Providers/DomainHandler.cs

@@ -138,26 +138,30 @@ protected virtual IEnumerable<Type> GetProviderCompilerContainers()
         typeof (DecimalCompilers),
         typeof (GuidCompilers),
         typeof (EnumCompilers),
-        //typeof (VbStringsCompilers),
-        //typeof (VbDateAndTimeCompilers),
+        
       };
       var result = basicCompilerContainers;
-      var loadedAssemblies = AssemblyLoadContext.Default.Assemblies;
+      var defaultLoadedAssemblies = AssemblyLoadContext.Default.Assemblies;
+      var currentLoadedAssemblies = AssemblyLoadContext.CurrentContextualReflectionContext.Assemblies;
       // dynamic registration to not cause assembly loading
-      if (loadedAssemblies.Any(a => a.GetName().Name.Equals("FSharp.Core", StringComparison.OrdinalIgnoreCase))) {
+      if (defaultLoadedAssemblies.Any(static a => a.GetName().Name.Equals("FSharp.Core", StringComparison.OrdinalIgnoreCase))
+        || defaultLoadedAssemblies.Any(static a => a.GetName().Name.Equals("FSharp.Core", StringComparison.OrdinalIgnoreCase))) {
         result = result.Concat(new[] {
           typeof (FSharpMathOperationsCompilers),
           typeof (FSharpOperatorsCompilers),
           typeof (FSharpStringCompilers),
           typeof (FSharpConversionsCompilers),
         });
       }
-      //if (loadedAssemblies.Any(a => a.GetName().Name.Equals("Microsoft.VisualBasic", StringComparison.OrdinalIgnoreCase)){
-      //  result = result.Concat(new[] {
-      //    typeof (VbStringsCompilers),
-      //    typeof (VbDateAndTimeCompilers),
-      //  });
-      //}
+
+      if (defaultLoadedAssemblies.Any(static a => a.GetName().Name.Equals("Microsoft.VisualBasic", StringComparison.OrdinalIgnoreCase))
+        || defaultLoadedAssemblies.Any(static a => a.GetName().Name.Equals("Microsoft.VisualBasic", StringComparison.OrdinalIgnoreCase))) {
+        result = result.Concat(new[] {
+          typeof (VbConversionsCompilers),
+          typeof (VbStringsCompilers),
+          typeof (VbDateAndTimeCompilers),
+        });
+      }
 
       return result;
     }

Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/VBStringsCompilers.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
+// Copyright (C) 2003-2010 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Aleksey Gamzov
@@ -13,7 +13,11 @@ namespace Xtensive.Orm.Providers
   [CompilerContainer(typeof(SqlExpression))]
   internal static class VbStringsCompilers
   {
-    private const string VbStrings = "Microsoft.VisualBasic.Strings, Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#if NET10_0_OR_GREATER
+    private const string VbStrings = "Microsoft.VisualBasic.Strings, Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#else
+    private const string VbStrings = "Microsoft.VisualBasic.Strings, Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#endif
 
     [Compiler(VbStrings, "Trim", TargetKind.Static)]
     public static SqlExpression Trim(SqlExpression stringExpression)

Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/VbConversionsCompilers.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
+// Copyright (C) 2003-2010 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Aleksey Gamzov
@@ -17,7 +17,11 @@ namespace Xtensive.Orm.Providers
   [CompilerContainer(typeof(SqlExpression))]
   internal static class VbConversionsCompilers
   {
-    private const string VbConversions = "Microsoft.VisualBasic.CompilerServices.Conversions, Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#if NET10_0_OR_GREATER
+    private const string VbConversions = "Microsoft.VisualBasic.CompilerServices.Conversions, Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#else
+    private const string VbConversions = "Microsoft.VisualBasic.CompilerServices.Conversions, Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#endif
 
     [Compiler(VbConversions, "ToBoolean", TargetKind.Static)]
     public static SqlExpression ToBoolean([Type(typeof(string))]SqlExpression stringExpression)

Orm/Xtensive.Orm/Orm/Providers/Expressions/MemberCompilers/VbDateAndTimeCompilers.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2003-2010 Xtensive LLC.
+// Copyright (C) 2003-2010 Xtensive LLC.
 // All rights reserved.
 // For conditions of distribution and use, see license.
 // Created by: Aleksey Gamzov
@@ -17,7 +17,11 @@ namespace Xtensive.Orm.Providers
   [CompilerContainer(typeof(SqlExpression))]
   internal static class VbDateAndTimeCompilers
   {
-    private const string VbDateAndTime = "Microsoft.VisualBasic.DateAndTime, Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#if NET10_0_OR_GREATER
+    private const string VbDateAndTime = "Microsoft.VisualBasic.DateAndTime, Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#else
+    private const string VbDateAndTime = "Microsoft.VisualBasic.DateAndTime, Microsoft.VisualBasic.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+#endif
 
     [Compiler(VbDateAndTime, "Year", TargetKind.Static)]
     public static SqlExpression Year(SqlExpression dateExpression)