Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove LiteDb.csproj and reference it from Nuget LiteDb v5.0.17.0 + TargetFramework bump to 4.8 #82

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove LiteDb.csproj and reference it from Nuget LiteDb v5.0.17.0 + TargetFramework bump to 4.8 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b25758b
Updates TargetFrameworks to net4.8
jacekpapiniak Nov 30, 2023
ce5fc03
Removes LiteDb.csproj from LiteDb.Studio.sln s we are referencing it …
jacekpapiniak Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions LiteDB.Studio.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion LiteDB.Studio/Forms/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 4 additions & 7 deletions LiteDB.Studio/LiteDB.Studio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LiteDB.Studio</RootNamespace>
<AssemblyName>LiteDB.Studio</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
Expand Down Expand Up @@ -40,6 +40,9 @@
<ApplicationIcon>LiteDB.Studio.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="LiteDB, Version=5.0.17.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
<HintPath>..\packages\LiteDB.5.0.17\lib\net45\LiteDB.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -352,12 +355,6 @@
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LiteDB\LiteDB\LiteDB.csproj">
<Project>{70e32ff1-6e08-4bf0-9c99-33e1f3711dd7}</Project>
<Name>LiteDB</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion LiteDB.Studio/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILMerge" version="3.0.41" targetFramework="net472" />
<package id="LiteDB" version="5.0.11" targetFramework="net472" />
<package id="LiteDB" version="5.0.17" targetFramework="net472" />
<package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net472" />
</packages>