Skip to content

Commit 2210b0b

Browse files
Lanning, MarkLanning, Mark
Lanning, Mark
authored and
Lanning, Mark
committed
Refactor and update project structure
Removed `ThingsLibrary.Entity.sln` and `ThingsLibrary.Storage.sln` solution files, replacing them with new `.slnx` structures to better organize projects into `/Base/` and `/Tests/` folders. Updated target frameworks to `net10.0` across multiple projects, reflecting a shift to a newer .NET version. Updated several package dependencies, including `AWSSDK.S3`, `Azure.Storage.Blobs`, and `Google.Apis.Storage.v1`, to their latest versions. Adjusted namespaces in `EntityStore.cs`, `EntityStores.cs`, and `EntityStoreFactory.cs` to align with the new project structure. Removed repository information from test projects.
1 parent 7dede97 commit 2210b0b

File tree

21 files changed

+71
-241
lines changed

21 files changed

+71
-241
lines changed

‎Entity/ThingsLibrary.Entity.sln‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎Entity/ThingsLibrary.Entity.slnx‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Solution>
2+
<Folder Name="/Base/">
3+
<Project Path="../../Schemas/src/csharp/ThingsLibrary.Schema.Library/ThingsLibrary.Schema.Library.csproj" />
4+
<Project Path="../Base/src/ThingsLibrary.Base/ThingsLibrary.csproj" />
5+
</Folder>
6+
<Folder Name="/Tests/">
7+
<Project Path="tests/ThingsLibrary.Entity.Tests/ThingsLibrary.Entity.Tests.csproj" />
8+
</Folder>
9+
<Project Path="src/ThingsLibrary.Entity.Cosmos/ThingsLibrary.Entity.Cosmos.csproj" />
10+
<Project Path="src/ThingsLibrary.Entity.Local/ThingsLibrary.Entity.Local.csproj" />
11+
<Project Path="src/ThingsLibrary.Entity.Mongo/ThingsLibrary.Entity.Mongo.csproj" />
12+
<Project Path="src/ThingsLibrary.Entity/ThingsLibrary.Entity.csproj" />
13+
</Solution>

‎Entity/src/ThingsLibrary.Entity.Cosmos/EntityStore.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
using System.Collections.Concurrent;
1+
using System.Reflection;
22
using Microsoft.Azure.Cosmos;
3+
using Serilog;
34

45
namespace ThingsLibrary.Entity.Cosmos;
56

‎Entity/src/ThingsLibrary.Entity.Cosmos/EntityStores.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Security.Authentication;
2+
using Microsoft.Azure.Cosmos;
23

3-
namespace ThingsLibrary.Entity.AzureCosmos
4+
namespace ThingsLibrary.Entity.Cosmos
45
{
56
//using Azure.Cosmos;
67

‎Entity/src/ThingsLibrary.Entity.Local/EntityStoreFactory.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Starlight.Entity.Interfaces;
2-
using Starlight.Entity.Types;
1+
using ThingsLibrary.Entity.Interfaces;
2+
using ThingsLibrary.Entity.Types;
33
using System.ComponentModel;
44

5-
namespace Starlight.Entity.Local;
5+
namespace ThingsLibrary.Entity.Local;
66

77
public class EntityStoreFactory : IEntityStoreFactory
88
{

‎Entity/src/ThingsLibrary.Entity.Mongo/EntityStores.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Security.Authentication;
2-
using Starlight.Entity.Interfaces;
3-
using Starlight.Entity.Types;
2+
using ThingsLibrary.Entity.Interfaces;
3+
using ThingsLibrary.Entity.Types;
44

5-
namespace Starlight.Entity.Mongo;
5+
namespace ThingsLibrary.Entity.Mongo;
66

77
/// <summary>
88
/// Mongo Entity Store Wrapper

‎Entity/src/ThingsLibrary.Entity.Mongo/ThingsLibrary.Entity.Mongo.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@
2525
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
2626
</ItemGroup>
2727

28+
<ItemGroup>
29+
<ProjectReference Include="..\ThingsLibrary.Entity\ThingsLibrary.Entity.csproj" />
30+
</ItemGroup>
31+
2832
</Project>

‎Storage/ThingsLibrary.Storage.sln‎

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎Storage/ThingsLibrary.Storage.slnx‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Solution>
2+
<Folder Name="/Base/">
3+
<Project Path="../../Schemas/src/csharp/ThingsLibrary.Schema.Library/ThingsLibrary.Schema.Library.csproj" />
4+
<Project Path="../Base/src/ThingsLibrary.Base/ThingsLibrary.csproj" />
5+
<Project Path="../Services/src/ThingsLibrary.Services/ThingsLibrary.Services.csproj" />
6+
</Folder>
7+
<Folder Name="/Tests/">
8+
<Project Path="tests/ThingsLibrary.Storage.Tests/ThingsLibrary.Storage.Tests.csproj" />
9+
</Folder>
10+
<Folder Name="/Tests/Integration/">
11+
<Project Path="tests-integration/ThingsLibrary.Storage.Tests.Integration.Aws/ThingsLibrary.Storage.Tests.Integration.Aws.csproj" />
12+
<Project Path="tests-integration/ThingsLibrary.Storage.Tests.Integration.Azure/ThingsLibrary.Storage.Tests.Integration.Azure.csproj" />
13+
<Project Path="tests-integration/ThingsLibrary.Storage.Tests.Integration.Gcp/ThingsLibrary.Storage.Tests.Integration.Gcp.csproj" />
14+
<Project Path="tests-integration/ThingsLibrary.Storage.Tests.Integration.Local/ThingsLibrary.Storage.Tests.Integration.Local.csproj" />
15+
<Project Path="tests-integration/ThingsLibrary.Storage.Tests.Integration/ThingsLibrary.Storage.Tests.Integration.csproj" />
16+
</Folder>
17+
<Project Path="src/ThingsLibrary.Storage.Aws/ThingsLibrary.Storage.Aws.csproj" />
18+
<Project Path="src/ThingsLibrary.Storage.Azure/ThingsLibrary.Storage.Azure.csproj" />
19+
<Project Path="src/ThingsLibrary.Storage.Gcp/ThingsLibrary.Storage.Gcp.csproj" />
20+
<Project Path="src/ThingsLibrary.Storage.Local/ThingsLibrary.Storage.Local.csproj" />
21+
<Project Path="src/ThingsLibrary.Storage/ThingsLibrary.Storage.csproj" />
22+
23+
</Solution>

‎Storage/src/ThingsLibrary.Storage.Aws/ThingsLibrary.Storage.Aws.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>true</IsPackable>
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="AWSSDK.S3" Version="4.0.2" />
23+
<PackageReference Include="AWSSDK.S3" Version="4.0.14.1" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

0 commit comments

Comments
 (0)