From 029096a6a955571c8df94844c4a28c19ea5df59e Mon Sep 17 00:00:00 2001 From: datadiode Date: Sat, 22 Aug 2020 16:32:45 +0200 Subject: [PATCH] Remove dependencies around EntityFramework / Require no better than .NET 4.0 --- AutomaticUpdates/AutomaticUpdates.csproj | 83 ------------------- AutomaticUpdates/Properties/AssemblyInfo.cs | 3 - Common/Common.csproj | 2 +- .../CreateTestDatabases.csproj | 29 ++----- CreateTestDatabases/app.config | 23 +---- CreateTestDatabases/packages.config | 10 +-- DiffControl/DiffControl.csproj | 2 +- FastGrid/FastGrid.csproj | 2 +- SQLiteParser/SQLiteParser.csproj | 2 +- SQLiteTurbo/App.config | 19 ----- SQLiteTurbo/SQLiteTurbo.csproj | 35 +++----- SQLiteTurbo/packages.config | 10 +-- Setup/setup.nsi | 40 ++++----- UndoRedo/UndoRedo.csproj | 2 +- 14 files changed, 49 insertions(+), 213 deletions(-) delete mode 100644 AutomaticUpdates/AutomaticUpdates.csproj delete mode 100644 AutomaticUpdates/Properties/AssemblyInfo.cs diff --git a/AutomaticUpdates/AutomaticUpdates.csproj b/AutomaticUpdates/AutomaticUpdates.csproj deleted file mode 100644 index c4674e2..0000000 --- a/AutomaticUpdates/AutomaticUpdates.csproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - Debug - AnyCPU - 8.0.50727 - 2.0 - {34DD929F-BA21-4A80-AA93-114AFCC15EE7} - Library - Properties - AutomaticUpdates - AutomaticUpdates - v4.6 - - - - - 2.0 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - false - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - false - - - - - - - - - Properties\SolutionInfo.cs - - - - - - {6CEE8102-55B6-42B8-AD74-2246AEB2D942} - Common - - - - - \ No newline at end of file diff --git a/AutomaticUpdates/Properties/AssemblyInfo.cs b/AutomaticUpdates/Properties/AssemblyInfo.cs deleted file mode 100644 index 9205e56..0000000 --- a/AutomaticUpdates/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,3 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; diff --git a/Common/Common.csproj b/Common/Common.csproj index 4940768..c953178 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -10,7 +10,7 @@ Properties Common Common - v4.6 + v4.0 diff --git a/CreateTestDatabases/CreateTestDatabases.csproj b/CreateTestDatabases/CreateTestDatabases.csproj index 0e69228..99d07a9 100644 --- a/CreateTestDatabases/CreateTestDatabases.csproj +++ b/CreateTestDatabases/CreateTestDatabases.csproj @@ -10,7 +10,7 @@ Properties CreateTestDatabases CreateTestDatabases - v4.6 + v4.0 @@ -58,28 +58,11 @@ false - - ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - True - - - ..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - True - - - ..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net46\System.Data.SQLite.dll - True - - - ..\packages\System.Data.SQLite.EF6.1.0.104.0\lib\net46\System.Data.SQLite.EF6.dll - True - - - ..\packages\System.Data.SQLite.Linq.1.0.104.0\lib\net46\System.Data.SQLite.Linq.dll - True + + ..\packages\System.Data.SQLite.Core.1.0.113.1\lib\net40\System.Data.SQLite.dll @@ -99,12 +82,12 @@ - + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + - - + - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CreateTestDatabases/packages.config b/CreateTestDatabases/packages.config index 791029e..3af5a15 100644 --- a/CreateTestDatabases/packages.config +++ b/CreateTestDatabases/packages.config @@ -1,8 +1,8 @@  - - - - - + + + + + \ No newline at end of file diff --git a/DiffControl/DiffControl.csproj b/DiffControl/DiffControl.csproj index 1b4ee43..0b162d6 100644 --- a/DiffControl/DiffControl.csproj +++ b/DiffControl/DiffControl.csproj @@ -10,7 +10,7 @@ Properties DiffControl DiffControl - v4.6 + v4.0 diff --git a/FastGrid/FastGrid.csproj b/FastGrid/FastGrid.csproj index f365a79..55429f1 100644 --- a/FastGrid/FastGrid.csproj +++ b/FastGrid/FastGrid.csproj @@ -12,7 +12,7 @@ FastGrid - v4.6 + v4.0 diff --git a/SQLiteParser/SQLiteParser.csproj b/SQLiteParser/SQLiteParser.csproj index 91de873..77e6d78 100644 --- a/SQLiteParser/SQLiteParser.csproj +++ b/SQLiteParser/SQLiteParser.csproj @@ -10,7 +10,7 @@ Properties SQLiteParser SQLiteParser - v4.6 + v4.0 diff --git a/SQLiteTurbo/App.config b/SQLiteTurbo/App.config index b301398..da643ca 100644 --- a/SQLiteTurbo/App.config +++ b/SQLiteTurbo/App.config @@ -2,8 +2,6 @@
-
- @@ -15,21 +13,4 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SQLiteTurbo/SQLiteTurbo.csproj b/SQLiteTurbo/SQLiteTurbo.csproj index f25eab0..4546a0c 100644 --- a/SQLiteTurbo/SQLiteTurbo.csproj +++ b/SQLiteTurbo/SQLiteTurbo.csproj @@ -12,7 +12,7 @@ SQLiteTurbo SQLiteCompare Resources\app.ico - v4.6 + v4.0 @@ -67,12 +67,6 @@ ..\packages\Be.Windows.Forms.HexBox.1.6.1\lib\net40\Be.Windows.Forms.HexBox.dll True - - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - - - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll @@ -87,13 +81,7 @@ - ..\packages\System.Data.SQLite.Core.1.0.113.1\lib\net46\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net46\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net46\System.Data.SQLite.Linq.dll + ..\packages\System.Data.SQLite.Core.1.0.113.1\lib\net40\System.Data.SQLite.dll @@ -385,12 +373,12 @@ - @@ -401,11 +389,8 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - - + - - + \ No newline at end of file diff --git a/SQLiteTurbo/packages.config b/SQLiteTurbo/packages.config index 48fd757..8b43161 100644 --- a/SQLiteTurbo/packages.config +++ b/SQLiteTurbo/packages.config @@ -5,10 +5,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Setup/setup.nsi b/Setup/setup.nsi index da599d2..2203c3d 100644 --- a/Setup/setup.nsi +++ b/Setup/setup.nsi @@ -45,7 +45,7 @@ OutFile "SQLiteCompareSetup.exe" ;Default installation folder - InstallDir "$PROGRAMFILES\SQLiteCompare" + InstallDir "$PROGRAMFILES64\SQLiteCompare" ;Request application privileges for Windows Vista RequestExecutionLevel admin @@ -136,28 +136,26 @@ Section "Install" Install SetShellVarContext all ; Add the application files - File "..\SQLiteTurbo\bin\x86\Release\Alsing.SyntaxBox.dll" - File "..\SQLiteTurbo\bin\x86\Release\System.Data.SQLite.dll" - File "..\SQLiteTurbo\bin\x86\Release\System.Data.SQLite.EF6.dll" - File "..\SQLiteTurbo\bin\x86\Release\System.Data.SQLite.Linq.dll" - File "..\SQLiteTurbo\bin\x86\Release\SQLiteCompare.exe.config" - File "..\SQLiteTurbo\bin\x86\Release\SQLiteCompare.exe" - File "..\SQLiteTurbo\bin\x86\Release\Be.Windows.Forms.HexBox.dll" - File "..\SQLiteTurbo\bin\x86\Release\Common.dll" - File "..\SQLiteTurbo\bin\x86\Release\DiffControl.dll" - File "..\SQLiteTurbo\bin\x86\Release\FastGrid.dll" - File "..\SQLiteTurbo\bin\x86\Release\MultiPanelControl.dll" - File "..\SQLiteTurbo\bin\x86\Release\log4net.dll" - File "..\SQLiteTurbo\bin\x86\Release\ShiftReduceParser.dll" - File "..\SQLiteTurbo\bin\x86\Release\SQLiteParser.dll" - File "..\SQLiteTurbo\bin\x86\Release\UndoRedo.dll" - File "..\SQLiteTurbo\bin\x86\Release\EntityFramework.dll" - File "..\SQLiteTurbo\bin\x86\Release\EntityFramework.SqlServer.dll" + File "..\SQLiteTurbo\bin\Release\Alsing.SyntaxBox.dll" + File "..\SQLiteTurbo\bin\Release\System.Data.SQLite.dll" + File "..\SQLiteTurbo\bin\Release\SQLiteCompare.exe.config" + File "..\SQLiteTurbo\bin\Release\SQLiteCompare.exe" + File "..\SQLiteTurbo\bin\Release\Be.Windows.Forms.HexBox.dll" + File "..\SQLiteTurbo\bin\Release\Common.dll" + File "..\SQLiteTurbo\bin\Release\DiffControl.dll" + File "..\SQLiteTurbo\bin\Release\FastGrid.dll" + File "..\SQLiteTurbo\bin\Release\MultiPanelControl.dll" + File "..\SQLiteTurbo\bin\Release\log4net.dll" + File "..\SQLiteTurbo\bin\Release\ShiftReduceParser.dll" + File "..\SQLiteTurbo\bin\Release\SQLiteParser.dll" + File "..\SQLiteTurbo\bin\Release\UndoRedo.dll" File "..\readme.txt" File "..\LICENSE" + SetOutPath "$INSTDIR\x64" + File "..\SQLiteTurbo\bin\Release\x64\SQLite.Interop.dll" SetOutPath "$INSTDIR\x86" - File "..\SQLiteTurbo\bin\x86\Release\x86\SQLite.Interop.dll" + File "..\SQLiteTurbo\bin\Release\x86\SQLite.Interop.dll" SetOutPath "$INSTDIR" ; ADD registry entries for ADD/REMOVE panel @@ -214,8 +212,6 @@ Section "Uninstall" Delete "$INSTDIR\Uninstall.exe" Delete "$INSTDIR\Alsing.SyntaxBox.dll" Delete "$INSTDIR\System.Data.SQLite.dll" - Delete "$INSTDIR\System.Data.SQLite.EF6.dll" - Delete "$INSTDIR\System.Data.SQLite.Linq.dll" Delete "$INSTDIR\x64\SQLite.Interop.dll" Delete "$INSTDIR\x86\SQLite.Interop.dll" Delete "$INSTDIR\SQLiteCompare.exe.config" @@ -229,8 +225,6 @@ Section "Uninstall" Delete "$INSTDIR\ShiftReduceParser.dll" Delete "$INSTDIR\SQLiteParser.dll" Delete "$INSTDIR\UndoRedo.dll" - Delete "$INSTDIR\EntityFramework.dll" - Delete "$INSTDIR\EntityFramework.SqlServer.dll" Delete "$INSTDIR\readme.txt" Delete "$INSTDIR\LICENSE" diff --git a/UndoRedo/UndoRedo.csproj b/UndoRedo/UndoRedo.csproj index b6dc745..f71dfb3 100644 --- a/UndoRedo/UndoRedo.csproj +++ b/UndoRedo/UndoRedo.csproj @@ -10,7 +10,7 @@ Properties UndoRedo UndoRedo - v4.6 + v4.0