From d17470f568cc6b63b902d098bb5854618028d51a Mon Sep 17 00:00:00 2001 From: Bill Forney Date: Tue, 8 Jul 2025 22:45:37 -0700 Subject: [PATCH 1/3] Update target framework to v4.8 for all projects This commit updates the target framework version from v4.5 to v4.8 for the following projects: Massive.MySql, Massive.Oracle, Massive.PostgreSql, Massive.SqlServer, and Massive.Sqlite. Additionally, an extraneous line has been removed from the Massive.Sqlite.csproj file to correct a formatting issue. --- src/Massive.MySql.csproj | 2 +- src/Massive.Oracle.csproj | 2 +- src/Massive.PostgreSql.csproj | 2 +- src/Massive.SqlServer.csproj | 2 +- src/Massive.Sqlite.csproj | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Massive.MySql.csproj b/src/Massive.MySql.csproj index c5dfb19..b21b59f 100644 --- a/src/Massive.MySql.csproj +++ b/src/Massive.MySql.csproj @@ -9,7 +9,7 @@ Properties Massive.MySql Massive.MySql - v4.5 + v4.8 512 diff --git a/src/Massive.Oracle.csproj b/src/Massive.Oracle.csproj index 1dda934..1fdf210 100644 --- a/src/Massive.Oracle.csproj +++ b/src/Massive.Oracle.csproj @@ -9,7 +9,7 @@ Properties Massive.Oracle Massive.Oracle - v4.5 + v4.8 512 diff --git a/src/Massive.PostgreSql.csproj b/src/Massive.PostgreSql.csproj index b88f88b..5983acb 100644 --- a/src/Massive.PostgreSql.csproj +++ b/src/Massive.PostgreSql.csproj @@ -9,7 +9,7 @@ Properties Massive.PostgreSql Massive.PostgreSql - v4.5 + v4.8 512 diff --git a/src/Massive.SqlServer.csproj b/src/Massive.SqlServer.csproj index ef98b86..3d4b6f2 100644 --- a/src/Massive.SqlServer.csproj +++ b/src/Massive.SqlServer.csproj @@ -9,7 +9,7 @@ Properties Massive.SqlServer Massive.SqlServer - v4.5 + v4.8 512 diff --git a/src/Massive.Sqlite.csproj b/src/Massive.Sqlite.csproj index 8fcdebe..4d656b2 100644 --- a/src/Massive.Sqlite.csproj +++ b/src/Massive.Sqlite.csproj @@ -9,7 +9,7 @@ Properties Massive.Sqlite Massive.Sqlite - v4.5 + v4.8 512 @@ -58,4 +58,4 @@ --> - + \ No newline at end of file From de2952caedd3529f1d373025837df12be19967b8 Mon Sep 17 00:00:00 2001 From: Bill Forney Date: Tue, 8 Jul 2025 23:29:39 -0700 Subject: [PATCH 2/3] Update projects to SDK-style format targeting .NET 9.0 Refactor project files for MySql, Oracle, PostgreSQL, SqlServer, and Sqlite to use the new SDK-style format, enhancing compatibility with modern .NET tooling. Add `Directory.Build.props` for centralized project properties, including product information and assembly versioning. Remove assembly description attributes from individual assembly info files and clean up `SharedAssemblyInfo.cs` by consolidating assembly attributes. Update the solution file to reflect the new Visual Studio version (2013 to 2022) and adjust `Compile` items to streamline project structure. Add package references for `System.Configuration.ConfigurationManager` to ensure necessary dependencies are included. --- src/Directory.Build.props | 12 ++++ src/Massive.MySql.csproj | 74 +++++---------------- src/Massive.Oracle.csproj | 74 +++++---------------- src/Massive.PostgreSql.csproj | 74 +++++---------------- src/Massive.SqlServer.csproj | 85 ++++++++---------------- src/Massive.Sqlite.csproj | 75 +++++---------------- src/Massive.sln | 4 +- src/Properties/MySqlAssemblyInfo.cs | 2 - src/Properties/OracleAssemblyInfo.cs | 2 - src/Properties/PostgreSqlAssemblyInfo.cs | 2 - src/Properties/SQLiteAssemblyInfo.cs | 2 - src/Properties/SharedAssemblyInfo.cs | 10 --- src/Properties/SqlServerAssemblyInfo.cs | 2 - 13 files changed, 100 insertions(+), 318 deletions(-) create mode 100644 src/Directory.Build.props delete mode 100644 src/Properties/MySqlAssemblyInfo.cs delete mode 100644 src/Properties/OracleAssemblyInfo.cs delete mode 100644 src/Properties/PostgreSqlAssemblyInfo.cs delete mode 100644 src/Properties/SQLiteAssemblyInfo.cs delete mode 100644 src/Properties/SqlServerAssemblyInfo.cs diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..a1630e2 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,12 @@ + + + + Massive + Massive + Copyright © 2009-2025 various contributors + 2.0.0.0 + 2.0.16.0127 + en-US + true + + \ No newline at end of file diff --git a/src/Massive.MySql.csproj b/src/Massive.MySql.csproj index b21b59f..029beff 100644 --- a/src/Massive.MySql.csproj +++ b/src/Massive.MySql.csproj @@ -1,60 +1,16 @@ - - - - - Debug - AnyCPU - {517CFB4F-92FA-4752-B794-CE4AD58E4E30} - Library - Properties - Massive.MySql - Massive.MySql - v4.8 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - + + + net9.0 + Library + Micro ORM to query and manage data in MySql + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.Oracle.csproj b/src/Massive.Oracle.csproj index 1fdf210..627db4c 100644 --- a/src/Massive.Oracle.csproj +++ b/src/Massive.Oracle.csproj @@ -1,60 +1,16 @@ - - - - - Debug - AnyCPU - {18960910-2074-4DF2-A7FF-3C1914439386} - Library - Properties - Massive.Oracle - Massive.Oracle - v4.8 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - + + + net9.0 + Library + Micro ORM to query and manage data in Oracle + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.PostgreSql.csproj b/src/Massive.PostgreSql.csproj index 5983acb..97ebdbc 100644 --- a/src/Massive.PostgreSql.csproj +++ b/src/Massive.PostgreSql.csproj @@ -1,60 +1,16 @@ - - - - - Debug - AnyCPU - {0349466C-7843-47AB-82CC-6A837BD41227} - Library - Properties - Massive.PostgreSql - Massive.PostgreSql - v4.8 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - + + + net9.0 + Library + Micro ORM to query and manage data in PostgreSQL + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.SqlServer.csproj b/src/Massive.SqlServer.csproj index 3d4b6f2..04c249e 100644 --- a/src/Massive.SqlServer.csproj +++ b/src/Massive.SqlServer.csproj @@ -1,60 +1,27 @@ - - - - - Debug - AnyCPU - {2B468CA9-D9AE-40CB-B7D1-EC2CC546359C} - Library - Properties - Massive.SqlServer - Massive.SqlServer - v4.8 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - + + + net9.0 + Library + Massive + Massive + Copyright © 2009-2016 various contributors + 2.0.0.0 + 2.0.16.0127 + Micro ORM to query and manage data in SQL Server + + + .NET 4.0+ + + + .NET 4.0+ + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.Sqlite.csproj b/src/Massive.Sqlite.csproj index 4d656b2..97a9d1d 100644 --- a/src/Massive.Sqlite.csproj +++ b/src/Massive.Sqlite.csproj @@ -1,61 +1,16 @@ - - - - - Debug - AnyCPU - {F8B864EA-8E35-4BD4-86A0-5ABCF44CF6C7} - Library - Properties - Massive.Sqlite - Massive.Sqlite - v4.8 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - + + + net9.0 + Library + Micro ORM to query and manage data in Sqlite + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.sln b/src/Massive.sln index 5b7d60b..739e46f 100644 --- a/src/Massive.sln +++ b/src/Massive.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36301.6 d17.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Massive.SqlServer", "Massive.SqlServer.csproj", "{2B468CA9-D9AE-40CB-B7D1-EC2CC546359C}" EndProject diff --git a/src/Properties/MySqlAssemblyInfo.cs b/src/Properties/MySqlAssemblyInfo.cs deleted file mode 100644 index a263520..0000000 --- a/src/Properties/MySqlAssemblyInfo.cs +++ /dev/null @@ -1,2 +0,0 @@ -using System.Reflection; -[assembly: AssemblyDescription("Micro ORM to query and manage data in MySQL")] diff --git a/src/Properties/OracleAssemblyInfo.cs b/src/Properties/OracleAssemblyInfo.cs deleted file mode 100644 index 1e2b67f..0000000 --- a/src/Properties/OracleAssemblyInfo.cs +++ /dev/null @@ -1,2 +0,0 @@ -using System.Reflection; -[assembly: AssemblyDescription("Micro ORM to query and manage data in Oracle")] diff --git a/src/Properties/PostgreSqlAssemblyInfo.cs b/src/Properties/PostgreSqlAssemblyInfo.cs deleted file mode 100644 index dc93da7..0000000 --- a/src/Properties/PostgreSqlAssemblyInfo.cs +++ /dev/null @@ -1,2 +0,0 @@ -using System.Reflection; -[assembly: AssemblyDescription("Micro ORM to query and manage data in PostgreSql")] diff --git a/src/Properties/SQLiteAssemblyInfo.cs b/src/Properties/SQLiteAssemblyInfo.cs deleted file mode 100644 index 19c3b12..0000000 --- a/src/Properties/SQLiteAssemblyInfo.cs +++ /dev/null @@ -1,2 +0,0 @@ -using System.Reflection; -[assembly: AssemblyDescription("Micro ORM to query and manage data in SQLite")] diff --git a/src/Properties/SharedAssemblyInfo.cs b/src/Properties/SharedAssemblyInfo.cs index ea982b5..71681b4 100644 --- a/src/Properties/SharedAssemblyInfo.cs +++ b/src/Properties/SharedAssemblyInfo.cs @@ -1,15 +1,5 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Massive")] -[assembly: AssemblyConfiguration(".NET 4.0+")] -[assembly: AssemblyProduct("Massive")] -[assembly: AssemblyCopyright("Copyright © 2009-2016 various contributors")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] - -// version -[assembly: AssemblyVersion("2.0.0.0")] -// version + builddate (yy.mmdd) -[assembly: AssemblyFileVersion("2.0.16.0127")] diff --git a/src/Properties/SqlServerAssemblyInfo.cs b/src/Properties/SqlServerAssemblyInfo.cs deleted file mode 100644 index c13bcf8..0000000 --- a/src/Properties/SqlServerAssemblyInfo.cs +++ /dev/null @@ -1,2 +0,0 @@ -using System.Reflection; -[assembly: AssemblyDescription("Micro ORM to query and manage data in SQL Server")] From fe43881ff136425617f99b866d10800c50276194 Mon Sep 17 00:00:00 2001 From: Bill Forney Date: Tue, 8 Jul 2025 23:33:33 -0700 Subject: [PATCH 3/3] Refactor project files and update package management Updated `Directory.Build.props` to enhance assembly metadata and added `Directory.Packages.props` for centralized package version management. Simplified project files for MySql, Oracle, PostgreSql, SqlServer, and Sqlite by removing specific version numbers for `System.Configuration.ConfigurationManager`, allowing for more flexible dependency management. --- src/Directory.Build.props | 9 ++++---- src/Directory.Packages.props | 10 +++++++++ src/Massive.MySql.csproj | 28 ++++++++++++------------ src/Massive.Oracle.csproj | 28 ++++++++++++------------ src/Massive.PostgreSql.csproj | 28 ++++++++++++------------ src/Massive.SqlServer.csproj | 41 +++++++++++++---------------------- src/Massive.Sqlite.csproj | 28 ++++++++++++------------ 7 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 src/Directory.Packages.props diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a1630e2..8f3c4a8 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,12 +1,13 @@ - Massive - Massive - Copyright © 2009-2025 various contributors + Massive 2.0.0.0 + Copyright © 2009-2025 various contributors 2.0.16.0127 - en-US true + en-US + Massive + Massive \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 0000000..2d58ef9 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,10 @@ + + + true + true + $(NoWarn);NU1507 + + + + + \ No newline at end of file diff --git a/src/Massive.MySql.csproj b/src/Massive.MySql.csproj index 029beff..0334466 100644 --- a/src/Massive.MySql.csproj +++ b/src/Massive.MySql.csproj @@ -1,16 +1,16 @@  - - net9.0 - Library - Micro ORM to query and manage data in MySql - - - - - - - - - - + + net9.0 + Library + Micro ORM to query and manage data in MySql + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.Oracle.csproj b/src/Massive.Oracle.csproj index 627db4c..e2ecbec 100644 --- a/src/Massive.Oracle.csproj +++ b/src/Massive.Oracle.csproj @@ -1,16 +1,16 @@  - - net9.0 - Library - Micro ORM to query and manage data in Oracle - - - - - - - - - - + + net9.0 + Library + Micro ORM to query and manage data in Oracle + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.PostgreSql.csproj b/src/Massive.PostgreSql.csproj index 97ebdbc..de21f9b 100644 --- a/src/Massive.PostgreSql.csproj +++ b/src/Massive.PostgreSql.csproj @@ -1,16 +1,16 @@  - - net9.0 - Library - Micro ORM to query and manage data in PostgreSQL - - - - - - - - - - + + net9.0 + Library + Micro ORM to query and manage data in PostgreSQL + + + + + + + + + + \ No newline at end of file diff --git a/src/Massive.SqlServer.csproj b/src/Massive.SqlServer.csproj index 04c249e..622ab76 100644 --- a/src/Massive.SqlServer.csproj +++ b/src/Massive.SqlServer.csproj @@ -1,27 +1,16 @@  - - net9.0 - Library - Massive - Massive - Copyright © 2009-2016 various contributors - 2.0.0.0 - 2.0.16.0127 - Micro ORM to query and manage data in SQL Server - - - .NET 4.0+ - - - .NET 4.0+ - - - - - - - - - - - \ No newline at end of file + + net9.0 + Library + Micro ORM to query and manage data in SQL Server + + + + + + + + + + + diff --git a/src/Massive.Sqlite.csproj b/src/Massive.Sqlite.csproj index 97a9d1d..1a02abf 100644 --- a/src/Massive.Sqlite.csproj +++ b/src/Massive.Sqlite.csproj @@ -1,16 +1,16 @@  - - net9.0 - Library - Micro ORM to query and manage data in Sqlite - - - - - - - - - - + + net9.0 + Library + Micro ORM to query and manage data in Sqlite + + + + + + + + + + \ No newline at end of file