Removed LiteDB version from form title (didn't work in bundled .exe);…

… fixed ILMerge path
litedb-org · Jun 4, 2020 · efae4c0 · efae4c0
1 parent 3334370
commit efae4c0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/LiteDB.Studio/Forms/MainForm.cs b/LiteDB.Studio/Forms/MainForm.cs
@@ -66,7 +66,7 @@ public MainForm(string filename)
             };
 
             // set assembly version on window title
-            this.Text += $" (v.{typeof(MainForm).Assembly.GetName().Version.ToString()}) - (LiteDB v.{typeof(LiteDatabase).Assembly.GetName().Version.ToString()})";
+            this.Text += $" (v{typeof(MainForm).Assembly.GetName().Version.ToString()})";
         }
 
         private async Task<LiteDatabase> AsyncConnect(ConnectionString connectionString)

diff --git a/LiteDB.Studio/LiteDB.Studio.csproj b/LiteDB.Studio/LiteDB.Studio.csproj
@@ -352,7 +352,7 @@
       <MergeAsm Include="$(OutputPath)LiteDB.dll" />
     </ItemGroup>
     <PropertyGroup>
-      <MergedAssembly>$(SolutionDir)LiteDB.Studio.exe</MergedAssembly>
+      <MergedAssembly>$(ProjectDir)LiteDB.Studio.exe</MergedAssembly>
     </PropertyGroup>
     <Message Text="ILMerge @(MergeAsm) -&gt; $(MergedAssembly)" Importance="high" />
     <ILMerge InputAssemblies="@(MergeAsm)" OutputFile="$(MergedAssembly)" TargetKind="SameAsPrimaryAssembly" />

diff --git a/LiteDB.Studio/LiteDB.Studio.exe b/LiteDB.Studio/LiteDB.Studio.exe