Skip to content

Commit 7aa8d07

Browse files
Lanning, MarkLanning, Mark
Lanning, Mark
authored and
Lanning, Mark
committed
Update .NET targets, metadata, and remove .editorconfig
Updated project files to target .NET 10.0, added packaging metadata, and removed repository information from several `.csproj` files. Removed `.editorconfig`, affecting code style enforcement. Refactored `AddDatabaseSqlServer` method in `Database.cs` and improved logging. Updated copyright years to 2025.
1 parent bb4faff commit 7aa8d07

File tree

21 files changed

+62
-311
lines changed

21 files changed

+62
-311
lines changed

‎Base/src/ThingsLibrary.Base/ThingsLibrary.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
<Authors>Mark Lanning</Authors>
2020
<Company>Starlight Software Co.</Company>
21-
22-
<RepositoryType>git</RepositoryType>
23-
<RepositoryUrl>https://github.com/things-library/Frameworks</RepositoryUrl>
2421
</PropertyGroup>
2522

2623
<ItemGroup>

‎Database/src/ThingsLibrary.Database.Cosmos/ThingsLibrary.Database.Cosmos.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7+
<IsPackable>true</IsPackable>
8+
9+
<UserSecretsId>10000000-1000-1000-1000-100000000001</UserSecretsId>
710
</PropertyGroup>
811

12+
<PropertyGroup>
13+
<PackageId>ThingsLibrary.Database.Cosmos</PackageId>
14+
<PackageDescription>Things Library Azure Cosmos database libraries and wrappers.</PackageDescription>
15+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16+
17+
<ProductName>ThingsLibrary.Database.Cosmos</ProductName>
18+
<Title>Things Library Cosmos Services Framework Library</Title>
19+
<Description>This is the shared foundational library</Description>
20+
21+
<Authors>Mark Lanning</Authors>
22+
<Company>Starlight Software Co.</Company>
23+
</PropertyGroup>
24+
925
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="8.0.8" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.11" />
1127
</ItemGroup>
1228

1329
<ItemGroup>

‎Database/src/ThingsLibrary.Database.Mongo/ThingsLibrary.Database.Mongo.csproj‎

Lines changed: 8 additions & 4 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>
@@ -11,20 +11,24 @@
1111

1212
<PropertyGroup>
1313
<PackageId>ThingsLibrary.Database.Mongo</PackageId>
14+
<PackageDescription>Things Library database libraries and wrappers.</PackageDescription>
15+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16+
1417
<ProductName>ThingsLibrary.Database.Mongo</ProductName>
1518
<Title>ThingsLibrary Mongo Services Framework Library</Title>
1619
<Description>This is the shared foundational library</Description>
1720

1821
<Authors>Mark Lanning</Authors>
1922
<Company>Starlight Software Co.</Company>
20-
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/things-library/Frameworks</RepositoryUrl>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
2626
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
2727
<PackageReference Include="MongoDB.EntityFrameworkCore" Version="9.0.0" />
2828
</ItemGroup>
2929

30+
<ItemGroup>
31+
<ProjectReference Include="..\ThingsLibrary.Database\ThingsLibrary.Database.csproj" />
32+
</ItemGroup>
33+
3034
</Project>

‎Database/src/ThingsLibrary.Database.SqlServer/Extensions/Database.cs‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.Data.SqlClient;
99
using Serilog;
1010
using ThingsLibrary.Schema.Library;
11+
using ThingsLibrary.Schema.Library.Extensions;
1112
using ThingsLibrary.Services.Extensions;
1213

1314
namespace ThingsLibrary.Database.SqlServer.Extensions
@@ -25,38 +26,19 @@ public static class DatabaseExtensions
2526
/// <exception cref="ArgumentException"></exception>
2627
public static void AddDatabaseSqlServer<TContext>(this IServiceCollection services, ItemDto canvas, string canvasResourceKey, IConfiguration configuration) where TContext : DataContext
2728
{
28-
if (canvas.TryGetItem(canvasResourceKey, out var dataverseOptions))
29+
if (canvas.TryGetItemTag(canvasResourceKey, "connection_string_variable", out var connectionStringKey))
2930
{
3031
Log.Information("+ Catalog Services");
31-
var connectionStringKey = dataverseOptions["connection_string_variable"] ?? throw new ArgumentException($"Missing connection string variable in '{canvasResourceKey}'.");
32+
var connectionString = configuration.TryGetConnectionString(connectionStringKey);
3233

33-
services.AddDatabaseSqlServer<TContext>(configuration, connectionStringKey);
34+
services.AddDatabaseSqlServer<TContext>(connectionString);
3435
}
3536
else
3637
{
37-
throw new ArgumentException($"Service canvas missing settings at '{canvasResourceKey}'");
38+
throw new ArgumentException($"Service canvas missing 'connection_string_variable' at '{canvasResourceKey}'");
3839
}
3940
}
4041

41-
/// <summary>
42-
/// Add SQL Server Database
43-
/// </summary>
44-
/// <param name="services">Service Collection</param>
45-
/// <param name="configuration">Configuration</param>
46-
/// <param name="parameterName">Full Parameter Name</param>
47-
/// <returns></returns>
48-
/// <exception cref="ArgumentException"></exception>
49-
public static IServiceCollection AddDatabaseSqlServer<TContext>(this IServiceCollection services, IConfiguration configuration, string parameterName) where TContext : Database.DataContext
50-
{
51-
ArgumentNullException.ThrowIfNullOrEmpty(parameterName);
52-
53-
var connectionString = configuration.TryGetConnectionString(parameterName);
54-
55-
services.AddDatabaseSqlServer<TContext>(connectionString);
56-
57-
return services;
58-
}
59-
6042
/// <summary>
6143
/// Add SQL Server Database
6244
/// </summary>
@@ -71,9 +53,8 @@ public static IServiceCollection AddDatabaseSqlServer<TContext>(this IServiceCol
7153
{
7254
Log.Information("Testing SQL Connection to {DatabaseServer}...", connection.DataSource);
7355
connection.Open();
74-
75-
Log.Information("+ SQL Server: {DatabaseServer}", connection.DataSource);
76-
Log.Information("+ SQL Database: {DatabaseName}", connection.Database);
56+
57+
Log.Information("+ SQL Database: {DatabaseName} ({DatabaseServer})", connection.Database, connection.DataSource);
7758
}
7859

7960
services.AddDbContext<TContext>(builder => builder.Configure<TContext>(connectionString));

‎Database/src/ThingsLibrary.Database.SqlServer/ThingsLibrary.Database.SqlServer.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<IsPackable>true</IsPackable>
88

99
<UserSecretsId>10000000-1000-1000-1000-100000000001</UserSecretsId>
10+
<UserSecretsId2>f8b96568-1250-4f34-95d6-3e17a62c1f55</UserSecretsId2>
1011
</PropertyGroup>
1112

1213
<PropertyGroup>
@@ -19,11 +20,7 @@
1920
<Description>This is the shared foundational library</Description>
2021

2122
<Authors>Mark Lanning</Authors>
22-
<Company>Starlight Software Co.</Company>
23-
24-
<RepositoryType>git</RepositoryType>
25-
<RepositoryUrl>https://github.com/things-library/Frameworks</RepositoryUrl>
26-
<UserSecretsId>f8b96568-1250-4f34-95d6-3e17a62c1f55</UserSecretsId>
23+
<Company>Starlight Software Co.</Company>
2724
</PropertyGroup>
2825

2926
<ItemGroup>

0 commit comments

Comments
 (0)