From 27d4a10b8b20639939d5645ef7c6f19751f0f1ed Mon Sep 17 00:00:00 2001 From: teranum Date: Tue, 9 Jan 2024 17:03:50 +0900 Subject: [PATCH] update to v1.1 --- src/KOAStudio.Core/KOAStudio.Core.csproj | 2 +- src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs | 7 ++++--- src/KOAStudio.Core/Views/KOAWindow.xaml | 6 ++++++ src/KOAStudio/Business/BusinessLogic.UIRequest.cs | 9 +++++++++ src/KOAStudio/Business/BusinessLogic.cs | 1 + src/KOAStudio/FodyWeavers.xml | 4 ---- src/KOAStudio/KOAStudio.csproj | 1 + src/WKOAStudio/AssemblyInfo.cs | 1 + src/WKOAStudio/Business/BusinessLogic.UIRequests.cs | 9 +++++++++ src/WKOAStudio/Business/BusinessLogic.cs | 1 + src/WKOAStudio/FodyWeavers.xml | 4 ---- src/WKOAStudio/WKOAStudio.csproj | 1 + 12 files changed, 34 insertions(+), 12 deletions(-) delete mode 100644 src/KOAStudio/FodyWeavers.xml delete mode 100644 src/WKOAStudio/FodyWeavers.xml diff --git a/src/KOAStudio.Core/KOAStudio.Core.csproj b/src/KOAStudio.Core/KOAStudio.Core.csproj index b4317bb..f099ce4 100644 --- a/src/KOAStudio.Core/KOAStudio.Core.csproj +++ b/src/KOAStudio.Core/KOAStudio.Core.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs b/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs index 669e7e6..2f47c0a 100644 --- a/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs +++ b/src/KOAStudio.Core/ViewModels/KOAWindowViewModel.cs @@ -10,12 +10,13 @@ namespace KOAStudio.Core.ViewModels internal partial class KOAWindowViewModel : ObservableObject { private readonly IUIRequest _uiRequest; - private readonly string _baseTitle = - System.Windows.Application.ResourceAssembly.GetName().Name - + (Environment.Is64BitProcess ? " - 64비트" : " - 32비트"); + private readonly string _baseTitle; public KOAWindowViewModel(IUIRequest uiRequest) { + var assemblyName = System.Windows.Application.ResourceAssembly.GetName(); + _baseTitle = $"{assemblyName.Name} v{assemblyName.Version.Major}.{assemblyName.Version.Minor} - {(Environment.Is64BitProcess ? "64비트" : "32비트")}"; + _uiRequest = uiRequest; _title = _baseTitle; diff --git a/src/KOAStudio.Core/Views/KOAWindow.xaml b/src/KOAStudio.Core/Views/KOAWindow.xaml index 5b62d4b..ee68e59 100644 --- a/src/KOAStudio.Core/Views/KOAWindow.xaml +++ b/src/KOAStudio.Core/Views/KOAWindow.xaml @@ -41,6 +41,12 @@ + + +