fix: copy resources after build or publish

LiuYunPlayer · Jul 20, 2024 · cdb8ab6 · cdb8ab6
1 parent c56b61a
commit cdb8ab6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/TuneLab/App.axaml.cs b/TuneLab/App.axaml.cs
@@ -43,11 +43,6 @@ public override void OnFrameworkInitializationCompleted()
                     AudioEngine.Destroy();
                 };
 
-                // init translation
-                TranslationManager.Init(PathManager.TranslationsFolder);
-                TranslationManager.CurrentLanguage.Value = TranslationManager.Languages.Contains(Settings.Language.Value) ? Settings.Language : TranslationManager.GetCurrentOSLanguage();
-                Settings.Language.Modified.Subscribe(() => TranslationManager.CurrentLanguage.Value = Settings.Language);
-
                 // init audio engine
                 AudioUtils.Init(new NAudioCodec());
                 AudioEngine.Init(new SDLPlaybackHandler());

diff --git a/TuneLab/Program.cs b/TuneLab/Program.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Avalonia;
 using Avalonia.Media;
 using Avalonia.ReactiveUI;
 using TuneLab.Base.Utils;
 using TuneLab.Configs;
+using TuneLab.I18N;
 using TuneLab.Utils;
 
 namespace TuneLab;
@@ -18,9 +20,11 @@ class Program
     [STAThread]
     public static void Main(string[] args)
     {
+        // init logger
         Log.SetupLogger(new FileLogger(Path.Combine(PathManager.LogsFolder, "TuneLab_" + DateTime.Now.ToString("yyyy-MM-dd_hh-mm-ss") + ".log")));
         Log.Info("Version: " + AppInfo.Version);
 
+        // check if other instance is running
         var lockFile = LockFile.Create(PathManager.LockFilePath);
         if (lockFile == null)
         {
@@ -30,11 +34,19 @@ public static void Main(string[] args)
             return;
         }
 
+        // init setting
         Settings.Init(PathManager.SettingsFilePath);
 
+        // init translation
+        TranslationManager.Init(PathManager.TranslationsFolder);
+        TranslationManager.CurrentLanguage.Value = TranslationManager.Languages.Contains(Settings.Language.Value) ? Settings.Language : TranslationManager.GetCurrentOSLanguage();
+        Settings.Language.Modified.Subscribe(() => TranslationManager.CurrentLanguage.Value = Settings.Language);
+
+        // event loop
         BuildAvaloniaApp()
         .StartWithClassicDesktopLifetime(args);
 
+        // exit
         lockFile.Dispose();
     }
 

diff --git a/TuneLab/TuneLab.csproj b/TuneLab/TuneLab.csproj
@@ -46,11 +46,9 @@
 	  <ProjectReference Include="..\TuneLab.Extensions.Voices\TuneLab.Extensions.Voices.csproj" />
 	</ItemGroup>
 
-	<Target Name="CopyFiles" AfterTargets="Build">
-		<ItemGroup>
-			<Resources Include="Resources\**\*.*" />
-		</ItemGroup>
-
-		<Copy SourceFiles="@(Resources)" DestinationFolder="$(TargetDir)\Resources\%(RecursiveDir)" />
-	</Target>
+	<ItemGroup>
+	  <None Update="Resources\**\*.*">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	</ItemGroup>
 </Project>