Include reference to Microsoft.SqlServer.Types in TP assembly

Author: Sam Hanes

paket.dependencies

@@ -5,6 +5,7 @@ generate_load_scripts: on
 
 nuget FSharp.Core = 4.1.2
 nuget Microsoft.SqlServer.TransactSql.ScriptDom
+nuget Microsoft.SqlServer.Types ~> 12
 
 github fsprojects/FSharp.TypeProviders.SDK:7d57cd409d7299592822713195924e42b2b7acde src/ProvidedTypes.fs
 github fsprojects/FSharp.TypeProviders.SDK:7d57cd409d7299592822713195924e42b2b7acde src/ProvidedTypes.fsi

paket.lock

@@ -30,6 +30,7 @@ NUGET
       System.ValueTuple (>= 4.3) - restriction: && (>= net40) (< netstandard1.6)
     Microsoft.NETCore.Platforms (2.0.2) - restriction: || (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard1.2)) (&& (>= net40) (< net45) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net45) (>= netstandard1.3) (< netstandard1.4)) (&& (>= net40) (< net45) (>= netstandard1.4) (< netstandard1.5)) (&& (>= net40) (< net45) (>= netstandard1.5) (< netstandard1.6)) (&& (>= net40) (< net45) (< netstandard1.6) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0) (< netstandard1.6)) (&& (>= net40) (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard1.5) (>= uap10.0)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= wp8)) (&& (>= net45) (< netstandard1.3)) (&& (>= net46) (< netstandard1.4))
     Microsoft.SqlServer.TransactSql.ScriptDom (14.0.3811.1)
+    Microsoft.SqlServer.Types (12.0.5000)
     Microsoft.Win32.Primitives (4.3) - restriction: || (&& (>= net40) (< net45) (>= netstandard1.3) (< netstandard1.4)) (&& (>= net40) (< net45) (>= netstandard1.4) (< netstandard1.5)) (&& (>= net40) (< net45) (>= netstandard1.5) (< netstandard1.6)) (&& (>= net40) (< netstandard1.5) (>= uap10.0)) (&& (>= net46) (< netstandard1.4))
     NETStandard.Library (2.0.3) - restriction: && (>= net40) (< net461) (>= netstandard1.0) (< netstandard1.6)
       Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard1.2)) (&& (>= net40) (< net45) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net45) (>= netstandard1.3) (< netstandard1.4)) (&& (>= net40) (< net45) (>= netstandard1.4) (< netstandard1.5)) (&& (>= net40) (< net45) (>= netstandard1.5) (< netstandard1.6)) (&& (>= net40) (< net45) (>= netstandard1.6) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.0) (>= portable-net45+win8)) (&& (>= net40) (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.0) (>= win8)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard1.5) (>= uap10.0)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= wp8)) (&& (>= net45) (< netstandard1.3)) (&& (>= net46) (< netstandard1.4)) (>= net461)

src/SqlClient/SqlClient.fsproj

@@ -149,6 +149,17 @@
       </ItemGroup>
     </When>
   </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
+      <ItemGroup>
+        <Reference Include="Microsoft.SqlServer.Types">
+          <HintPath>..\..\packages\Microsoft.SqlServer.Types\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
       <ItemGroup>

src/SqlClient/SqlCommandProvider.fs

@@ -29,7 +29,10 @@ do()
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.", 101, IsHidden = true)>]
 type SqlCommandProvider(config : TypeProviderConfig) as this = 
     inherit TypeProviderForNamespaces(config, addDefaultProbingLocation = true)
-
+    
+    // need to make sure microsoft.sqlserver.types is included as a referenced assembly
+    let _ = Microsoft.SqlServer.Types.SqlGeography.Null
+    
     let nameSpace = this.GetType().Namespace
     let assembly = Assembly.LoadFrom( config.RuntimeAssembly)
     let providerType = ProvidedTypeDefinition(assembly, nameSpace, "SqlCommandProvider", Some typeof<obj>, hideObjectMethods = true)

src/SqlClient/paket.references

@@ -1,5 +1,6 @@
 FSharp.Core
 Microsoft.SqlServer.TransactSql.ScriptDom
+Microsoft.SqlServer.Types
 
 File: ProvidedTypes.fsi .
 File: ProvidedTypes.fs .