From b25758b2ae808f9981a5a5f9fdb5bdcfb1619298 Mon Sep 17 00:00:00 2001 From: Jacek Papiniak Date: Thu, 30 Nov 2023 13:53:38 +0000 Subject: [PATCH 1/2] Updates TargetFrameworks to net4.8 Update NuGet package for LiteDb to 5.0.17.0 Removes project reference to LiteDb in LiteDb.Studio.csproj --- LiteDB.Studio/Forms/MainForm.cs | 2 +- LiteDB.Studio/LiteDB.Studio.csproj | 11 ++++------- LiteDB.Studio/packages.config | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/LiteDB.Studio/Forms/MainForm.cs b/LiteDB.Studio/Forms/MainForm.cs index 012d0dc..f096b09 100644 --- a/LiteDB.Studio/Forms/MainForm.cs +++ b/LiteDB.Studio/Forms/MainForm.cs @@ -70,7 +70,7 @@ public MainForm(string filename) // set assembly version on window title this.Text += $" (LiteDB.Studio: v{typeof(MainForm).Assembly.GetName().Version.ToString()}"; - this.Text += $" - LiteDB v5.0.15)"; // how do I get this version? (ILMerge ommits LiteDB assembly) + this.Text += $" - LiteDB v5.0.17)"; // how do I get this version? (ILMerge ommits LiteDB assembly) // load last db diff --git a/LiteDB.Studio/LiteDB.Studio.csproj b/LiteDB.Studio/LiteDB.Studio.csproj index a5b957d..30e3cb3 100644 --- a/LiteDB.Studio/LiteDB.Studio.csproj +++ b/LiteDB.Studio/LiteDB.Studio.csproj @@ -10,7 +10,7 @@ WinExe LiteDB.Studio LiteDB.Studio - v4.7.2 + v4.8 512 true @@ -40,6 +40,9 @@ LiteDB.Studio.ico + + ..\packages\LiteDB.5.0.17\lib\net45\LiteDB.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll @@ -352,12 +355,6 @@ - - - {70e32ff1-6e08-4bf0-9c99-33e1f3711dd7} - LiteDB - - diff --git a/LiteDB.Studio/packages.config b/LiteDB.Studio/packages.config index 5365317..d86ee2e 100644 --- a/LiteDB.Studio/packages.config +++ b/LiteDB.Studio/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file From ce5fc037149aa2d54e01f74d89ba3f316ce4d803 Mon Sep 17 00:00:00 2001 From: Jacek Papiniak Date: Thu, 30 Nov 2023 13:57:38 +0000 Subject: [PATCH 2/2] Removes LiteDb.csproj from LiteDb.Studio.sln s we are referencing it from NuGet package --- LiteDB.Studio.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/LiteDB.Studio.sln b/LiteDB.Studio.sln index b504161..25533e9 100644 --- a/LiteDB.Studio.sln +++ b/LiteDB.Studio.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LiteDB.Studio", "LiteDB.Studio\LiteDB.Studio.csproj", "{0002E0FF-C91F-4B8B-B29B-2A477E184408}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiteDB", "LiteDB\LiteDB\LiteDB.csproj", "{70E32FF1-6E08-4BF0-9C99-33E1F3711DD7}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,10 +15,6 @@ Global {0002E0FF-C91F-4B8B-B29B-2A477E184408}.Debug|Any CPU.Build.0 = Debug|Any CPU {0002E0FF-C91F-4B8B-B29B-2A477E184408}.Release|Any CPU.ActiveCfg = Release|Any CPU {0002E0FF-C91F-4B8B-B29B-2A477E184408}.Release|Any CPU.Build.0 = Release|Any CPU - {70E32FF1-6E08-4BF0-9C99-33E1F3711DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70E32FF1-6E08-4BF0-9C99-33E1F3711DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70E32FF1-6E08-4BF0-9C99-33E1F3711DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70E32FF1-6E08-4BF0-9C99-33E1F3711DD7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE