?addDefaultProbingLocation

Author: dsyme

examples/BasicProvider.DesignTime/BasicProvider.Provider.fs

@@ -9,7 +9,7 @@ open System.Reflection
 
 [<TypeProvider>]
 type BasicErasingProvider (config : TypeProviderConfig) as this =
-    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("BasicProvider.DesignTime", "BasicProvider")])
+    inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("BasicProvider.DesignTime", "BasicProvider")], addDefaultProbingLocation=true)
 
     let ns = "BasicProvider.Provided"
     let asm = Assembly.GetExecutingAssembly()

examples/ComboProvider/ComboProvider.fs

@@ -17,7 +17,7 @@ type SomeRuntimeHelper2() =
 
 [<TypeProvider>]
 type ComboErasingProvider (config : TypeProviderConfig) as this =
-    inherit TypeProviderForNamespaces (config)
+    inherit TypeProviderForNamespaces (config, addDefaultProbingLocation=true)
 
     let ns = "ComboProvider"
     let asm = Assembly.GetExecutingAssembly()

examples/StressProvider/StressProvider.fs

@@ -21,7 +21,7 @@ type Server (name : string) =
 
 [<TypeProvider>]
 type StressErasingProvider (config : TypeProviderConfig) as this =
-    inherit TypeProviderForNamespaces (config)
+    inherit TypeProviderForNamespaces (config, addDefaultProbingLocation=true)
 
     let ns = "StressProvider"
     let asm = Assembly.GetExecutingAssembly()

src/ProvidedTypes.fs

@@ -14548,7 +14548,7 @@ namespace ProviderImplementation.ProvidedTypes
     open ProviderImplementation.ProvidedTypes.AssemblyReader
     open ProviderImplementation.ProvidedTypes.UncheckedQuotations
 
-    type TypeProviderForNamespaces(config: TypeProviderConfig, namespacesAndTypes: list<(string * list<ProvidedTypeDefinition>)>, assemblyReplacementMap: (string*string) list, sourceAssemblies: Assembly list) as this =
+    type TypeProviderForNamespaces(config: TypeProviderConfig, namespacesAndTypes: list<(string * list<ProvidedTypeDefinition>)>, assemblyReplacementMap: (string*string) list, sourceAssemblies: Assembly list, addDefaultProbingLocation: bool) as this =
 
         let ctxt = ProvidedTypesContext.Create (config, assemblyReplacementMap, sourceAssemblies)
 
@@ -14617,15 +14617,24 @@ namespace ProviderImplementation.ProvidedTypes
         do AppDomain.CurrentDomain.add_AssemblyResolve handler
 #endif
 
-        new (config, namespaceName, types, ?sourceAssemblies, ?assemblyReplacementMap) = 
+        // By default add the location of the TPDTC assembly (which is assumed to contain this file)
+        // as a probing location.
+        do if addDefaultProbingLocation  then
+            let thisAssembly = Assembly.GetExecutingAssembly() 
+            let folder = thisAssembly.Location |> Path.GetDirectoryName
+            probingFolders.Add folder 
+
+        new (config, namespaceName, types, ?sourceAssemblies, ?assemblyReplacementMap, ?addDefaultProbingLocation) = 
             let sourceAssemblies = defaultArg sourceAssemblies [ Assembly.GetCallingAssembly() ]
             let assemblyReplacementMap = defaultArg assemblyReplacementMap []
-            new TypeProviderForNamespaces(config, [(namespaceName,types)], assemblyReplacementMap=assemblyReplacementMap, sourceAssemblies=sourceAssemblies)
+            let addDefaultProbingLocation = defaultArg addDefaultProbingLocation false
+            new TypeProviderForNamespaces(config, [(namespaceName,types)], assemblyReplacementMap=assemblyReplacementMap, sourceAssemblies=sourceAssemblies, addDefaultProbingLocation=addDefaultProbingLocation)
 
-        new (config, ?sourceAssemblies, ?assemblyReplacementMap) = 
+        new (config, ?sourceAssemblies, ?assemblyReplacementMap, ?addDefaultProbingLocation) = 
             let sourceAssemblies = defaultArg sourceAssemblies [ Assembly.GetCallingAssembly() ]
             let assemblyReplacementMap = defaultArg assemblyReplacementMap []
-            new TypeProviderForNamespaces(config, [], assemblyReplacementMap=assemblyReplacementMap, sourceAssemblies=sourceAssemblies)
+            let addDefaultProbingLocation = defaultArg addDefaultProbingLocation false
+            new TypeProviderForNamespaces(config, [], assemblyReplacementMap=assemblyReplacementMap, sourceAssemblies=sourceAssemblies, addDefaultProbingLocation=addDefaultProbingLocation)
 
         member __.TargetContext = ctxt
 

src/ProvidedTypes.fsi

@@ -457,7 +457,12 @@ namespace ProviderImplementation.ProvidedTypes
         /// <param name="assemblyReplacementMap">
         ///    Optionally specify a map of assembly names from source model to referenced assemblies.
         /// </param>
-        new: config: TypeProviderConfig * namespaceName:string * types: ProvidedTypeDefinition list * ?sourceAssemblies: Assembly list * ?assemblyReplacementMap: (string * string) list -> TypeProviderForNamespaces
+        ///               
+        /// <param name="addDefaultProbingLocation">
+        ///    Optionally specify that the location of the type provider design-time component should be used to resolve failing assembly resolutions.
+        ///    This flag or an equivalent call to RegisterProbingFolder is generally needed for any type provider design-time components loaded into .NET Core tooling.
+        /// </param>
+        new: config: TypeProviderConfig * namespaceName:string * types: ProvidedTypeDefinition list * ?sourceAssemblies: Assembly list * ?assemblyReplacementMap: (string * string) list * ?addDefaultProbingLocation: bool -> TypeProviderForNamespaces
 
         /// <summary>Initializes a type provider.</summary>
         /// <param name="sourceAssemblies">
@@ -469,7 +474,12 @@ namespace ProviderImplementation.ProvidedTypes
         /// <param name="assemblyReplacementMap">
         ///    Optionally specify a map of assembly names from source model to referenced assemblies.
         /// </param>
-        new: config: TypeProviderConfig * ?sourceAssemblies: Assembly list * ?assemblyReplacementMap: (string * string) list -> TypeProviderForNamespaces
+        ///               
+        /// <param name="addDefaultProbingLocation">
+        ///    Optionally specify that the location of the type provider design-time component should be used to resolve failing assembly resolutions.
+        ///    This flag or an equivalent call to RegisterProbingFolder is generally needed for any type provider design-time components loaded into .NET Core tooling.
+        /// </param>
+        new: config: TypeProviderConfig * ?sourceAssemblies: Assembly list * ?assemblyReplacementMap: (string * string) list * ?addDefaultProbingLocation: bool -> TypeProviderForNamespaces
 
         /// Invoked by the type provider to add a namespace of provided types in the specification of the type provider.
         member AddNamespace: namespaceName:string * types: ProvidedTypeDefinition list -> unit