diff --git a/.gitignore b/.gitignore index 7c3332e6..276d6587 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,6 @@ project.lock.json *.project.lock.json dotnet-dev-* tools/coreclr/ -dotnet_cli_install.ps1 +tools/dotnet-install.* .vs/ .vscode/ \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 994a749c..a01e88c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,4 +26,4 @@ DEPENDENCIES albacore (~> 2.3) BUNDLED WITH - 1.12.5 + 1.14.6 diff --git a/Rakefile b/Rakefile index 4d1b4dd6..a868ce5a 100644 --- a/Rakefile +++ b/Rakefile @@ -45,7 +45,7 @@ asmver_files :asmver => :versioning do |a| a.files = FileList[ 'examples/**/*.fsproj', 'src/{Suave,Suave.*,Experimental}/*proj' - ] + ].exclude(/.netcore.fsproj/) a.attributes assembly_description: suave_description, assembly_configuration: Configuration, assembly_company: 'Suave.io', @@ -103,7 +103,7 @@ namespace :dotnetcli do end task :coreclr_binaries => 'tools/coreclr' do - dotnet_version = '1.0.0-preview2-003131' + dotnet_version = '1.0.1' dotnet_installed_version = get_installed_dotnet_version # check if required version of .net core sdk is already installed, otherwise download and install it if dotnet_installed_version == dotnet_version then @@ -116,64 +116,58 @@ namespace :dotnetcli do puts "Found .NET Core SDK #{dotnet_installed_version} but require #{dotnet_version}. Downloading and installing in ./tools/coreclr" end + coreclr_bin_dir = File.expand_path "tools/coreclr" + + dotnet_exe_path = "dotnet" + case RUBY_PLATFORM - when /darwin/ - filename = "dotnet-dev-osx-x64.#{dotnet_version}.tar.gz" + when /darwin/ , /linux/ system 'curl', - %W|-o tools/#{filename} - -L https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/#{dotnet_version}/#{filename}| \ - unless File.exists? "tools/#{filename}" - - system 'tar', - %W|xf tools/#{filename} - --directory tools/coreclr| - when /linux/ - filename = "dotnet-dev-ubuntu.14.04-x64.#{dotnet_version}.tar.gz" - system 'curl', - %W|-o tools/#{filename} - -L https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/#{dotnet_version}/#{filename}| \ - unless File.exists? "tools/#{filename}" + %W|-o tools/dotnet-install.sh + -L https://dot.net/v1/dotnet-install.sh| \ + unless File.exists? "tools/dotnet-install.sh" - system 'tar', - %W|xf tools/#{filename} - --directory tools/coreclr| - end - if Albacore.windows? + system 'bash', + %W|--install-dir "#{coreclr_bin_dir}" + --channel "stable" + --version "#{dotnet_version}| + + ENV['PATH'] = "#{coreclr_bin_dir}/dotnet:#{ENV['PATH']}" + else system 'powershell', - %W|Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile "dotnet_cli_install.ps1"| + %W|Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "tools/dotnet-install.ps1"| \ + unless File.exists? "tools/dotnet-install.ps1" + system 'powershell', - %W|-ExecutionPolicy Unrestricted ./dotnet_cli_install.ps1 -InstallDir "tools/coreclr" -Channel "preview" -version "#{dotnet_version}"| + %W|-ExecutionPolicy Unrestricted ./tools/dotnet-install.ps1 + -InstallDir "#{coreclr_bin_dir}" + -Channel "stable" + -Version "#{dotnet_version}"| + + ENV['PATH'] = "#{coreclr_bin_dir};#{ENV['PATH']}" end - dotnet_exe_path = "#{Dir.pwd}/tools/coreclr/dotnet" end desc 'Restore the CoreCLR binaries' task :restore => :coreclr_binaries do - Dir.chdir "src" do - system dotnet_exe_path, "restore" - end + system dotnet_exe_path, %W|restore src/Suave.netcore.sln -v n| end task :build_lib => :coreclr_binaries do - [ "src/Suave", "src/Experimental", "src/Suave.DotLiquid" ].each do |item| - Dir.chdir "#{item}" do - system dotnet_exe_path, %W|--verbose build --configuration #{Configuration} -f netstandard1.6| - Dir.chdir "../.." - end - end + system dotnet_exe_path, %W|build src/Suave.netcore.sln -c #{Configuration} -v n| end desc 'Build Suave and test project' task :build => [:build_lib] + directory 'build/pkg-netcore' + desc 'Create Suave nugets packages' - task :pack => :coreclr_binaries do - [ "src/Suave", "src/Experimental", "src/Suave.DotLiquid" ].each do |item| - Dir.chdir "#{item}" do - system dotnet_exe_path, %W|--verbose pack --configuration #{Configuration} --no-build| - Dir.chdir "../.." - end + task :pack => [:versioning, 'build/pkg-netcore', :coreclr_binaries] do + out_dir = File.expand_path "build/pkg-netcore" + [ "src/Suave/Suave.netcore.fsproj", "src/Experimental/Suave.Experimental.netcore.fsproj", "src/Suave.DotLiquid/Suave.DotLiquid.netcore.fsproj" ].each do |item| + system dotnet_exe_path, %W|pack #{item} --configuration #{Configuration} --output "#{out_dir}" --no-build -v n /p:Version=#{ENV['NUGET_VERSION']}| end end @@ -181,17 +175,13 @@ namespace :dotnetcli do desc 'Merge standard and dotnetcli nupkgs; note the need to run :nugets before' task :merge => :coreclr_binaries do - [ "Suave", "Experimental", "Suave.DotLiquid" ].each do |item| - Dir.chdir "src/#{item}" do - version = SemVer.find.format("%M.%m.%p%s") - if item == "Experimental" then - sourcenupkg = "../../build/pkg/Suave.Experimental.#{version}.nupkg" - clinupkg = "bin/#{Configuration}/Experimental.#{version}-dotnetcli.nupkg" - else - sourcenupkg = "../../build/pkg/#{item}.#{version}.nupkg" - clinupkg = "bin/#{Configuration}/#{item}.#{version}-dotnetcli.nupkg" - end - system dotnet_exe_path, %W|mergenupkg --source "#{sourcenupkg}" --other "#{clinupkg}" --framework netstandard1.6| + system dotnet_exe_path, %W|restore tools/tools.proj -v n| + Dir.chdir "tools" do + [ "Suave", "Suave.Experimental", "Suave.DotLiquid" ].each do |item| + version = SemVer.find.format("%M.%m.%p%s") + sourcenupkg = "../build/pkg/#{item}.#{version}.nupkg" + netcorenupkg = "../build/pkg-netcore/#{item}.#{version}.nupkg" + system dotnet_exe_path, %W|mergenupkg --source "#{sourcenupkg}" --other "#{netcorenupkg}" --framework netstandard1.6| end end end @@ -219,7 +209,7 @@ task :tests => [:'tests:stress', :'tests:unit'] directory 'build/pkg' task :create_nuget_quick => [:versioning, 'build/pkg'] do - projects = FileList['src/**/*.fsproj'].exclude(/Tests/) + projects = FileList['src/**/*.fsproj'].exclude(/.netcore.fsproj/).exclude(/Tests/) knowns = Set.new(projects.map { |f| Albacore::Project.new f }.map { |p| p.id }) authors = "Ademar Gonzalez, Henrik Feldt" projects.each do |f| @@ -275,11 +265,6 @@ task :increase_version_number do s.save version = s.format("%M.%m.%p%s") ENV['NUGET_VERSION'] = version - projectjson = 'src/Suave/project.json' - contents = File.read(projectjson).gsub(/"version": ".*-dotnetcli"/, %{"version": "#{version}-dotnetcli"}) - File.open(projectjson, 'w') do |out| - out << contents - end end namespace :docs do diff --git a/examples/Example/Example.fsproj b/examples/Example/Example.fsproj index 143d83ca..3be74624 100644 --- a/examples/Example/Example.fsproj +++ b/examples/Example/Example.fsproj @@ -62,7 +62,6 @@ Always - diff --git a/examples/Example/Example.netcore.fsproj b/examples/Example/Example.netcore.fsproj new file mode 100644 index 00000000..793bba1a --- /dev/null +++ b/examples/Example/Example.netcore.fsproj @@ -0,0 +1,22 @@ + + + + netcoreapp1.1 + Exe + Example + $(DefineConstants);DNXCORE50 + + + + + + + + + + + + + + + diff --git a/examples/Example/Example.project.json b/examples/Example/Example.project.json deleted file mode 100644 index d06b61bf..00000000 --- a/examples/Example/Example.project.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "runtimes": { "win": { } }, - "frameworks": { "net45": { } } -} diff --git a/examples/Example/NuGet.Config b/examples/Example/NuGet.Config index bca829d6..2b408d78 100644 --- a/examples/Example/NuGet.Config +++ b/examples/Example/NuGet.Config @@ -1,9 +1,6 @@  - - - diff --git a/examples/Example/Program.fs b/examples/Example/Program.fs index 5a81f4ff..5aa9b29a 100644 --- a/examples/Example/Program.fs +++ b/examples/Example/Program.fs @@ -64,7 +64,7 @@ let testApp = RequestErrors.NOT_FOUND "Found no handlers" ] -#if NETSTANDARD1_5 +#if NETCOREAPP1_1 #else System.Net.ServicePointManager.DefaultConnectionLimit <- Int32.MaxValue #endif @@ -228,7 +228,7 @@ let main argv = compressedFilesFolder = None logger = logger tcpServerFactory = new DefaultTcpServerFactory() -#if NETSTANDARD1_5 +#if NETCOREAPP1_1 cookieSerialiser = new JsonFormatterSerialiser() #else cookieSerialiser = new BinaryFormatterSerialiser() diff --git a/examples/Example/project.json b/examples/Example/project.json deleted file mode 100644 index bbdc2276..00000000 --- a/examples/Example/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "compilerName": "fsc", - "compile": { - "includeFiles": [ - "../../paket-files/haf/YoLo/YoLo.fs", - "CounterDemo.fs", - "Program.fs" - ] - } - }, - - "dependencies": { - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509", - "Suave": "2.0.0-alpha7", - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0-rc2-3002702" - } - }, - - "tools": { - "dotnet-compile-fsc": { - "version": "1.0.0-preview1-*", - "imports": [ - "dnxcore50", - "portable-net45+win81", - "netstandard1.3" - ] - } - }, - - "frameworks": { - "netstandard1.6": { - "buildOptions": { - "define": [ - "DNXCORE50" - ] - }, - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } - } -} diff --git a/src/Experimental/Suave.Experimental.netcore.fsproj b/src/Experimental/Suave.Experimental.netcore.fsproj new file mode 100644 index 00000000..a188720d --- /dev/null +++ b/src/Experimental/Suave.Experimental.netcore.fsproj @@ -0,0 +1,33 @@ + + + + netstandard1.6 + Suave.Experimental + Suave.Experimental + true + $(DefineConstants);DNXCORE50;NETSTANDARD1_5 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Experimental/project.json b/src/Experimental/project.json deleted file mode 100644 index 3c985860..00000000 --- a/src/Experimental/project.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "version": "2.0.4-dotnetcli", - - "buildOptions": { - "compilerName": "fsc", - "compile": { - "includeFiles": [ - "Html.fs", - "Xml.fs", - "Template.fs", - "Data.fs", - "Form.fs" - ] - } - }, - - "tools": { - "dotnet-compile-fsc": { - "version": "1.0.0-preview2-*", - "imports": "dnxcore50" - }, - "dotnet-mergenupkg": { "version": "1.0.*" } - }, - "dependencies":{ - "Suave":"2.0.1-dotnetcli", - }, - "frameworks": { - "net45": {}, - "netstandard1.6": { - "buildOptions": { - "define": [ - "DNXCORE50", - "NETSTANDARD1_5" - ] - }, - "dependencies": { - "System.Data.Common": "4.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Xml.ReaderWriter": "4.3.0", - "System.Diagnostics.Process": "4.1.0", - "System.Security.Cryptography.Primitives": "4.0.0", - "System.Net.Security": "4.0.0", - "System.Globalization.Extensions": "4.0.1", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*", - "NETStandard.Library": "1.6.0", - "System.Security.Claims": "4.0.1", - "System.Runtime.Serialization.Json": "4.0.2", - "System.Net.Mail": "1.0.0-rtm-00002" - }, - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } - } -} diff --git a/src/Suave.DotLiquid/Suave.DotLiquid.netcore.fsproj b/src/Suave.DotLiquid/Suave.DotLiquid.netcore.fsproj new file mode 100644 index 00000000..cf2ca806 --- /dev/null +++ b/src/Suave.DotLiquid/Suave.DotLiquid.netcore.fsproj @@ -0,0 +1,27 @@ + + + + netstandard1.6 + Suave.DotLiquid + Suave.DotLiquid + true + $(DefineConstants);DNXCORE50;NETSTANDARD1_5 + + + + + + + + + + + + + + + + + + + diff --git a/src/Suave.DotLiquid/project.json b/src/Suave.DotLiquid/project.json deleted file mode 100644 index d4f22371..00000000 --- a/src/Suave.DotLiquid/project.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": "2.0.4-dotnetcli", - - "buildOptions": { - "compilerName": "fsc", - "compile": { - "includeFiles": [ - "Library.fs" - ] - } - }, - - "tools": { - "dotnet-compile-fsc": { - "version": "1.0.0-preview2-*", - "imports": "dnxcore50" - }, - "dotnet-mergenupkg": { "version": "1.0.*" } - }, - "dependencies":{ - "Suave":"2.0.1-dotnetcli", - }, - "frameworks": { - "net45": {}, - "netstandard1.6": { - "buildOptions": { - "define": [ - "DNXCORE50", - "NETSTANDARD1_5" - ] - }, - "dependencies": { - "System.Data.Common": "4.1.0", - "System.Reflection": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Diagnostics.Process": "4.1.0", - "System.Security.Cryptography.Primitives": "4.0.0", - "System.Net.Security": "4.0.0", - "System.Globalization.Extensions": "4.0.1", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*", - "NETStandard.Library": "1.6.0", - "System.Security.Claims": "4.0.1", - "DotLiquid": "2.0.55" - }, - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } - } -} diff --git a/src/Suave.netcore.sln b/src/Suave.netcore.sln new file mode 100644 index 00000000..c86d1266 --- /dev/null +++ b/src/Suave.netcore.sln @@ -0,0 +1,62 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.netcore", "Suave\Suave.netcore.fsproj", "{87A7BC50-A26D-4370-B175-BF4BB4E7416B}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.DotLiquid.netcore", "Suave.DotLiquid\Suave.DotLiquid.netcore.fsproj", "{FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Suave.Experimental.netcore", "Experimental\Suave.Experimental.netcore.fsproj", "{44C7A32F-EA26-49D4-82C9-8B51E17524D0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|x64.ActiveCfg = Debug|x64 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|x64.Build.0 = Debug|x64 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|x86.ActiveCfg = Debug|x86 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Debug|x86.Build.0 = Debug|x86 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|Any CPU.Build.0 = Release|Any CPU + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|x64.ActiveCfg = Release|x64 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|x64.Build.0 = Release|x64 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|x86.ActiveCfg = Release|x86 + {87A7BC50-A26D-4370-B175-BF4BB4E7416B}.Release|x86.Build.0 = Release|x86 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|x64.ActiveCfg = Debug|x64 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|x64.Build.0 = Debug|x64 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|x86.ActiveCfg = Debug|x86 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Debug|x86.Build.0 = Debug|x86 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|Any CPU.Build.0 = Release|Any CPU + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|x64.ActiveCfg = Release|x64 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|x64.Build.0 = Release|x64 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|x86.ActiveCfg = Release|x86 + {FF35C4E4-9B3C-42F1-96C3-6972D9A94DAD}.Release|x86.Build.0 = Release|x86 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|x64.ActiveCfg = Debug|x64 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|x64.Build.0 = Debug|x64 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|x86.ActiveCfg = Debug|x86 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Debug|x86.Build.0 = Debug|x86 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|Any CPU.Build.0 = Release|Any CPU + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|x64.ActiveCfg = Release|x64 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|x64.Build.0 = Release|x64 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|x86.ActiveCfg = Release|x86 + {44C7A32F-EA26-49D4-82C9-8B51E17524D0}.Release|x86.Build.0 = Release|x86 + EndGlobalSection +EndGlobal diff --git a/src/Suave/Suave.fsproj b/src/Suave/Suave.fsproj index 50aaad52..45a5577b 100644 --- a/src/Suave/Suave.fsproj +++ b/src/Suave/Suave.fsproj @@ -147,7 +147,6 @@ - diff --git a/src/Suave/Suave.netcore.fsproj b/src/Suave/Suave.netcore.fsproj new file mode 100644 index 00000000..b5870c32 --- /dev/null +++ b/src/Suave/Suave.netcore.fsproj @@ -0,0 +1,84 @@ + + + + netstandard1.6 + Suave + Suave + true + $(DefineConstants);DNXCORE50;NETSTANDARD1_5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Suave/project.json b/src/Suave/project.json deleted file mode 100644 index 76786fa5..00000000 --- a/src/Suave/project.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "version": "2.0.4-dotnetcli", - - "buildOptions": { - "compilerName": "fsc", - "compile": { - "includeFiles": [ - "../../paket-files/haf/YoLo/YoLo.fs", - "Utils/Aether.fs", - "Utils/AsyncExtensions.fs", - "Utils/AsyncResultCell.fs", - "Utils/Collections.fs", - "Utils/ASCII.fs", - "Utils/Choice.fs", - "Utils/ThreadSafeRandom.fs", - "Utils/Bytes.fs", - "Utils/Compression.fs", - "Utils/Crypto.fs", - "Utils/Parsing.fs", - "Utils/OpenMemoryStream.fs", - "Utils/Property.fs", - "Utils/Parse.fs", - "Utils/CultureInfoCache.fs", - "../../paket-files/logary/logary/src/Logary.Facade/Facade.fs", - "Utils/TraceHeader.fs", - "Globals.fs", - "CookieSerialiser.fs", - "Sockets/SocketBinding.fs", - "Sockets/BufferManager.fs", - "Sockets/ConcurrentPool.fs", - "Sockets/AsyncUserToken.fs", - "Sockets/SocketOp.fs", - "Sockets/ITransport.fs", - "Sockets/TcpTransport.fs", - "Sockets/Connection.fs", - "Sockets/SocketMonad.fs", - "Sockets/AsyncSocket.fs", - "Sockets/TransportStream.fs", - "Tcp.fs", - "TcpServerFactory.fs", - "Sscanf.fs", - "WebPart.fsi", - "WebPart.fs", - "Operators.fs", - "Http.fsi", - "Http.fs", - "Headers.fs", - "DefaultTlsProvider.fs", - "Compression.fs", - "Combinators.fsi", - "Combinators.fs", - "Cookie.fsi", - "Cookie.fs", - "Model.fs", - "State.fs", - "Authentication.fsi", - "Authentication.fs", - "SuaveConfig.fs", - "HttpOutput.fs", - "ConnectionFacade.fs", - "ParsingAndControl.fs", - "Web.fs", - "WebSocket.fs", - "Owin.fs", - "Json.fs" - ] - } - }, - - "tools": { - "dotnet-compile-fsc": { - "version": "1.0.0-preview2-*", - "imports": "dnxcore50" - }, - "dotnet-mergenupkg": { "version": "1.0.*" } - }, - - "frameworks": { - "net45": {}, - "netstandard1.6": { - "buildOptions": { - "define": [ - "DNXCORE50", - "NETSTANDARD1_5" - ] - }, - "dependencies": { - "System.Data.Common": "4.1.0", - "System.Diagnostics.Process": "4.1.0", - "System.Security.Cryptography.Primitives": "4.0.0", - "System.Net.Security": "4.0.0", - "System.Globalization.Extensions": "4.0.1", - "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-*", - "NETStandard.Library": "1.6.0", - "System.Security.Claims": "4.0.1", - "System.Runtime.Serialization.Json": "4.0.2" - }, - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } - } -} diff --git a/tools/tools.proj b/tools/tools.proj new file mode 100644 index 00000000..5aa6dfda --- /dev/null +++ b/tools/tools.proj @@ -0,0 +1,7 @@ + + + + + + +