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

Jump to bottom

[WIP] Channels - high level web sockets abstraction #158

Merged
merged 7 commits into from
Mar 22, 2019
Merged

[WIP] Channels - high level web sockets abstraction #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23e1233
Update dependencies
Krzysztof-Cieslak Dec 13, 2018
67a8abf
Initial channels implementation
Krzysztof-Cieslak Dec 13, 2018
64c4d0a
Add channels registration to `application` CE
Krzysztof-Cieslak Dec 13, 2018
73f1cd4
Add sample
Krzysztof-Cieslak Dec 13, 2018
1c62717
Use Jimmy's implementation
Krzysztof-Cieslak Jan 7, 2019
f6afd33
Use default buffer size for openin channel message
Krzysztof-Cieslak Mar 22, 2019
f007973
Use SDK version installed on Appveyor
Krzysztof-Cieslak Mar 22, 2019
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
40 changes: 30 additions & 10 deletions .paket/Paket.Restore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,43 @@
<PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>

<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
<!-- PaketBootStrapper -->
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>

<!-- Paket -->

<!-- windows, root => tool => proj style => bootstrapper => global -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(_PaketBootStrapperExeDir)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">paket.exe</PaketExePath>

<!-- no windows, try native paket as default, root => tool => proj style => mono paket => bootstrpper => global -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath>

<!-- no windows, try mono paket -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>

<!-- no windows, try bootstrapper -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket.exe</PaketExePath>

<!-- no windows, try global native paket -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' ">paket</PaketExePath>

<!-- Paket command -->
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(PaketCommand)' == '' ">"$(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>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>

Expand Down
15 changes: 15 additions & 0 deletions Saturn.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Saturn.Extensions.Turbolink
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "TurbolinksSample", "sample\TurbolinksSample\TurbolinksSample.fsproj", "{9FEB1575-C6AE-4746-BAE9-EF458FBCD07E}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ChannelsSample", "sample\ChannelsSample\ChannelsSample.fsproj", "{CE022EB0-A55F-466E-A085-4C328436C8E0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -190,6 +192,18 @@ Global
{9FEB1575-C6AE-4746-BAE9-EF458FBCD07E}.Release|x64.Build.0 = Release|Any CPU
{9FEB1575-C6AE-4746-BAE9-EF458FBCD07E}.Release|x86.ActiveCfg = Release|Any CPU
{9FEB1575-C6AE-4746-BAE9-EF458FBCD07E}.Release|x86.Build.0 = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|x64.ActiveCfg = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|x64.Build.0 = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|x86.ActiveCfg = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Debug|x86.Build.0 = Debug|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|Any CPU.Build.0 = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|x64.ActiveCfg = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|x64.Build.0 = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|x86.ActiveCfg = Release|Any CPU
{CE022EB0-A55F-466E-A085-4C328436C8E0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8DBA089A-7C24-4E87-870B-E0774654F376} = {F2C8C347-845F-42E4-A702-7381C4B4087F}
Expand All @@ -204,5 +218,6 @@ Global
{04D58505-239F-44B8-A640-9119134B7A4C} = {F2C8C347-845F-42E4-A702-7381C4B4087F}
{17D976F0-4AC6-47AA-BA6C-E6C90FAFEF62} = {F2C8C347-845F-42E4-A702-7381C4B4087F}
{9FEB1575-C6AE-4746-BAE9-EF458FBCD07E} = {511FB392-5714-4028-97F3-F883F81B43DB}
{CE022EB0-A55F-466E-A085-4C328436C8E0} = {511FB392-5714-4028-97F3-F883F81B43DB}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.403"
"version": "2.1.503"
}
}
4 changes: 3 additions & 1 deletion paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ nuget Microsoft.AspNetCore.Authentication.OAuth >= 2.1
nuget Microsoft.AspNetCore.Authorization >= 2.1
nuget Microsoft.AspNetCore.Antiforgery >= 2.1
nuget Microsoft.AspNetCore.Server.HttpSys >= 2.1
nuget Microsoft.AspNetCore.WebSockets >= 2.1

nuget Giraffe ~> 3.4

nuget Microsoft.NET.Sdk.Functions >= 1.0.19
nuget Microsoft.NET.Sdk.Functions >= 1.0.24
nuget Newtonsoft.Json == 12.0.1

nuget NSubstitute
nuget Expecto
Expand Down
Loading