Skip to content

Commit fe29b6c

Browse files
mikependonmikependon
committed
Removed the 6, 7 and 9 from the TFM. Minor updates to the Database setup to be compliant with the localized Docker instances of the SQL Server.
1 parent 9458767 commit fe29b6c

10 files changed

Lines changed: 19 additions & 24 deletions

File tree

‎RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Setup/Database.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@ public static void Initialize()
1717
ConnectionStringForMaster =
1818
Environment.GetEnvironmentVariable("REPODB_SQLSERVER_CONSTR_MASTER")
1919
?? Environment.GetEnvironmentVariable("REPODB_CONSTR_MASTER")
20-
// ?? "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;" // Docker test configuration
21-
?? "Server=(local);Database=master;Integrated Security=SSPI;TrustServerCertificate=True;";
20+
?? "Server=tcp:127.0.0.1,41433;Database=master;User ID=sa;Password=RepoDB2026;TrustServerCertificate=True;";
2221

2322
// RepoDb connection
2423
ConnectionStringForRepoDb =
2524
Environment.GetEnvironmentVariable("REPODB_SQLSERVER_CONSTR_REPODB")
2625
?? Environment.GetEnvironmentVariable("REPODB_CONSTR")
27-
// ?? "Server=tcp:127.0.0.1,41433;Database=RepoDb;User ID=sa;Password=ddd53e85-b15e-4da8-91e5-a7d3b00a0ab2;TrustServerCertificate=True;" // Docker test configuration
28-
?? "Server=(local);Database=RepoDb;Integrated Security=SSPI;TrustServerCertificate=True;";
26+
?? "Server=tcp:127.0.0.1,41433;Database=RepoDb;User ID=sa;Password=RepoDB2026;TrustServerCertificate=True;";
2927

3028
// Set the proper values for type mapper
3129
TypeMapper.Add(typeof(DateTime), System.Data.DbType.DateTime2, true);

‎RepoDb.Core/RepoDb/RepoDb.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDB</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid ORM library for .NET.</Description>
77
<PackageTags>orm hybrid-orm micro-orm</PackageTags>
88
<PackageReleaseNotes>http://repodb.net/release/core</PackageReleaseNotes>
99
<PackageProjectUrl>https://repodb.net/</PackageProjectUrl>
1010
<RepositoryUrl>https://github.com/mikependon/RepoDb/tree/master/RepoDb.Core</RepositoryUrl>
1111
</PropertyGroup>
12-
<PropertyGroup>
13-
<!-- Disable some nullability for netstandard2.0, as some smart annotations are not available there -->
14-
<NoWarn Condition="'$(TargetFramework)' == 'netstandard2.0'">$(NoWarn);CS8604</NoWarn>
15-
</PropertyGroup>
1612
<ItemGroup>
1713
<Compile Remove="Reflection\DataCommand.cs" />
1814
<Compile Remove="Reflection\DelegateCache.cs" />
@@ -21,8 +17,6 @@
2117
</ItemGroup>
2218
<ItemGroup>
2319
<PackageReference Include="System.ComponentModel.Annotations" />
24-
<PackageReference Include="System.Data.Common" />
25-
<PackageReference Include="System.Dynamic.Runtime" />
2620
<PackageReference Include="System.Linq.Async" />
2721
<PackageReference Include="System.Reflection.Emit" />
2822
<PackageReference Include="System.Reflection.Emit.Lightweight" />
@@ -34,6 +28,9 @@
3428
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
3529
<PackageReference Include="System.Memory" />
3630
</ItemGroup>
31+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
32+
<PackageReference Remove="System.Linq.Async" />
33+
</ItemGroup>
3734
<ItemGroup>
3835
<None Include="..\..\LICENSE.txt" Pack="True" PackagePath="\" />
3936
<None Include="..\README.md" Pack="True" PackagePath="\" />

‎RepoDb.Extensions/RepoDb.PostgreSql.BulkOperations/RepoDb.PostgreSql.BulkOperations/RepoDb.PostgreSql.BulkOperations.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.PostgreSql.BulkOperations</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>An extension library that contains the official Bulk Operations of RepoDb for PostgreSQL.</Description>
77
<PackageTags>orm hybrid-orm micro-orm postgresql bulkoperations</PackageTags>

‎RepoDb.Extensions/RepoDb.SqlServer.BulkOperations/RepoDb.SqlServer.BulkOperations/RepoDb.SqlServer.BulkOperations.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.SqlServer.BulkOperations</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>An extension library that contains the official Bulk Operations of RepoDb for SQL Server.</Description>
77
<PackageTags>orm hybrid-orm micro-orm sqlserver bulkoperations</PackageTags>
@@ -13,12 +13,12 @@
1313
<EmbeddedResource Remove="System.Data.SqlClient\**" />
1414
<None Remove="System.Data.SqlClient\**" />
1515
</ItemGroup>
16-
<ItemGroup>
17-
<PackageReference Include="System.Linq.Async" />
18-
</ItemGroup>
1916
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2017
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
2118
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
20+
<PackageReference Remove="System.Linq.Async" />
21+
</ItemGroup>
2222
<ItemGroup>
2323
<None Include="..\..\..\LICENSE.txt" Pack="True" PackagePath="\" />
2424
<None Include="..\README.md" Pack="True" PackagePath="\" />

‎RepoDb.MySql/RepoDb.MySql/RepoDb.MySql.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.MySql</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for MySQL (using MySql.Data).</Description>
77
<PackageTags>orm hybrid-orm micro-orm mysql</PackageTags>

‎RepoDb.MySqlConnector/RepoDb.MySqlConnector/RepoDb.MySqlConnector.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.MySqlConnector</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for MySQL (using MySqlConnector).</Description>
77
<PackageTags>orm hybrid-orm micro-orm mysql mysqlconnector</PackageTags>
@@ -22,4 +22,4 @@
2222
<ItemGroup>
2323
<ProjectReference Include="..\..\RepoDb.Core\RepoDb\RepoDb.csproj" />
2424
</ItemGroup>
25-
</Project>
25+
</Project>

‎RepoDb.PostgreSql/RepoDb.PostgreSql/RepoDb.PostgreSql.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.PostgreSql</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for PostgreSQL.</Description>
77
<PackageTags>orm hybrid-orm micro-orm postgresql npgsql</PackageTags>

‎RepoDb.SQLite.System/RepoDb.SQLite.System/RepoDb.SQLite.System.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.SQLite.System</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for SQLite (using System.Data.SQLite.Core).</Description>
77
<PackageTags>orm hybrid-orm micro-orm sqlite</PackageTags>

‎RepoDb.SqlServer/RepoDb.SqlServer/RepoDb.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.SqlServer</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for SQL Server.</Description>
77
<PackageTags>orm hybrid-orm micro-orm sqlserver</PackageTags>

‎RepoDb.Sqlite.Microsoft/RepoDb.Sqlite.Microsoft/RepoDb.Sqlite.Microsoft.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Title>RepoDb.Sqlite.Microsoft</Title>
4-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<Nullable>annotations</Nullable>
66
<Description>A hybrid .NET ORM library for SQLite (using Microsoft.Data.Sqlite).</Description>
77
<PackageTags>orm hybrid-orm micro-orm sqlite</PackageTags>

0 commit comments

Comments
 (0)