Skip to content

Commit bdd7297

Browse files
committed
fixup! Updated FSharp.TypeProviders.SDK to 8.10.0
1 parent e643b8d commit bdd7297

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
it directly as a TfmSpecificPackageFile. -->
3737
<PropertyGroup Condition="'$(IsNuGet)' != ''">
3838
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_IncludeDesignTimeDllInPackage</TargetsForTfmSpecificContentInPackage>
39+
<!-- NU5100: assembly not inside 'lib' — expected for type-provider assemblies in typeproviders/ -->
40+
<NoWarn>$(NoWarn);NU5100</NoWarn>
3941
</PropertyGroup>
4042

4143
<Target Name="_IncludeDesignTimeDllInPackage" Condition="'$(IsNuGet)' != ''">
@@ -46,11 +48,17 @@
4648
<MSBuild Projects="@(_DesignTimeProjectRef)"
4749
Targets="GetTargetPath"
4850
Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)">
49-
<Output TaskParameter="TargetOutputs" ItemName="_DesignTimeDllPath" />
51+
<Output TaskParameter="TargetOutputs" ItemName="_DesignTimeDll" />
5052
</MSBuild>
53+
<!-- Collect all DLLs from the DesignTime output directory using CreateItem
54+
(avoids globs in PackagePath which NuGet Pack does not support). -->
55+
<CreateItem Include="@(_DesignTimeDll -> '%(RootDir)%(Directory)*.dll')">
56+
<Output TaskParameter="Include" ItemName="_DesignTimeDeps" />
57+
</CreateItem>
5158
<ItemGroup>
52-
<TfmSpecificPackageFile Include="@(_DesignTimeDllPath)">
53-
<PackagePath>lib\$(TargetFramework)</PackagePath>
59+
<TfmSpecificPackageFile Include="@(_DesignTimeDeps)"
60+
Condition="'%(Filename)' != 'FSharp.Core'">
61+
<PackagePath>typeproviders\fsharp41\$(TargetFramework)</PackagePath>
5462
</TfmSpecificPackageFile>
5563
</ItemGroup>
5664
</Target>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ namespace FSharp.Data.GraphQL.Client
66

77
open FSharp.Core.CompilerServices
88

9-
[<assembly:TypeProviderAssembly("FSharp.Data.GraphQL.Client.DesignTime.dll")>]
9+
[<assembly:TypeProviderAssembly("FSharp.Data.GraphQL.Client.DesignTime")>]
1010
do ()
1111
#endif

0 commit comments

Comments
 (0)