From 2d0fab871065e5ff38dcb3ecbba7c575b39d01f3 Mon Sep 17 00:00:00 2001 From: Brenno Gomes Date: Tue, 6 Feb 2024 17:58:26 -0300 Subject: [PATCH 1/5] feat: Bumps version to dotnet 8 --- src/StrangerData.SqlServer/SqlServerDialect.cs | 8 ++++++-- .../StrangerData.SqlServer.csproj | 10 +++++----- .../StrangerData.SqlServer.nuspec | 10 +++++----- src/StrangerData/StrangerData.csproj | 14 +++++++------- src/StrangerData/StrangerData.nuspec | 16 ++++++++-------- .../StrangerData.UnitTests.csproj | 2 +- 6 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/StrangerData.SqlServer/SqlServerDialect.cs b/src/StrangerData.SqlServer/SqlServerDialect.cs index 4ef84ce..0aba007 100644 --- a/src/StrangerData.SqlServer/SqlServerDialect.cs +++ b/src/StrangerData.SqlServer/SqlServerDialect.cs @@ -1,6 +1,10 @@ -using System; -using System.Collections.Generic; +#if NET452 using System.Data.SqlClient; +#elif NET8_0_OR_GREATER +using Microsoft.Data.SqlClient; +#endif +using System; +using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj index 9faa3ae..1df4650 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj @@ -2,11 +2,11 @@ MS SQL Server Dialect for StrangerData data generator. - StoneCo 2021 + StoneCo 2024 StrangerData - SQL Server Dialect - 100.0.1 + 100.1.0 Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;netcoreapp1.0 + net452;net8.0 StrangerData.SqlServer StrangerData.SqlServer fixture;data-builder;fake-data;test-data;integration-test @@ -28,8 +28,8 @@ - - + + diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec b/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec index cb86e5e..487d73a 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec @@ -2,26 +2,26 @@ StrangerData.SqlServer - 100.0.1 + 100.1.0 Pedro Henrique B. Fernandes Buy4 https://github.com/stone-pagamentos/StrangerData - https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE + https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE false StrangerData - SQL Server Dialect MS SQL Server Dialect for StrangerData data generator. MS SQL Server Dialect for StrangerData data generator. - StoneCo 2021 + StoneCo 2024 fixture data-builder fake-data test-data integration-test - + - + diff --git a/src/StrangerData/StrangerData.csproj b/src/StrangerData/StrangerData.csproj index fe77f5e..116362f 100644 --- a/src/StrangerData/StrangerData.csproj +++ b/src/StrangerData/StrangerData.csproj @@ -2,11 +2,11 @@ Automatically fills your testing database with random generated data. - StoneCo 2021 + StoneCo 2024 StrangerData - 100.0.1 + 100.1.0 Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;netcoreapp1.0 + net452;net8.0 StrangerData StrangerData fixture;data-builder;fake-data;test-data;integration-test @@ -23,10 +23,10 @@ - - - - + + + + diff --git a/src/StrangerData/StrangerData.nuspec b/src/StrangerData/StrangerData.nuspec index f518a6d..cf280cb 100644 --- a/src/StrangerData/StrangerData.nuspec +++ b/src/StrangerData/StrangerData.nuspec @@ -2,27 +2,27 @@ StrangerData - 100.0.1 + 100.1.0 Pedro Henrique B. Fernandes Buy4 https://github.com/stone-pagamentos/StrangerData - https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE + https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE false StrangerData A .NET database populator for testing purposes. Automatically fills your testing database with random generated data. - StoneCo 2021 + StoneCo 2024 fixture data-builder fake-data test-data integration-test - - - - + + + + - + diff --git a/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj b/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj index 9882b21..bb901fe 100644 --- a/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj +++ b/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj @@ -20,7 +20,7 @@ - + From 6631ddc75ea1c08a827b5547d003c20714ca7a07 Mon Sep 17 00:00:00 2001 From: Mateus Dalepiane Date: Thu, 8 Feb 2024 15:30:24 -0300 Subject: [PATCH 2/5] Add netstandard2.0 target framework --- src/StrangerData.SqlServer/SqlServerDialect.cs | 6 +++--- src/StrangerData.SqlServer/StrangerData.SqlServer.csproj | 7 ++++++- src/StrangerData/StrangerData.csproj | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/StrangerData.SqlServer/SqlServerDialect.cs b/src/StrangerData.SqlServer/SqlServerDialect.cs index 0aba007..ae5073b 100644 --- a/src/StrangerData.SqlServer/SqlServerDialect.cs +++ b/src/StrangerData.SqlServer/SqlServerDialect.cs @@ -1,7 +1,7 @@ -#if NET452 -using System.Data.SqlClient; -#elif NET8_0_OR_GREATER +#if NET8_0_OR_GREATER using Microsoft.Data.SqlClient; +#else +using System.Data.SqlClient; #endif using System; using System.Collections.Generic; diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj index 1df4650..9142761 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj @@ -6,7 +6,7 @@ StrangerData - SQL Server Dialect 100.1.0 Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;net8.0 + net452;netstandard2.0;net8.0 StrangerData.SqlServer StrangerData.SqlServer fixture;data-builder;fake-data;test-data;integration-test @@ -28,6 +28,11 @@ + + + + + diff --git a/src/StrangerData/StrangerData.csproj b/src/StrangerData/StrangerData.csproj index 116362f..56e949d 100644 --- a/src/StrangerData/StrangerData.csproj +++ b/src/StrangerData/StrangerData.csproj @@ -6,7 +6,7 @@ StrangerData 100.1.0 Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;net8.0 + net452;netstandard2.0;net8.0 StrangerData StrangerData fixture;data-builder;fake-data;test-data;integration-test @@ -23,7 +23,7 @@ - + From 9ca4e2f64592b62aeaca78adb8a6a31168883505 Mon Sep 17 00:00:00 2001 From: Mateus Dalepiane Date: Thu, 8 Feb 2024 15:34:08 -0300 Subject: [PATCH 3/5] Update all packages --- .../StrangerData.SqlServer.csproj | 4 ++-- .../StrangerData.UnitTests.csproj | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj index 9142761..c0fe2a4 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj @@ -23,13 +23,13 @@ - + - + diff --git a/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj b/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj index bb901fe..028f5f5 100644 --- a/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj +++ b/test/StrangerData.UnitTests/StrangerData.UnitTests.csproj @@ -1,8 +1,8 @@ - + 100.0.0 - net452 + net462 StrangerData.UnitTests StrangerData.UnitTests true @@ -16,12 +16,15 @@ - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - + From d8da5956c05c1dbf99d40e6f829ceb5983744103 Mon Sep 17 00:00:00 2001 From: Mateus Dalepiane Date: Thu, 8 Feb 2024 16:16:32 -0300 Subject: [PATCH 4/5] Move nuget metadata to csproj files --- .../StrangerData.SqlServer.csproj | 24 ++++++++++------ .../StrangerData.SqlServer.nuspec | 27 ------------------ src/StrangerData/StrangerData.csproj | 23 +++++++++------ src/StrangerData/StrangerData.nuspec | 28 ------------------- 4 files changed, 30 insertions(+), 72 deletions(-) delete mode 100644 src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec delete mode 100644 src/StrangerData/StrangerData.nuspec diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj index c0fe2a4..343b4ec 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj @@ -1,17 +1,24 @@ - + + + StrangerData + 101.0.0 + StrangerData + Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane + https://github.com/stone-pagamentos/StrangerData/master/LICENSE + https://github.com/stone-pagamentos/StrangerData MS SQL Server Dialect for StrangerData data generator. StoneCo 2024 + fixture;data-builder;fake-data;test-data;integration-test + false + + + + StrangerData - SQL Server Dialect - 100.1.0 - Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;netstandard2.0;net8.0 StrangerData.SqlServer - StrangerData.SqlServer - fixture;data-builder;fake-data;test-data;integration-test - https://github.com/stone-pagamentos/StrangerData - https://github.com/stone-pagamentos/StrangerData/blob/master/LICENSE + net452;netstandard2.0;net8.0 false false false @@ -21,7 +28,6 @@ - diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec b/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec deleted file mode 100644 index 487d73a..0000000 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.nuspec +++ /dev/null @@ -1,27 +0,0 @@ - - - - StrangerData.SqlServer - 100.1.0 - Pedro Henrique B. Fernandes - Buy4 - https://github.com/stone-pagamentos/StrangerData - https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE - false - StrangerData - SQL Server Dialect - MS SQL Server Dialect for StrangerData data generator. - MS SQL Server Dialect for StrangerData data generator. - - StoneCo 2024 - fixture data-builder fake-data test-data integration-test - - - - - - - - - - - diff --git a/src/StrangerData/StrangerData.csproj b/src/StrangerData/StrangerData.csproj index 56e949d..a9a5ed7 100644 --- a/src/StrangerData/StrangerData.csproj +++ b/src/StrangerData/StrangerData.csproj @@ -1,17 +1,24 @@ - Automatically fills your testing database with random generated data. + + StrangerData + 101.0.0 + StrangerData + Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane + https://github.com/stone-pagamentos/StrangerData/master/LICENSE + https://github.com/stone-pagamentos/StrangerData + Automatically fills your testing database with random generated data for testing purposes. StoneCo 2024 + fixture;data-builder;fake-data;test-data;integration-test + false + + + + StrangerData - 100.1.0 - Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane - net452;netstandard2.0;net8.0 StrangerData - StrangerData - fixture;data-builder;fake-data;test-data;integration-test - https://github.com/stone-pagamentos/StrangerData - https://github.com/stone-pagamentos/StrangerData/blob/master/LICENSE + net452;netstandard2.0;net8.0 false false false diff --git a/src/StrangerData/StrangerData.nuspec b/src/StrangerData/StrangerData.nuspec deleted file mode 100644 index cf280cb..0000000 --- a/src/StrangerData/StrangerData.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - StrangerData - 100.1.0 - Pedro Henrique B. Fernandes - Buy4 - https://github.com/stone-pagamentos/StrangerData - https://raw.githubusercontent.com/stone-pagamentos/StrangerData/master/LICENSE - false - StrangerData - A .NET database populator for testing purposes. - Automatically fills your testing database with random generated data. - - StoneCo 2024 - fixture data-builder fake-data test-data integration-test - - - - - - - - - - - - From 1ce2b776f755398d8cd10292f7da4c0117f00db2 Mon Sep 17 00:00:00 2001 From: Mateus Dalepiane Date: Thu, 8 Feb 2024 16:22:28 -0300 Subject: [PATCH 5/5] Adjust project id --- src/StrangerData.SqlServer/StrangerData.SqlServer.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj index 343b4ec..5f7af1d 100644 --- a/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj +++ b/src/StrangerData.SqlServer/StrangerData.SqlServer.csproj @@ -2,7 +2,7 @@ - StrangerData + StrangerData.SqlServer 101.0.0 StrangerData Pedro Henrique B. Fernandes;Diego Anckizes;Mateus Dalepiane