Skip to content

Commit

Permalink
Merge pull request #49 from TeaDrivenDev/restrictlitedbversion
Browse files Browse the repository at this point in the history
Restrict LiteDB dependency version to 4.x
  • Loading branch information
Zaid-Ajaj authored May 2, 2020
2 parents cd541e3 + c5a24c6 commit 83d67fc
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 16 deletions.
13 changes: 4 additions & 9 deletions LiteDB.FSharp/LiteDB.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Advanced F# Support for LiteDB with query construction through quotation expressions</Description>
<PackageProjectUrl>https://github.com/Zaid-Ajaj/LiteDB.FSharp</PackageProjectUrl>
<RepositoryUrl>https://github.com/Zaid-Ajaj/LiteDB.FSharp.git</RepositoryUrl>
<PackageLicenseUrl>https://github.com/Zaid-Ajaj/LiteDB.FSharp/blob/master/LICENSE</PackageLicenseUrl>
<PackageIconUrl></PackageIconUrl>
<PackageTags>fsharp;litedb;embedded;database;document-database</PackageTags>
<Authors>Zaid Ajaj</Authors>
<Version>2.15.0</Version>
<TargetFrameworks>netstandard2.0;net45;net461</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageReleaseNotes>Support deserialization of optional lists and arrays (#44)</PackageReleaseNotes>
<IsPackable>true</IsPackable>
</PropertyGroup>
<PropertyGroup>
<OutputPath>..\bin</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Linq.fs" />
Expand Down
17 changes: 17 additions & 0 deletions LiteDB.FSharp/paket.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
type project
id LiteDB.FSharp
version 2.15.1
authors
Zaid Ajaj
owners
Zaid Ajaj
requirelicenseacceptance false
licenseurl https://github.com/Zaid-Ajaj/LiteDB.FSharp/blob/master/LICENSE
projecturl https://github.com/Zaid-Ajaj/LiteDB.FSharp
description
Advanced F# Support for LiteDB with query construction through quotation expressions
releaseNotes
Restrict LiteDB version to 4.x
include-pdbs false
tags
fsharp litedb embedded database document-database
15 changes: 9 additions & 6 deletions build.fsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#r "paket:
nuget Fake.Core.Target
nuget Fake.DotNet.Cli
nuget Fake.DotNet.Paket
nuget Fake.IO.FileSystem
//"

Expand All @@ -25,6 +26,7 @@ Target.create "RunTests" <| fun _ ->

Target.create "Clean" <| fun _ ->
[
cwd </> "bin"
projectPath </> "bin"
projectPath </> "obj"
testsPath </> "bin"
Expand All @@ -42,20 +44,21 @@ Target.create "Build" <| fun _ ->
DotNet.build setParams (projectPath </> "LiteDB.FSharp.fsproj")

Target.create "PackNuget" <| fun _ ->
let setParams (defaults: DotNet.PackOptions) =
Paket.pack (fun defaults ->
{
defaults with
Configuration = DotNet.BuildConfiguration.Release
}

DotNet.pack setParams projectPath
TemplateFile = projectPath </> "paket.template"
BuildConfig = "Release"
MinimumFromLockFile = true
OutputPath = cwd </> "bin"
})

Target.create "PublishNuget" <| fun _ ->
let nugetKey =
match Environment.environVarOrNone "NUGET_KEY" with
| Some nugetKey -> nugetKey
| None -> failwith "The Nuget API key must be set in a NUGET_KEY environmental variable"
let nupkg = Directory.GetFiles(projectPath </> "bin" </> "Release") |> Seq.head
let nupkg = Directory.GetFiles(cwd </> "bin") |> Seq.head

let setParams (defaults: DotNet.NuGetPushOptions) =
{
Expand Down
7 changes: 7 additions & 0 deletions build.fsx.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ NUGET
Newtonsoft.Json (>= 12.0.3)
NuGet.Protocol (>= 4.9.4)
System.Net.Http (>= 4.3.4)
Fake.DotNet.Paket (5.19.1)
Fake.Core.Process (>= 5.19.1)
Fake.Core.String (>= 5.19.1)
Fake.Core.Trace (>= 5.19.1)
Fake.DotNet.Cli (>= 5.19.1)
Fake.IO.FileSystem (>= 5.19.1)
FSharp.Core (>= 4.7)
Fake.IO.FileSystem (5.19.1)
Fake.Core.String (>= 5.19.1)
FSharp.Core (>= 4.7)
Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ source https://www.nuget.org/api/v2
storage:none
nuget Expecto
nuget FSharp.Core
nuget LiteDB
nuget LiteDB ~> 4.1
nuget Newtonsoft.JSON
nuget TypeShape

0 comments on commit 83d67fc

Please sign in to comment.