diff --git a/.gitignore b/.gitignore
index 563bd67..4c5a001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,16 @@
 ## Custom
-.paket/paket.exe
-/paket-files
+
+/bldtmp
+*.orig
+*.ncrunchsolution
 /Output
-.fake
 
+## End Custom
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -24,13 +28,18 @@
 [Rr]eleases/
 x64/
 x86/
-build/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
 
-# Visual Studo 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -45,14 +54,29 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
 *_i.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -77,14 +101,21 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
 
 # TFS 2012 Local Workspace
 $tf/
@@ -97,7 +128,7 @@ _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 
-# JustCode is a .NET coding addin-in
+# JustCode is a .NET coding add-in
 .JustCode
 
 # TeamCity is a build add-in
@@ -106,9 +137,18 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -136,39 +176,67 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
 
-# Windows Azure Build Output
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
 
-# Others
+# Visual Studio cache files
+# files ending in .cache can be ignored
 *.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
-bower_components/
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
 
 # RIA/Silverlight projects
 Generated_Code/
@@ -180,25 +248,91 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
 
 # Microsoft Fakes
 FakesAssemblies/
 
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
 
 # Visual Studio 6 build log
 *.plg
 
 # Visual Studio 6 workspace options file
 *.opt
-*.DotSettings
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
\ No newline at end of file
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
index 98c71f9..55292f3 100644
--- a/.paket/Paket.Restore.targets
+++ b/.paket/Paket.Restore.targets
@@ -18,6 +18,14 @@
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+
+    <!-- .net core fdd -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+
+    <!-- no extension is a shell script -->
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -35,23 +43,26 @@
     <!-- Step 1 Check if lockfile is properly restored -->
     <PropertyGroup>
       <PaketRestoreRequired>true</PaketRestoreRequired>
-      <NoWarn>$(NoWarn);NU1603</NoWarn>
+      <NoWarn>$(NoWarn);NU1603;NU1604;NU1605;NU1608</NoWarn>
     </PropertyGroup>
 
     <!-- Because ReadAllText is slow on osx/linux, try to find shasum and awk -->
     <PropertyGroup>
-        <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
-        <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
+      <PaketRestoreCachedHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreCachedHasher)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'</PaketRestoreCachedHasher>
+      <PaketRestoreLockFileHasher Condition="'$(OS)' != 'Windows_NT' And '$(PaketRestoreLockFileHash)' == '' And Exists('/usr/bin/shasum') And Exists('/usr/bin/awk')">/usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'</PaketRestoreLockFileHasher>
     </PropertyGroup>
 
     <!-- If shasum and awk exist get the hashes -->
-    <Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
-        <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
+      <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
     </Exec>
-    <Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
-        <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
+    <Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
+      <Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
     </Exec>
 
+    <!-- Debug whats going on -->
+    <Message Importance="low" Text="calling paket restore with targetframework=$(TargetFramework) targetframeworks=$(TargetFrameworks)" />
+
     <PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
       <!-- if no hash has been done yet fall back to just reading in the files and comparing them -->
       <PaketRestoreCachedHash Condition=" '$(PaketRestoreCachedHash)' == '' ">$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
@@ -61,11 +72,19 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
 
+
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
     <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->
+    <ItemGroup>
+      <MyTargetFrameworks Condition="'$(TargetFramework)' != '' " Include="$(TargetFramework)"></MyTargetFrameworks>
+      <!-- Don't include all frameworks when msbuild explicitly asks for a single one -->
+      <MyTargetFrameworks Condition="'$(TargetFrameworks)' != '' AND '$(TargetFramework)' == '' " Include="$(TargetFrameworks)"></MyTargetFrameworks>
+      <PaketResolvedFilePaths Include="@(MyTargetFrameworks -> '$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).%(Identity).paket.resolved')"></PaketResolvedFilePaths>
+    </ItemGroup>
+    <Message Importance="low" Text="MyTargetFrameworks=@(MyTargetFrameworks) PaketResolvedFilePaths=@(PaketResolvedFilePaths)" />
     <PropertyGroup>
       <PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
       <!-- MyProject.fsproj.paket.references has the highest precedence -->
@@ -74,7 +93,9 @@
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
       <!-- paket.references -->
       <PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
-      <PaketResolvedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved</PaketResolvedFilePath>
+      
+      <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
+      <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
       <PaketRestoreRequired>true</PaketRestoreRequired>
       <PaketRestoreRequiredReason>references-file-or-cache-not-found</PaketRestoreRequiredReason>
     </PropertyGroup>
@@ -93,30 +114,39 @@
     </PropertyGroup>
 
     <!-- Step 2 b detect relevant changes in project file (new targetframework) -->
-    <PropertyGroup Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' ">
+    <PropertyGroup Condition=" '$(DoAllResolvedFilesExist)' != 'true' ">
       <PaketRestoreRequired>true</PaketRestoreRequired>
-      <PaketRestoreRequiredReason>target-framework '$(TargetFramework)'</PaketRestoreRequiredReason>
+      <PaketRestoreRequiredReason>target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths)</PaketRestoreRequiredReason>
     </PropertyGroup>
 
     <!-- Step 3 Restore project specific stuff if required -->
     <Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
-    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)" --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
 
     <!-- This shouldn't actually happen, but just to be sure. -->
-    <Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' AND '$(ResolveNuGetPackages)' != 'False' " Text="Paket file '$(PaketResolvedFilePath)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
+    <PropertyGroup>
+      <DoAllResolvedFilesExist>false</DoAllResolvedFilesExist>
+      <DoAllResolvedFilesExist Condition="Exists(%(PaketResolvedFilePaths.Identity))">true</DoAllResolvedFilesExist>
+    </PropertyGroup>
+    <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
-    <ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >
+    <ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
       <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
     </ReadLinesFromFile>
 
-    <ItemGroup Condition=" Exists('$(PaketResolvedFilePath)') AND '@(PaketReferencesFileLines)' != '' " >
+    <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+        <PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
+        <ExcludeAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
+        <Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
       </PackageReference>
     </ItemGroup>
 
@@ -138,9 +168,10 @@
       </DotNetCliToolReference>
     </ItemGroup>
 
+    <!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
     <PropertyGroup>
       <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
-    </PropertyGroup>
+    </PropertyGroup> -->
 
   </Target>
 
@@ -172,8 +203,8 @@
 
     <ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
       <Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
-    </ConvertToAbsolutePath>      
-        
+    </ConvertToAbsolutePath>
+
 
     <!-- Call Pack -->
     <PackTask Condition="$(UseNewPack)"
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
deleted file mode 100644
index 2b16684..0000000
Binary files a/.paket/paket.bootstrapper.exe and /dev/null differ
diff --git a/.paket/paket.exe b/.paket/paket.exe
new file mode 100644
index 0000000..e3da4d0
Binary files /dev/null and b/.paket/paket.exe differ
diff --git a/build.cmd b/build.cmd
index 91e2938..0eef9ff 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,4 +1,19 @@
-ECHO OFF
+echo off
 cls
-.paket\paket.bootstrapper.exe --run restore
-packages\FAKE\tools\FAKE.exe build.fsx
\ No newline at end of file
+
+ECHO ----------------------------
+ECHO Get Build Tools
+ECHO ----------------------------
+.paket\paket.exe restore -g BuildTools
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+ECHO ----------------------------
+ECHO Restore
+ECHO ----------------------------
+dotnet restore
+@if %errorlevel% neq 0 exit /b %errorlevel%
+
+ECHO ----------------------------
+ECHO Build
+ECHO ----------------------------
+dotnet fake run build.fsx
\ No newline at end of file
diff --git a/build.fsx b/build.fsx
index bc45a73..ac73187 100644
--- a/build.fsx
+++ b/build.fsx
@@ -1,49 +1,54 @@
-#r @"packages/FAKE/tools/FakeLib.dll"
+#r "paket: groupref BuildTools //"
+#load "./.fake/build.fsx/intellisense.fsx"
 
-open Fake
-open System
 open System.IO
-
-let outputDir = currentDirectory @@ "Output"
-let srcDir = currentDirectory @@ "src"
-
-Target "Clean" (fun _ -> 
+open Fake.Core
+open Fake.Core.TargetOperators
+open Fake.IO
+open Fake.IO.FileSystemOperators
+open Fake.DotNet
+
+let currentDirectory = new DirectoryInfo(System.Environment.CurrentDirectory)
+let outputDir = new DirectoryInfo(currentDirectory.FullName @@ "Output")
+let srcDir = new DirectoryInfo(currentDirectory.FullName @@ "src")
+let buildOutput =  new DirectoryInfo(srcDir.FullName @@ "ServiceBouncer" @@ "bin" @@ "Release")
+
+Target.create "Clean" (fun _ ->
     printfn "Clean & Ensure Output Directory"
-    CleanDir outputDir
+    DirectoryInfo.ensure outputDir
 )
 
-Target "Build" (fun _ ->
-    let setParams framework defaults = { defaults with Verbosity = Some(Quiet)
-                                                       Targets = ["Clean,Rebuild"]
-                                                       Properties = [
-                                                                        "Optimize", "True"
-                                                                        "DebugSymbols", "True"
-                                                                        "Configuration", (sprintf "Release%s" framework)
-                                                                    ]
-                             }
-
-    build (setParams "NET45") (srcDir @@ "ServiceBouncer.sln")
-    build (setParams "NET461") (srcDir @@ "ServiceBouncer.sln")
+Target.create "Build" (fun _ ->
+    let setParams framework (defaults:MSBuildParams) = { defaults with Verbosity = Some(Quiet)
+                                                                       Targets = ["Clean,Rebuild"]
+                                                                       Properties = [
+                                                                                        "Optimize", "True"
+                                                                                        "DebugSymbols", "True"
+                                                                                        "Configuration", (sprintf "Release%s" framework)
+                                                                                    ]
+                                                       }
+
+    MSBuild.build (setParams "NET45") (srcDir.FullName @@ "ServiceBouncer.sln")
+    MSBuild.build (setParams "NET461") (srcDir.FullName @@ "ServiceBouncer.sln")
 )
 
-Target "Package" (fun _ ->
-    let buildOutput = srcDir @@ "ServiceBouncer" @@ "bin" @@ "Release"
-    CreateZip buildOutput (outputDir @@ "ServiceBouncer.zip") "" DefaultZipLevel false (Directory.GetFiles(buildOutput, "*.exe", SearchOption.AllDirectories))
-    
-    let nuspec = (srcDir @@ "Deploy" @@ "ServiceBouncer.nuspec")
-    let nugetExePath = findNuget (currentDirectory @@ "packages" @@ "NuGet.CommandLine")
-    let args = sprintf @"pack ""%s"" -OutputDirectory ""%s"" -Properties Configuration=%s -NoPackageAnalysis -BasePath %s" nuspec outputDir "Release" srcDir
-    let result = ExecProcessWithLambdas (fun info -> info.FileName <- nugetExePath; info.Arguments <- args) (TimeSpan.FromMinutes 5.) true (fun err -> traceError err) (fun _ -> ())
-
-    if not(result = 0) then 
-        failwith "Packaging Failed"
+Target.create "Package" (fun _ ->
+    Zip.createZip buildOutput.FullName (outputDir.FullName @@ "ServiceBouncer.zip") "" Zip.DefaultZipLevel false ((DirectoryInfo.getMatchingFilesRecursive "*.exe" buildOutput) |> Array.map(fun x -> x.FullName))
+
+    let nuspec = (srcDir.FullName @@ "Deploy" @@ "ServiceBouncer.nuspec")
+    let nugetExePath = currentDirectory.FullName @@ "packages" @@ "buildtools" @@ "NuGet.CommandLine" @@ "tools" @@ "NuGet.exe"
+    let args = sprintf @"pack ""%s"" -OutputDirectory ""%s"" -Properties Configuration=%s -NoPackageAnalysis -BasePath %s" nuspec outputDir.FullName "Release" srcDir.FullName
+
+    let result = Process.execWithResult ((fun info -> { info with FileName = nugetExePath
+                                                                  WorkingDirectory = srcDir.FullName
+                                                                  Arguments = args }) >> Process.withFramework) (System.TimeSpan.FromMinutes 5.)
+
+    if result.ExitCode <> 0 || result.Errors.Length > 0 then
+        failwithf "Error during NuGet package creation. %s %s\r\n%s" nugetExePath args (String.toLines result.Errors)
 )
 
-Target "Default" DoNothing
+Target.create "Default" ignore
 
-"Clean"
-    ==> "Build"
-    ==> "Package"
-    ==> "Default"
+"Clean" ==> "Build" ==> "Package" ==> "Default" |> ignore
 
-RunParameterTargetOrDefault "target" "Default"
+Target.runOrDefault "Default"
diff --git a/build.proj b/build.proj
new file mode 100644
index 0000000..ee9fc3b
--- /dev/null
+++ b/build.proj
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <RepoRootDir>$([System.IO.Path]::GetFullPath("$(MSBuildThisFileDirectory)"))</RepoRootDir>
+    <BuildDependsOn>
+    </BuildDependsOn>
+    <CoreBuildDependsOn>
+    </CoreBuildDependsOn>
+  </PropertyGroup>
+  <Target Name="Build">
+    <Exec IgnoreStandardErrorWarningFormat="true" Command="dotnet fake build" WorkingDirectory="$(RepoRootDir)" />
+  </Target>
+  <Import Project=".paket\Paket.Restore.targets" />
+</Project>
\ No newline at end of file
diff --git a/paket.dependencies b/paket.dependencies
index 653a024..c65ebdd 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,5 +1,14 @@
 framework: auto-detect
 source https://www.nuget.org/api/v2
 
-nuget FAKE
-nuget NuGet.CommandLine
\ No newline at end of file
+group BuildTools
+    framework: netstandard2.0
+    source https://www.nuget.org/api/v2    
+    
+    clitool dotnet-fake
+    nuget FAKE.Core.Target
+    nuget FAKE.Core.Process
+    nuget FAKE.IO.FileSystem
+    nuget Fake.IO.Zip 
+    nuget Fake.DotNet.MSBuild
+    nuget Nuget.CommandLine
\ No newline at end of file
diff --git a/paket.lock b/paket.lock
index e89f60c..25f0c20 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,5 +1,288 @@
-RESTRICTION: == net461
+RESTRICTION: || (== net45) (== netstandard2.0)
+
+GROUP BuildTools
+RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    FAKE (4.63.2)
-    NuGet.CommandLine (4.4.1)
+    dotnet-fake (5.0) - clitool: true
+    Fake.Core.CommandLineParsing (5.0)
+      FParsec (>= 1.0.3)
+      FSharp.Core (>= 4.3.4)
+    Fake.Core.Context (5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.Core.Environment (5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.Core.FakeVar (5.0)
+      Fake.Core.Context (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.Core.Process (5.0)
+      Fake.Core.Context (>= 5.0)
+      Fake.Core.Environment (>= 5.0)
+      Fake.Core.FakeVar (>= 5.0)
+      Fake.Core.String (>= 5.0)
+      Fake.Core.Trace (>= 5.0)
+      Fake.IO.FileSystem (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+      System.Diagnostics.Process (>= 4.3)
+    Fake.Core.String (5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.Core.Target (5.0)
+      Fake.Core.CommandLineParsing (>= 5.0)
+      Fake.Core.Context (>= 5.0)
+      Fake.Core.Environment (>= 5.0)
+      Fake.Core.FakeVar (>= 5.0)
+      Fake.Core.Process (>= 5.0)
+      Fake.Core.String (>= 5.0)
+      Fake.Core.Trace (>= 5.0)
+      FSharp.Control.Reactive (>= 4.0)
+      FSharp.Core (>= 4.3.4)
+      System.Reactive.Compatibility (>= 4.0)
+    Fake.Core.Trace (5.0)
+      Fake.Core.Context (>= 5.0)
+      Fake.Core.Environment (>= 5.0)
+      Fake.Core.FakeVar (>= 5.0)
+      Fake.Core.String (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.DotNet.MSBuild (5.0)
+      Fake.Core.Context (>= 5.0)
+      Fake.Core.Environment (>= 5.0)
+      Fake.Core.Process (>= 5.0)
+      Fake.Core.String (>= 5.0)
+      Fake.Core.Trace (>= 5.0)
+      Fake.IO.FileSystem (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+    Fake.IO.FileSystem (5.0)
+      Fake.Core.String (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+      System.Diagnostics.FileVersionInfo (>= 4.3)
+      System.IO.FileSystem.Watcher (>= 4.3)
+    Fake.IO.Zip (5.0)
+      Fake.Core.String (>= 5.0)
+      Fake.IO.FileSystem (>= 5.0)
+      FSharp.Core (>= 4.3.4)
+      System.IO.Compression (>= 4.3)
+      System.IO.Compression.ZipFile (>= 4.3)
+    FParsec (1.0.3)
+      FSharp.Core (>= 4.2.3)
+      NETStandard.Library (>= 1.6.1)
+    FSharp.Control.Reactive (4.1)
+      FSharp.Core (>= 4.2.3)
+      System.Reactive (>= 4.0)
+    FSharp.Core (4.3.4)
+    Microsoft.NETCore.Platforms (2.1)
+    Microsoft.NETCore.Targets (2.1)
+    Microsoft.Win32.Primitives (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    Microsoft.Win32.Registry (4.5)
+      System.Buffers (>= 4.4)
+      System.Memory (>= 4.5)
+      System.Security.AccessControl (>= 4.5)
+      System.Security.Principal.Windows (>= 4.5)
+    NETStandard.Library (2.0.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+    NuGet.CommandLine (4.6.2)
+    runtime.native.System (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+    runtime.native.System.IO.Compression (4.3.1)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1.1)
+    System.Buffers (4.5)
+    System.Collections (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Collections.Immutable (1.5)
+    System.Diagnostics.Debug (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Diagnostics.FileVersionInfo (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      System.Globalization (>= 4.3)
+      System.IO (>= 4.3)
+      System.IO.FileSystem (>= 4.3)
+      System.IO.FileSystem.Primitives (>= 4.3)
+      System.Reflection.Metadata (>= 1.4.1)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Runtime.InteropServices (>= 4.3)
+    System.Diagnostics.Process (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.Win32.Primitives (>= 4.3)
+      Microsoft.Win32.Registry (>= 4.3)
+      runtime.native.System (>= 4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.Globalization (>= 4.3)
+      System.IO (>= 4.3)
+      System.IO.FileSystem (>= 4.3)
+      System.IO.FileSystem.Primitives (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+      System.Runtime.InteropServices (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Text.Encoding.Extensions (>= 4.3)
+      System.Threading (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+      System.Threading.Thread (>= 4.3)
+      System.Threading.ThreadPool (>= 4.3)
+    System.Globalization (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.IO (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.IO.Compression (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      runtime.native.System (>= 4.3)
+      runtime.native.System.IO.Compression (>= 4.3)
+      System.Buffers (>= 4.3)
+      System.Collections (>= 4.3)
+      System.Diagnostics.Debug (>= 4.3)
+      System.IO (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+      System.Runtime.InteropServices (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Threading (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.IO.Compression.ZipFile (4.3)
+      System.Buffers (>= 4.3)
+      System.IO (>= 4.3)
+      System.IO.Compression (>= 4.3)
+      System.IO.FileSystem (>= 4.3)
+      System.IO.FileSystem.Primitives (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+    System.IO.FileSystem (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.IO (>= 4.3)
+      System.IO.FileSystem.Primitives (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.IO.FileSystem.Primitives (4.3)
+      System.Runtime (>= 4.3)
+    System.IO.FileSystem.Watcher (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.Win32.Primitives (>= 4.3)
+      runtime.native.System (>= 4.3)
+      System.Collections (>= 4.3)
+      System.IO.FileSystem (>= 4.3)
+      System.IO.FileSystem.Primitives (>= 4.3)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Extensions (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+      System.Runtime.InteropServices (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+      System.Threading (>= 4.3)
+      System.Threading.Overlapped (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+      System.Threading.Thread (>= 4.3)
+    System.Memory (4.5)
+      System.Buffers (>= 4.4)
+      System.Numerics.Vectors (>= 4.4)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5)
+    System.Numerics.Vectors (4.5)
+    System.Reactive (4.0)
+      System.Runtime.InteropServices.WindowsRuntime (>= 4.3)
+    System.Reactive.Compatibility (4.0)
+      System.Reactive.Core (>= 4.0)
+      System.Reactive.Interfaces (>= 4.0)
+      System.Reactive.Linq (>= 4.0)
+      System.Reactive.PlatformServices (>= 4.0)
+      System.Reactive.Providers (>= 4.0)
+    System.Reactive.Core (4.0)
+      System.Reactive (>= 4.0)
+    System.Reactive.Interfaces (4.0)
+      System.Reactive (>= 4.0)
+    System.Reactive.Linq (4.0)
+      System.Reactive (>= 4.0)
+    System.Reactive.PlatformServices (4.0)
+      System.Reactive (>= 4.0)
+    System.Reactive.Providers (4.0)
+      System.Reactive (>= 4.0)
+    System.Reflection (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.IO (>= 4.3)
+      System.Reflection.Primitives (>= 4.3)
+      System.Runtime (>= 4.3)
+    System.Reflection.Metadata (1.6)
+      System.Collections.Immutable (>= 1.5)
+    System.Reflection.Primitives (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Resources.ResourceManager (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Globalization (>= 4.3)
+      System.Reflection (>= 4.3)
+      System.Runtime (>= 4.3)
+    System.Runtime (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+    System.Runtime.CompilerServices.Unsafe (4.5)
+    System.Runtime.Extensions (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Runtime.Handles (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Runtime.InteropServices (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Reflection (>= 4.3)
+      System.Reflection.Primitives (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+    System.Runtime.InteropServices.WindowsRuntime (4.3)
+      System.Runtime (>= 4.3)
+    System.Security.AccessControl (4.5)
+      System.Security.Principal.Windows (>= 4.5)
+    System.Security.Principal.Windows (4.5)
+    System.Text.Encoding (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Text.Encoding.Extensions (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+      System.Text.Encoding (>= 4.3)
+    System.Threading (4.3)
+      System.Runtime (>= 4.3)
+      System.Threading.Tasks (>= 4.3)
+    System.Threading.Overlapped (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      System.Resources.ResourceManager (>= 4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
+    System.Threading.Tasks (4.3)
+      Microsoft.NETCore.Platforms (>= 1.1)
+      Microsoft.NETCore.Targets (>= 1.1)
+      System.Runtime (>= 4.3)
+    System.Threading.Thread (4.3)
+      System.Runtime (>= 4.3)
+    System.Threading.ThreadPool (4.3)
+      System.Runtime (>= 4.3)
+      System.Runtime.Handles (>= 4.3)
diff --git a/paket.references b/paket.references
new file mode 100644
index 0000000..1055788
--- /dev/null
+++ b/paket.references
@@ -0,0 +1,2 @@
+group BuildTools
+    dotnet-fake