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

Move Equinox.Codec out to FsCodec #156

Merged
merged 13 commits into from
Aug 30, 2019
Merged

Move Equinox.Codec out to FsCodec #156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
784a2d9
Fix typo
bartelink Aug 29, 2019
75ccbef
File renames Equinox.Codec -> Gardelloyd
bartelink Aug 29, 2019
1f5c603
renamespace Equinox.Codec.NewtonsoftJson -> Gardelloyd.NewtonsoftJson
bartelink Aug 29, 2019
90adbd1
Split NewtonsoftJson out into Gardelloyd.NewtonsoftJson
bartelink Aug 29, 2019
7980c19
rename NewtonsoftJson.Json -> Codec
bartelink Aug 29, 2019
d48dd64
Add/use Gardelloyd.NewtonsoftJson.Settings
bartelink Aug 29, 2019
0016a4b
clean genCodec usage
bartelink Aug 29, 2019
9ca1f7a
Mention Propulsion in comments
bartelink Aug 29, 2019
ec95132
Remove stuff moving to external repo
bartelink Aug 29, 2019
c6575c0
Use Gardelloyd.NewtonsoftJson; lean on OptionConverter by default
bartelink Aug 29, 2019
54a1962
Rebase on FsCodec
bartelink Aug 30, 2019
63f0fc6
Clean readme
bartelink Aug 30, 2019
10d69a1
Add PR ref
bartelink Aug 30, 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
Prev Previous commit
Next Next commit
Remove stuff moving to external repo
  • Loading branch information
@bartelink
bartelink committed Aug 29, 2019
commit ec951323884bce00d2ebbd1164f16ed31735b34e
4 changes: 2 additions & 2 deletions Equinox.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Equinox.MemoryStore", "src\
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Equinox.MemoryStore.Integration", "tests\Equinox.MemoryStore.Integration\Equinox.MemoryStore.Integration.fsproj", "{B2C695C3-ED04-4094-B672-926440B5F335}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Gardelloyd", "src\Gardelloyd\Gardelloyd.fsproj", "{F5491EB1-D072-4262-8184-2A908E1D6175}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Gardelloyd", "..\Gardelloyd\src\Gardelloyd\Gardelloyd.fsproj", "{F5491EB1-D072-4262-8184-2A908E1D6175}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Equinox.Tool", "tools\Equinox.Tool\Equinox.Tool.fsproj", "{C8992C1C-6DC5-42CD-A3D7-1C5663433FED}"
EndProject
Expand All @@ -60,7 +60,7 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Tutorial", "samples\Tutoria
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Equinox.Tools.TestHarness", "tools\Equinox.Tools.TestHarness\Equinox.Tools.TestHarness.fsproj", "{C2EE7D8E-6982-41AD-ADCC-E6F586E93524}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gardelloyd.NewtonsoftJson", "src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj", "{C725B50F-1622-4E36-B013-309D18ED35DD}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Gardelloyd.NewtonsoftJson", "..\Gardelloyd\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj", "{C725B50F-1622-4E36-B013-309D18ED35DD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 0 additions & 2 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

<Target Name="Pack">
<Exec Command="dotnet pack src/Equinox $(Cfg) $(PackOptions)" />
<Exec Command="dotnet pack src/Gardelloyd $(Cfg) $(PackOptions)" />
<Exec Command="dotnet pack src/Gardelloyd.NewtonsoftJson $(Cfg) $(PackOptions)" />
<Exec Command="dotnet pack src/Equinox.Cosmos $(Cfg) $(PackOptions)" />
<Exec Command="dotnet pack src/Equinox.EventStore $(Cfg) $(PackOptions)" />
<Exec Command="dotnet pack src/Equinox.MemoryStore $(Cfg) $(PackOptions)" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Infrastructure/Infrastructure.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\..\src\Equinox.Cosmos\Equinox.Cosmos.fsproj" />
<ProjectReference Include="..\..\src\Equinox.EventStore\Equinox.EventStore.fsproj" />
<ProjectReference Include="..\..\src\Equinox.MemoryStore\Equinox.MemoryStore.fsproj" />
<ProjectReference Include="..\..\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
<ProjectReference Include="..\..\..\Gardelloyd\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
<ProjectReference Include="..\Store\Backend\Backend.fsproj" />
<ProjectReference Include="..\Store\Domain\Domain.fsproj" />
<ProjectReference Include="..\TodoBackend\TodoBackend.fsproj" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Store/Domain/Domain.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
<ProjectReference Include="..\..\..\..\Gardelloyd\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Tutorial/Tutorial.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
<ProjectReference Include="..\..\..\Gardelloyd\src\Gardelloyd.NewtonsoftJson\Gardelloyd.NewtonsoftJson.fsproj" />
<ProjectReference Include="..\..\src\Equinox.Cosmos\Equinox.Cosmos.fsproj" />
<ProjectReference Include="..\..\src\Equinox.MemoryStore\Equinox.MemoryStore.fsproj" />
<ProjectReference Include="..\..\src\Equinox\Equinox.fsproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Equinox.Cosmos/Equinox.Cosmos.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<ProjectReference Include="..\Equinox\Equinox.fsproj" />
<ProjectReference Include="..\Gardelloyd\Gardelloyd.fsproj" />
<ProjectReference Include="..\..\..\Gardelloyd\src\Gardelloyd\Gardelloyd.fsproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Equinox.EventStore/Equinox.EventStore.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Gardelloyd\Gardelloyd.fsproj" />
<ProjectReference Include="..\..\..\Gardelloyd\src\Gardelloyd\Gardelloyd.fsproj" />
<ProjectReference Include="..\Equinox\Equinox.fsproj" />
</ItemGroup>

Expand Down
30 changes: 0 additions & 30 deletions src/Gardelloyd.NewtonsoftJson/Gardelloyd.NewtonsoftJson.fsproj
View file
Open in desktop

This file was deleted.

132 changes: 0 additions & 132 deletions src/Gardelloyd.NewtonsoftJson/NewtonsoftJson.fs
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions src/Gardelloyd/Gardelloyd.fs
View file
Open in desktop

This file was deleted.

Loading