Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust build process #26

Merged
merged 1 commit into from
Sep 11, 2018
Merged

adjust build process #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/DesignTime/DesignTime.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(Configuration)'=='Debug'">net461</TargetFramework>
<TargetFrameworks Condition="'$(Configuration)'=='Release'">netstandard2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<AssemblyName>FSharp.Data.Npgsql.DesignTime</AssemblyName>
<DefineConstants>NO_GENERATIVE</DefineConstants>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
4 changes: 4 additions & 0 deletions src/Runtime/FSharp.Data.Npgsql.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<files>
<file src="bin\Release\net461\*.dll" target="lib\net461" />
<file src="bin\Release\netstandard2.0\*.dll" target="lib\netstandard2.0" />

<!-- we could omit FSharp.Core.dll here -->
<file src="bin\Release\typeproviders\fsharp41\netcoreapp2.0\*.dll" target="typeproviders\fsharp41\netcoreapp2.0" />
<file src="bin\Release\typeproviders\fsharp41\net461\*.dll" target="typeproviders\fsharp41\net461" />
</files>
</package>

13 changes: 9 additions & 4 deletions src/Runtime/Runtime.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,19 @@
</ItemGroup>

<Target Name="BeforeBuild">
<MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=$(TargetFramework)" />
<MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netcoreapp2.0" />
<MSBuild Projects="..\DesignTime\DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net461" />
</Target>

<Target Name="AfterBuild">
<CreateItem Include="..\DesignTime\bin\$(Configuration)\$(TargetFramework)\*.dll;..\DesignTime\bin\$(Configuration)\$(TargetFramework)\*.pdb">
<Output TaskParameter="Include" ItemName="DesignTimeBinaries" />
<CreateItem Include="..\DesignTime\bin\$(Configuration)\netcoreapp2.0\*.dll;..\DesignTime\bin\$(Configuration)\netcoreapp2.0\*.pdb">
<Output TaskParameter="Include" ItemName="DesignTimeBinaries1" />
</CreateItem>
<Copy SourceFiles="@(DesignTimeBinaries)" DestinationFolder="$(OutputPath)" />
<CreateItem Include="..\DesignTime\bin\$(Configuration)\net461\*.dll;..\DesignTime\bin\$(Configuration)\net461\*.pdb">
<Output TaskParameter="Include" ItemName="DesignTimeBinaries2" />
</CreateItem>
<Copy SourceFiles="@(DesignTimeBinaries1)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/netcoreapp2.0" />
<Copy SourceFiles="@(DesignTimeBinaries2)" DestinationFolder="$(OutputPath)/../typeproviders/fsharp41/net461" />
</Target>

<Target Name="IncludeAllDlls">
Expand Down