Skip to content

Commit

Permalink
rename projects from Crdt.* to SIL.Harmony.* (#8)
Browse files Browse the repository at this point in the history
* rename library from Crdt to SIL.Harmony

* remove unused `using` statements
  • Loading branch information
hahn-kev authored Jul 17, 2024
1 parent 7c9e207 commit 803b3bd
Show file tree
Hide file tree
Showing 124 changed files with 205 additions and 348 deletions.
10 changes: 5 additions & 5 deletions harmony.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Core", "src\Crdt.Core\Crdt.Core.csproj", "{9AD0CB91-4C08-4CA8-B65A-9B9217F316B2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Core", "src\SIL.Harmony.Core\SIL.Harmony.Core.csproj", "{9AD0CB91-4C08-4CA8-B65A-9B9217F316B2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt", "src\Crdt\Crdt.csproj", "{C4F67DF7-7DA3-4BA6-93E1-13C12AC1B027}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony", "src\SIL.Harmony\SIL.Harmony.csproj", "{C4F67DF7-7DA3-4BA6-93E1-13C12AC1B027}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Sample", "src\Crdt.Sample\Crdt.Sample.csproj", "{AA69420C-9569-4374-8434-6804AA7EC9AE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Sample", "src\SIL.Harmony.Sample\SIL.Harmony.Sample.csproj", "{AA69420C-9569-4374-8434-6804AA7EC9AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ycs", "src\Ycs\Ycs.csproj", "{BAB394E4-AC1F-4E9B-BA18-88FA70341C1F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Tests", "src\Crdt.Tests\Crdt.Tests.csproj", "{58A1DABF-1662-4E1E-A3B7-9F3AC7FC678F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Tests", "src\SIL.Harmony.Tests\SIL.Harmony.Tests.csproj", "{58A1DABF-1662-4E1E-A3B7-9F3AC7FC678F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crdt.Linq2db", "src\Crdt.Linq2db\Crdt.Linq2db.csproj", "{8EB807F6-C548-4016-856E-2ACCA5603036}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SIL.Harmony.Linq2db", "src\SIL.Harmony.Linq2db\SIL.Harmony.Linq2db.csproj", "{8EB807F6-C548-4016-856E-2ACCA5603036}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{321635F9-11D9-4B45-A2F8-F3B70E9A4196}"
ProjectSection(SolutionItems) = preProject
Expand Down
13 changes: 0 additions & 13 deletions src/Crdt.Sample/Crdt.Sample.csproj

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;

namespace Crdt.Core;
namespace SIL.Harmony.Core;

public class ChangeEntity<TChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
using System.ComponentModel.DataAnnotations;
using System.Diagnostics.CodeAnalysis;
using System.IO.Hashing;
using System.IO.Hashing;
using System.Text.Json.Serialization;

namespace Crdt.Core;
namespace SIL.Harmony.Core;

/// <summary>
/// most basic commit, does not contain any change data, that's stored in <see cref="CommitBase{TChange}"/>
/// this class is not meant to be inherited from directly, use <see cref="ServerCommit"/> or <see cref="Crdt.Commit"/> instead
/// this class is not meant to be inherited from directly, use <see cref="ServerCommit"/> or <see cref="SIL.Harmony.Commit"/> instead
/// </summary>
public abstract class CommitBase
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Text.Json.Serialization;

namespace Crdt.Core;
namespace SIL.Harmony.Core;

public class CommitMetadata
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Crdt.Core;
namespace SIL.Harmony.Core;

public static class CrdtConstants
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace Crdt.Core;
namespace SIL.Harmony.Core;

/// <summary>
/// Hybrid date time represents a hybrid logical clock that combines a datetime and a counter.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;

namespace Crdt.Core;
namespace SIL.Harmony.Core;

public static class QueryHelpers
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>Crdt.Core</RootNamespace>
<RootNamespace>SIL.Harmony.Core</RootNamespace>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="Crdt"/>
<InternalsVisibleTo Include="SIL.Harmony"/>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;

namespace Crdt.Core;
namespace SIL.Harmony.Core;

public class ServerCommit : CommitBase<ServerJsonChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Crdt.Core;
namespace SIL.Harmony.Core;

public record SyncState(Dictionary<Guid, long> ClientHeads);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
using Crdt.Core;
using Crdt.Db;
using LinqToDB;
using SIL.Harmony.Core;
using LinqToDB.AspNet.Logging;
using LinqToDB.EntityFrameworkCore;
using LinqToDB.Mapping;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;

namespace Crdt.Linq2db;
namespace SIL.Harmony.Linq2db;

public static class Linq2dbKernel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>Crdt.Linq2db</RootNamespace>
<RootNamespace>SIL.Harmony.Linq2db</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Crdt\Crdt.csproj" />
<ProjectReference Include="..\SIL.Harmony\SIL.Harmony.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class AddAntonymReferenceChange(Guid entityId, Guid antonymId)
: EditChange<Word>(entityId), ISelfNamedType<AddAntonymReferenceChange>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System.Text.Json.Serialization;
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;
using Ycs;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class EditExampleChange : EditChange<Example>, ISelfNamedType<EditExampleChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class NewDefinitionChange(Guid entityId) : CreateChange<Definition>(entityId), ISelfNamedType<NewDefinitionChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System.Text.Json.Serialization;
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;
using Ycs;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class NewExampleChange : CreateChange<Example>, ISelfNamedType<NewExampleChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class NewWordChange(Guid entityId, string text, string? note = null) : CreateChange<Word>(entityId), ISelfNamedType<NewWordChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

public class SetWordNoteChange(Guid entityId, string note) : EditChange<Word>(entityId), ISelfNamedType<SetWordNoteChange>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;
using SIL.Harmony.Sample.Models;

namespace Crdt.Sample.Changes;
namespace SIL.Harmony.Sample.Changes;

/// <summary>
/// set text is used in many tests as a simple change that either creates a word, or updates the text of a word.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.Diagnostics;
using Crdt.Changes;
using Crdt.Linq2db;
using Crdt.Sample.Changes;
using Crdt.Sample.Models;
using SIL.Harmony.Changes;
using SIL.Harmony.Linq2db;
using SIL.Harmony.Sample.Changes;
using SIL.Harmony.Sample.Models;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;

namespace Crdt.Sample;
namespace SIL.Harmony.Sample;

public static class CrdtSampleKernel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Entities;
using SIL.Harmony.Changes;
using SIL.Harmony.Entities;

namespace Crdt.Sample.Models;
namespace SIL.Harmony.Sample.Models;

public class Definition : IObjectBase<Definition>, IOrderableCrdt
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.Text.Json.Serialization;
using Crdt.Core;
using Crdt.Entities;
using SIL.Harmony.Entities;
using Ycs;

namespace Crdt.Sample.Models;
namespace SIL.Harmony.Sample.Models;

public class Example: IObjectBase<Example>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Crdt.Core;
using Crdt.Entities;
using SIL.Harmony.Entities;

namespace Crdt.Sample.Models;
namespace SIL.Harmony.Sample.Models;

public class Word : IObjectBase<Word>
{
Expand Down
13 changes: 13 additions & 0 deletions src/SIL.Harmony.Sample/SIL.Harmony.Sample.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootNamespace>SIL.Harmony.Sample</RootNamespace>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SIL.Harmony.Linq2db\SIL.Harmony.Linq2db.csproj" />
<ProjectReference Include="..\SIL.Harmony\SIL.Harmony.csproj" />
<ProjectReference Include="..\Ycs\Ycs.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Crdt.Changes;
using Crdt.Core;
using Crdt.Db;
using SIL.Harmony.Changes;
using SIL.Harmony.Core;
using SIL.Harmony.Db;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;

namespace Crdt.Sample;
namespace SIL.Harmony.Sample;

public class SampleDbContext(DbContextOptions<SampleDbContext>options, IOptions<CrdtConfig> crdtConfig): DbContext(options), ICrdtDbContext
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.IO.Hashing;
using System.Text.Json;
using Crdt.Changes;
using Crdt.Core;
using Crdt.Sample;
using Crdt.Sample.Changes;
using SIL.Harmony.Changes;
using SIL.Harmony.Core;
using SIL.Harmony.Sample;
using SIL.Harmony.Sample.Changes;
using Microsoft.Extensions.DependencyInjection;

namespace Crdt.Tests;
namespace SIL.Harmony.Tests;

public class CommitTests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Crdt.Sample.Models;
using SIL.Harmony.Sample.Models;

namespace Crdt.Tests;
namespace SIL.Harmony.Tests;

public class DataModelIntegrityTests : DataModelTestBase
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Crdt.Changes;
using Crdt.Sample.Changes;
using Crdt.Sample.Models;
using Crdt.Tests;
using SIL.Harmony.Changes;
using SIL.Harmony.Sample.Changes;
using SIL.Harmony.Sample.Models;
using SIL.Harmony.Tests;

namespace Tests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
using Argon;
using Crdt;
using Crdt.Changes;
using Crdt.Core;
using Crdt.Db;
using Crdt.Sample.Changes;
using Crdt.Sample.Models;
using Crdt.Tests;
using SIL.Harmony;
using SIL.Harmony.Changes;
using SIL.Harmony.Db;
using SIL.Harmony.Sample.Changes;
using SIL.Harmony.Sample.Models;
using SIL.Harmony.Tests;
using Microsoft.EntityFrameworkCore;

namespace Tests;
Expand Down
Loading

0 comments on commit 803b3bd

Please sign in to comment.