Skip to content

Commit d4ab516

Browse files
iveltenivelten
committed
Removing DesignTime project to make Provider in the "ComboProvider" standard
1 parent ed00864 commit d4ab516

8 files changed

Lines changed: 19 additions & 110 deletions

File tree

‎FSharp.Data.GraphQL.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Server.
106106
EndProject
107107
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Benchmarks", "tests\FSharp.Data.GraphQL.Benchmarks\FSharp.Data.GraphQL.Benchmarks.fsproj", "{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B}"
108108
EndProject
109-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.GraphQL.Client.DesignTime", "src\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj", "{20405832-4592-4729-BDFE-C8803E6D78EB}"
110-
EndProject
111109
Global
112110
GlobalSection(SolutionConfigurationPlatforms) = preSolution
113111
Debug|Any CPU = Debug|Any CPU
@@ -235,7 +233,6 @@ Global
235233
{C7DA852B-D30A-4209-B767-640224C7C31E} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
236234
{8FB23F61-77CB-42C7-8EEC-B22D7C4E4067} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
237235
{A6A162DF-9FBB-4C2A-913F-FD5FED35A09B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
238-
{20405832-4592-4729-BDFE-C8803E6D78EB} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
239236
EndGlobalSection
240237
GlobalSection(ExtensibilityGlobals) = postSolution
241238
SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}

‎src/FSharp.Data.GraphQL.Client.DesignTime/AssemblyInfo.fs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/FSharp.Data.GraphQL.Client.DesignTime/FSharp.Data.GraphQL.Client.DesignTime.fsproj‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/FSharp.Data.GraphQL.Client.DesignTime/paket.references‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<Import Project="..\..\netfx.props" />
55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFrameworks>netstandard2.0;net47</TargetFrameworks>
7+
<TargetFramework>netstandard2.0</TargetFramework>
8+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
89
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
</PropertyGroup>
1011
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
@@ -38,31 +39,23 @@
3839
<Compile Include="QuotationHelpers.fs" />
3940
<Compile Include="IntrospectionParser.fs" />
4041
<Compile Include="Serialization.fs" />
41-
<Compile Include="Runtime.fs" />
42+
<Compile Include="GraphQLProvider.fs" />
4243
<None Include="paket.references" />
44+
<!-- These files are the facades necessary to run .NET Standard 2.0 components on .NET Framework 4.6.1 (.NET Framework 4.7 will -->
45+
<!-- come with these facades included). Because the type provider is a .NET Standard 2.0 component, the deployment of the type -->
46+
<!-- provider must include these facade DLLs if it is to run hosted inside an F# compiler executing using .NET Framework 4.6.1 or Mono 5.0. -->
47+
<None Include="..\..\packages\shared\NETStandard.Library.NETFramework\build\net461\lib\netstandard.dll">
48+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49+
</None>
50+
<None Include="..\..\packages\shared\NETStandard.Library.NETFramework\build\net461\lib\System.Reflection.dll">
51+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
52+
</None>
53+
<None Include="..\..\packages\shared\NETStandard.Library.NETFramework\build\net461\lib\System.Runtime.dll">
54+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
55+
</None>
4356
</ItemGroup>
4457
<ItemGroup>
4558
<ProjectReference Include="..\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj" />
4659
</ItemGroup>
47-
<Target Name="BeforeBuild">
48-
<MSBuild Projects="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj" Targets="Restore" />
49-
<MSBuild Projects="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netcoreapp2.1" />
50-
<MSBuild Projects="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
51-
<MSBuild Projects="..\FSharp.Data.GraphQL.Client.DesignTime\FSharp.Data.GraphQL.Client.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net47" />
52-
</Target>
53-
<Target Name="AfterBuild">
54-
<CreateItem Include="..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\netcoreapp2.1\*.dll;..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\netcoreapp2.1\*.pdb">
55-
<Output TaskParameter="Include" ItemName="DesignTimeBinaries1" />
56-
</CreateItem>
57-
<Copy SourceFiles="@(DesignTimeBinaries1)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/netcoreapp2.1" />
58-
<CreateItem Include="..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\net47\*.dll;..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\net47\*.pdb">
59-
<Output TaskParameter="Include" ItemName="DesignTimeBinaries2" />
60-
</CreateItem>
61-
<Copy SourceFiles="@(DesignTimeBinaries2)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/net47" />
62-
<CreateItem Include="..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\netstandard2.0\*.dll;..\FSharp.Data.GraphQL.Client.DesignTime\bin\$(Configuration)\netstandard2.0\*.pdb">
63-
<Output TaskParameter="Include" ItemName="DesignTimeBinaries3" />
64-
</CreateItem>
65-
<Copy SourceFiles="@(DesignTimeBinaries3)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/netstandard2.0" />
66-
</Target>
6760
<Import Project="..\..\.paket\Paket.Restore.targets" />
6861
</Project>

src/FSharp.Data.GraphQL.Client.DesignTime/DesignTime.fs renamed to src/FSharp.Data.GraphQL.Client/GraphQLProvider.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ type internal ProviderSchemaConfig =
169169

170170
[<TypeProvider>]
171171
type GraphQLTypeProvider (config : TypeProviderConfig) as this =
172-
inherit TypeProviderForNamespaces (config, assemblyReplacementMap=[("FSharp.Data.GraphQL.Client.DesignTime", "FSharp.Data.GraphQL.Client")], addDefaultProbingLocation=true)
172+
inherit TypeProviderForNamespaces (config, addDefaultProbingLocation=true)
173173

174174
let ns = "FSharp.Data.GraphQL"
175175
let asm = Assembly.GetExecutingAssembly()

‎src/FSharp.Data.GraphQL.Client/Runtime.fs‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/FSharp.Data.GraphQL.Client/paket.references‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FSharp.Core
33
Newtonsoft.Json
44
File:ProvidedTypes.fsi
55
File:ProvidedTypes.fs
6-
File:JsonValue.fs
7-
File:TextConversions.fs
6+
File:Http.fs
87
File:IO.fs
9-
File:Http.fs
8+
File:TextConversions.fs
9+
File:JsonValue.fs

0 commit comments

Comments
 (0)