Skip to content

Commit b4ee827

Browse files
Merge pull request fsprojects#398 from smoothdeveloper/runtime-assembly-remove-tpsdk-files
remove type provider SDK files from SqlClient.fsproj
2 parents a07eb0b + 77ec9b9 commit b4ee827

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<NoWarn>101</NoWarn>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
12+
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY</DefineConstants>
1213
</PropertyGroup>
1314
<ItemGroup>
1415
<PackageReference Include="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net40'" />

src/SqlClient/Shared.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ type [<DataContract;CLIMutable>] Column = {
7878
if this.Nullable
7979
then typedefof<_ option>.MakeGenericType this.TypeInfo.ClrType
8080
else this.TypeInfo.ClrType
81-
81+
#if DESIGNTIME_CODE_ONLY
8282
member this.GetProvidedType(unitsOfMeasurePerSchema: IDictionary<string, ProviderImplementation.ProvidedTypes.ProvidedTypeDefinition list>) =
8383
let typeConsideringUOM: Type =
8484
if this.TypeInfo.IsUnitOfMeasure
@@ -99,7 +99,7 @@ type [<DataContract;CLIMutable>] Column = {
9999
typedefof<_ option>.MakeGenericType typeConsideringUOM
100100
else
101101
typeConsideringUOM
102-
102+
#endif
103103
member this.HasDefaultConstraint = this.DefaultConstraint <> ""
104104
member this.NullableParameter = this.Nullable || this.HasDefaultConstraint
105105
member this.GetTypeInfoConsideringUDDT() =
@@ -175,15 +175,15 @@ type [<DataContract;CLIMutable>] Parameter = {
175175
match this.TypeInfo.SqlDbType with
176176
| SqlDbType.NChar | SqlDbType.NText | SqlDbType.NVarChar -> this.MaxLength / 2
177177
| _ -> this.MaxLength
178-
178+
#if DESIGNTIME_CODE_ONLY
179179
member this.GetProvidedType(unitsOfMeasurePerSchema: IDictionary<string, ProviderImplementation.ProvidedTypes.ProvidedTypeDefinition list>) =
180180
if this.TypeInfo.IsUnitOfMeasure
181181
then
182182
let uomType = unitsOfMeasurePerSchema.[this.TypeInfo.Schema] |> List.find (fun x -> x.Name = this.TypeInfo.UnitOfMeasureName)
183183
ProviderImplementation.ProvidedTypes.ProvidedMeasureBuilder.AnnotateType(this.TypeInfo.ClrType, [ uomType ])
184184
else
185185
this.TypeInfo.ClrType
186-
186+
#endif
187187
type TempTableLoader(fieldCount, items: obj seq) =
188188
let enumerator = items.GetEnumerator()
189189

src/SqlClient/SqlClient.fsproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
</ItemGroup>
2929
<ItemGroup>
3030
<Compile Include="AssemblyInfo.fs" />
31-
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">
32-
<Link>paket-files/ProvidedTypes.fsi</Link>
33-
</Compile>
34-
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fs">
35-
<Link>paket-files/ProvidedTypes.fs</Link>
36-
</Compile>
3731
<Compile Include="Extensions.fs" />
3832
<Compile Include="Shared.fs" />
3933
<Compile Include="Configuration.fs" />

0 commit comments

Comments
 (0)