Skip to content

WIP: Migrate to Paket #2

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

Open
czifro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Migrate to Paket #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
596c839
Migrate to Paket
May 13, 2018
9f6319f
Update dependencies to netstandard
Jun 22, 2018
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
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ packages/*
*.nupkg
FsSql.userprefs
*.exe
!.paket/*.exe
*.sln.ide
.fake/*
.fake/
paket.restore.cached
paket-files/*
paket-files/
packages/
572 changes: 296 additions & 276 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added .paket/paket.exe
View file
Open in desktop
Binary file not shown.
20 changes: 18 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
FROM mono:3.12-onbuild
CMD [ "mono", "FsSql.Tests.exe" ]
FROM czifro/paket-fake-build:5.10.0.160--2.0.5-2.1.4-jessie

WORKDIR /app-build

RUN mkdir .paket && mkdir FsSql && mkdir FsSql.Tests

COPY FsSql.sln paket-install.sh paket.dependencies global.json ./
COPY FsSql/FsSql.fsproj FsSql/paket.references ./FsSql/
COPY FsSql.Tests/FsSql.Tests.fsproj FsSql.Tests/paket.references ./FsSql.Tests/

RUN sh paket-install && dotnet restore

COPY FsSql/*.fs ./FsSql/
COPY FsSql.Tests/*.fs ./FsSql.Test/

COPY RELEASE_NOTES.md build.fsx build.sh ./

RUN sh build.sh
58 changes: 24 additions & 34 deletions FsSql.Tests/FsSql.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="prelude.fs" />
<Compile Include="Tests.fs" />
<Compile Include="NorthwindTests.fs" />
<Compile Include="AdventureWorksTests.fs" />
<Compile Include="main.fs" />
<None Include="Samples.fsx" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Expecto" Version="5.1.2" />
<PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="6.0.1" />
<PackageReference Include="FSharp.Collections.ParallelSeq" Version="1.0.2" />
<PackageReference Include="FSharpx.Collections" Version="1.17.0" />
<PackageReference Include="System.Data.SQLite" Version="1.0.106" Condition="'$(OS)' == 'Windows_NT'" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FsSql\FsSql.fsproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.3.0" />
<PackageReference Update="System.ValueTuple" Version="4.4.0" />
</ItemGroup>

</Project>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>FsSql.Tests</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Compile Include="prelude.fs" />
<Compile Include="Tests.fs" />
<Compile Include="NorthwindTests.fs" />
<Compile Include="AdventureWorksTests.fs" />
<Compile Include="main.fs" />
<None Include="Samples.fsx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FsSql\FsSql.fsproj" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
9 changes: 9 additions & 0 deletions FsSql.Tests/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Microsoft.NETCore.App
Expecto
YoloDev.Expecto.TestSdk
Microsoft.NET.Test.Sdk
FSharp.Core
System.Data.SQLite
System.ValueTuple
FSharp.Collections.ParallelSeq
FSharpx.Collections
59 changes: 27 additions & 32 deletions FsSql/FsSql.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>FsSql</AssemblyName>
<PackageId>FsSql.Core</PackageId>
<Version>3.0.1</Version>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="FSharpTypeExtensions.fs" />
<Compile Include="FSharpValueExtensions.fs" />
<Compile Include="Logging.fs" />
<Compile Include="prelude.fs" />
<Compile Include="AsyncExtensions.fs" />
<Compile Include="OptionExtensions.fs" />
<Compile Include="DbConnectionWrapper.fs" />
<Compile Include="DbCommandWrapper.fs" />
<Compile Include="DictDataRecord.fs" />
<Compile Include="DataReaderWrapper.fs" />
<Compile Include="SeqExtensions.fs" />
<Compile Include="ListExtensions.fs" />
<Compile Include="FsSql.fs" />
<Compile Include="Transactions.fs" />
<Compile Include="FsSqlOperators.fs" />
<Compile Include="SqlWrapper.fs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.3.0" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>FsSql</AssemblyName>
<PackageId>FsSql.Core</PackageId>
<Version>3.0.1</Version>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="FSharpTypeExtensions.fs" />
<Compile Include="FSharpValueExtensions.fs" />
<Compile Include="Logging.fs" />
<Compile Include="prelude.fs" />
<Compile Include="AsyncExtensions.fs" />
<Compile Include="OptionExtensions.fs" />
<Compile Include="DbConnectionWrapper.fs" />
<Compile Include="DbCommandWrapper.fs" />
<Compile Include="DictDataRecord.fs" />
<Compile Include="DataReaderWrapper.fs" />
<Compile Include="SeqExtensions.fs" />
<Compile Include="ListExtensions.fs" />
<Compile Include="FsSql.fs" />
<Compile Include="Transactions.fs" />
<Compile Include="FsSqlOperators.fs" />
<Compile Include="SqlWrapper.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 2 additions & 0 deletions FsSql/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FSharp.Core
System.Data.SqlClient
2 changes: 1 addition & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let configuration = environVarOrDefault "Configuration" "Release"
let release = IO.File.ReadAllLines "RELEASE_NOTES.md" |> ReleaseNotesHelper.parseReleaseNotes
let description = "Functional ADO.NET for F#"
let tags = "F# sql"
let authors = "Mauricio Scheffer & irium"
let authors = "Mauricio Scheffer & irium & czifro"
let owners = "irium (formerly Mauricio Scheffer)"
let projectUrl = "https://github.com/irium/FsSql"
let licenceUrl = "http://www.apache.org/licenses/LICENSE-2.0"
Expand Down
10 changes: 3 additions & 7 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
NUGET=NuGet.exe
if [ ! -f $NUGET ]; then
curl -L -o $NUGET https://www.nuget.org/nuget.exe
chmod a+x $NUGET
fi
mono $NUGET restore
xbuild
sh paket-install.sh

mono packages/build/FAKE/tools/FAKE.exe --fsiargs -d:MONO build.fsx
4 changes: 4 additions & 0 deletions docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
docker --version || wget -qO- https://get.docker.com/ | sh
sleep 1

docker build -t fssql -t .
Binary file removed lib/System.Data.SQLite.DLL
View file
Open in desktop
Binary file not shown.
Loading