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

Move and rename projects to better locations and names #10

Merged
merged 3 commits into from
Jan 23, 2024
Merged

Move and rename projects to better locations and names #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc1ba77
Move projects to subfolder ./src/
knocte Jan 23, 2024
c34a6bb
Rename projects and solutions
knocte Jan 23, 2024
b8d9320
.git-blame-ignore-revs: create
knocte Jan 23, 2024
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
8 changes: 8 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# NOTE: newer commits are above, older ones below

# Rename projects and solutions
c34a6bb7c88e74a926fd883808dffd6bd7c8d2d5

# Move projects to subfolder ./src/
cc1ba7764206e2a849ceff345efb8bea301bb31e

70 changes: 35 additions & 35 deletions FsharpExchangeDotNetCore.sln → FX.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FsharpExchange.Tests", "FsharpExchange.Tests\FsharpExchange.Tests.csproj", "{984CE32C-454B-4FF1-B388-203DFD2CEAD8}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FsharpExchangeDotNetStandard", "FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj", "{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FsharpExchangeDotNetCoreApp", "FsharpExchangeDotNetCoreApp\FsharpExchangeDotNetCoreApp.fsproj", "{E741A563-9A64-49B9-8506-DEEB03DB340C}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "WebSocketApp", "WebSocketApp\WebSocketApp.fsproj", "{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.Build.0 = Release|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.Build.0 = Release|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.Build.0 = Release|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FX.Tests", "src\FX.Tests\FX.Tests.csproj", "{984CE32C-454B-4FF1-B388-203DFD2CEAD8}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FX.Core", "src\FX.Core\FX.Core.fsproj", "{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "FX.Console", "src\FX.Console\FX.Console.fsproj", "{E741A563-9A64-49B9-8506-DEEB03DB340C}"
EndProject
Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "WebSocketApp", "src\WebSocketApp\WebSocketApp.fsproj", "{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{984CE32C-454B-4FF1-B388-203DFD2CEAD8}.Release|Any CPU.Build.0 = Release|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10A328B6-51E8-40DD-B6D8-361AFAEFABFA}.Release|Any CPU.Build.0 = Release|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E741A563-9A64-49B9-8506-DEEB03DB340C}.Release|Any CPU.Build.0 = Release|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E41ECB40-3CD7-473B-9B73-6BDE00BD74B4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
32 changes: 16 additions & 16 deletions ...oreApp/FsharpExchangeDotNetCoreApp.fsproj → src/FX.Console/FX.Console.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
</ItemGroup>
</Project>
0 FsharpExchangeDotNetCoreApp/Program.fs → src/FX.Console/Program.fs
View file
Open in desktop
File renamed without changes.
0 FsharpExchangeDotNetStandard/BasicTypes.fs → src/FX.Core/BasicTypes.fs
View file
Open in desktop
File renamed without changes.
0 FsharpExchangeDotNetStandard/Exchange.fs → src/FX.Core/Exchange.fs
View file
Open in desktop
File renamed without changes.
0 ...ndard/FsharpExchangeDotNetStandard.fsproj → src/FX.Core/FX.Core.fsproj
View file
Open in desktop
File renamed without changes.
0 ...hangeDotNetStandard/MemoryStorageLayer.fs → src/FX.Core/MemoryStorageLayer.fs
View file
Open in desktop
File renamed without changes.
0 FsharpExchangeDotNetStandard/OrderBook.fs → src/FX.Core/OrderBook.fs
View file
Open in desktop
File renamed without changes.
0 ...changeDotNetStandard/RedisStorageLayer.fs → src/FX.Core/RedisStorageLayer.fs
View file
Open in desktop
File renamed without changes.
0 FsharpExchange.Tests/BasicTests.cs → src/FX.Tests/BasicTests.cs
View file
Open in desktop
File renamed without changes.
42 changes: 21 additions & 21 deletions ...xchange.Tests/FsharpExchange.Tests.csproj → src/FX.Tests/FX.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="StackExchange.Redis" Version="2.0.513" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Class1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="3.9.0" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="StackExchange.Redis" Version="2.0.513" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Class1.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
</ItemGroup>
</Project>
0 FsharpExchange.Tests/LimitOrders.cs → src/FX.Tests/LimitOrders.cs
View file
Open in desktop
File renamed without changes.
0 FsharpExchange.Tests/MakerOnlyOrders.cs → src/FX.Tests/MakerOnlyOrders.cs
View file
Open in desktop
File renamed without changes.
0 FsharpExchange.Tests/MarketOrders.cs → src/FX.Tests/MarketOrders.cs
View file
Open in desktop
File renamed without changes.
0 ...rpExchange.Tests/RedisIntegrationTests.cs → src/FX.Tests/RedisIntegrationTests.cs
View file
Open in desktop
File renamed without changes.
0 ...cketApp/Middleware/WebSocketMiddleware.fs → ...cketApp/Middleware/WebSocketMiddleware.fs
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Models.fs → src/WebSocketApp/Models.fs
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Program.fs → src/WebSocketApp/Program.fs
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Views/Index.cshtml → src/WebSocketApp/Views/Index.cshtml
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Views/LoadIO.cshtml → src/WebSocketApp/Views/LoadIO.cshtml
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Views/Partial.cshtml → src/WebSocketApp/Views/Partial.cshtml
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/Views/_Layout.cshtml → src/WebSocketApp/Views/_Layout.cshtml
View file
Open in desktop
File renamed without changes.
0 WebSocketApp/WebRoot/main.css → src/WebSocketApp/WebRoot/main.css
View file
Open in desktop
File renamed without changes.
68 changes: 34 additions & 34 deletions WebSocketApp/WebSocketApp.fsproj → src/WebSocketApp/WebSocketApp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>WebSocketApp</AssemblyName>
<OutputType>Exe</OutputType>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>
<ItemGroup>
<Folder Include="Middleware\" />
</ItemGroup>
<ItemGroup>
<Watch Include="Views\_Layout.cshtml" />
<Watch Include="Views\Partial.cshtml" />
<Watch Include="Views\Index.cshtml" />
<Content Include="Views\*.cshtml;WebRoot\**\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="WebRoot\main.css" />
<Compile Include="Models.fs" />
<Compile Include="Middleware\WebSocketMiddleware.fs" />
<Compile Include="Program.fs" />
<None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
<PackageReference Include="Giraffe" Version="3.1.0" />
<PackageReference Include="Giraffe.Razor" Version="1.3.*" />
<Watch Include="**\*.cshtml" Exclude="bin\**\*" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
<ProjectReference Include="..\FsharpExchangeDotNetStandard\FsharpExchangeDotNetStandard.fsproj" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>WebSocketApp</AssemblyName>
<OutputType>Exe</OutputType>
<EnableDefaultContentItems>false</EnableDefaultContentItems>
</PropertyGroup>

<ItemGroup>
<Folder Include="Middleware\" />
</ItemGroup>
<ItemGroup>
<Watch Include="Views\_Layout.cshtml" />
<Watch Include="Views\Partial.cshtml" />
<Watch Include="Views\Index.cshtml" />
<Content Include="Views\*.cshtml;WebRoot\**\*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="WebRoot\main.css" />
<Compile Include="Models.fs" />
<Compile Include="Middleware\WebSocketMiddleware.fs" />
<Compile Include="Program.fs" />
<None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
<PackageReference Include="Giraffe" Version="3.1.0" />
<PackageReference Include="Giraffe.Razor" Version="1.3.*" />
<Watch Include="**\*.cshtml" Exclude="bin\**\*" />
<PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
<ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
</ItemGroup>
</Project>
0 WebSocketApp/web.config → src/WebSocketApp/web.config
View file
Open in desktop
File renamed without changes.
Loading