Version updated to v.0.5.310

DamianMorozov · Jan 4, 2025 · c4f7e41 · c4f7e41
1 parent 313efa7
commit c4f7e41
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 22 deletions.
diff --git a/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj b/Clients/TgDownloaderBlazor/TgDownloaderBlazor.csproj
@@ -9,7 +9,7 @@
 		<UserSecretsId>acec7ca6-caa9-470e-96aa-3f14f080d6bd</UserSecretsId>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 		<DockerfileContext>..\..</DockerfileContext>
-		<Version>0.5.300.0</Version>
+		<Version>0.5.310.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj b/Clients/TgDownloaderConsole/TgDownloaderConsole.csproj
@@ -9,7 +9,7 @@
 		<ApplicationIcon>applicationIcon.ico</ApplicationIcon>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 		<DockerfileContext>..\..</DockerfileContext>
-		<Version>0.5.300.0</Version>
+		<Version>0.5.310.0</Version>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 	  <DebugType>full</DebugType>

diff --git a/Clients/TgDownloaderDesktop/Helpers/TgResourceExtensions.cs b/Clients/TgDownloaderDesktop/Helpers/TgResourceExtensions.cs
@@ -28,6 +28,7 @@ public static class TgResourceExtensions
 	public static string AskUpdateOnline() => "AskUpdateOnline".GetLocalized();
 	public static string AssertionRestartApp() => "AssertionRestartApp".GetLocalized();
 	public static string ClientSettingsAreNotValid() => "ClientSettingsAreNotValid".GetLocalized();
+	public static string GetAppDisplayName() => "AppDisplayName".GetLocalized();
 	public static string GetAppVersion() => "AppVersion".GetLocalized();
 	public static string GetCancelButton() => "CancelButton".GetLocalized();
 	public static string GetClientEnterLoginCode() => "ClientEnterLoginCode".GetLocalized();

diff --git a/Clients/TgDownloaderDesktop/Package.appxmanifest b/Clients/TgDownloaderDesktop/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="d0c48b6b-afe7-46b5-a630-2afcd7e2e083"
     Publisher="CN=TgDownloader"
-    Version="0.5.300.0" />
+    Version="0.5.310.0" />
 
   <mp:PhoneIdentity PhoneProductId="d0c48b6b-afe7-46b5-a630-2afcd7e2e083" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/Clients/TgDownloaderDesktop/TgDownloaderDesktop.csproj b/Clients/TgDownloaderDesktop/TgDownloaderDesktop.csproj
@@ -14,7 +14,7 @@
 	<UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>

diff --git a/Clients/TgDownloaderDesktop/ViewModels/ShellViewModel.cs b/Clients/TgDownloaderDesktop/ViewModels/ShellViewModel.cs
@@ -35,6 +35,7 @@ private void OnNavigated(object sender, NavigationEventArgs e)
 		{
 			Selected = selectedItem;
 		}
-		AppVersion = $"{TgLocaleHelper.Instance.AppVersion}: v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}";
+		AppVersion = 
+			TgResourceExtensions.GetAppDisplayName() + $" v{TgCommonUtils.GetTrimVersion(Assembly.GetExecutingAssembly().GetName().Version)}";
 	}
 }
diff --git a/Clients/TgDownloaderDesktop/Views/ShellPage.xaml b/Clients/TgDownloaderDesktop/Views/ShellPage.xaml
@@ -15,15 +15,15 @@
 			Canvas.ZIndex="1"
 			IsHitTestVisible="True">
 			<Image
-				Width="16"
-				Height="16"
+				Width="36"
+				Height="36"
 				HorizontalAlignment="Left"
 				Source="/Assets/applicationIcon.ico" />
 			<TextBlock
-				x:Name="AppTitleBarText"
-				Margin="28,0,0,0"
+				Margin="45,0,0,0"
 				VerticalAlignment="Center"
 				Style="{StaticResource CaptionTextBlockStyle}"
+				Text="{x:Bind ViewModel.AppVersion}"
 				TextWrapping="NoWrap" />
 		</Grid>
 		<NavigationView
@@ -39,10 +39,10 @@
 			<NavigationView.MenuItems>
 				<!--  https://docs.microsoft.com/windows/apps/design/style/segoe-fluent-icons-font#icon-list  -->
 				<!--  App version  -->
-				<TextBlock
+				<!--<TextBlock
 					HorizontalAlignment="Left"
 					VerticalAlignment="Center"
-					Text="{x:Bind ViewModel.AppVersion, Mode=OneWay}" />
+					Text="{x:Bind ViewModel.AppVersion, Mode=OneWay}" />-->
 				<!--  Home  -->
 				<NavigationViewItem x:Uid="Shell_Home" helpers:TgNavigationHelper.NavigateTo="TgDownloaderDesktop.ViewModels.TgMainViewModel">
 					<NavigationViewItem.Icon>

diff --git a/Clients/TgDownloaderDesktop/Views/ShellPage.xaml.cs b/Clients/TgDownloaderDesktop/Views/ShellPage.xaml.cs
@@ -23,7 +23,7 @@ public ShellPage(ShellViewModel viewModel)
 		App.MainWindow.ExtendsContentIntoTitleBar = true;
 		App.MainWindow.SetTitleBar(AppTitleBar);
 		App.MainWindow.Activated += MainWindow_Activated;
-		AppTitleBarText.Text = "AppDisplayName".GetLocalized();
+		//AppTitleBarText.Text = "AppDisplayName".GetLocalized();
 	}
 
 	#endregion
@@ -42,7 +42,7 @@ private void OnLoaded(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
 
 	private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)
 	{
-		App.AppTitlebar = AppTitleBarText as UIElement;
+		//App.AppTitlebar = AppTitleBarText as UIElement;
 	}
 
 	private void NavigationViewControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)

diff --git a/Clients/TgDownloaderWinDesktopWPF/TgDownloaderWinDesktopWPF.csproj b/Clients/TgDownloaderWinDesktopWPF/TgDownloaderWinDesktopWPF.csproj
@@ -7,7 +7,7 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>applicationIcon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64;x86</Platforms>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>

diff --git a/Core/TgDownloaderDesktop.Core/TgDownloaderDesktop.Core.csproj b/Core/TgDownloaderDesktop.Core/TgDownloaderDesktop.Core.csproj
@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Platforms>x86;x64;arm64;AnyCPU</Platforms>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Core/TgInfrastructure/TgInfrastructure.csproj b/Core/TgInfrastructure/TgInfrastructure.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>none</DebugType>

diff --git a/Core/TgStorage/TgStorage.csproj b/Core/TgStorage/TgStorage.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj b/Tests/TgAssertCoreTests/TgAssertCoreTests.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj b/Tests/TgDownloaderConsoleTest/TgDownloaderConsoleTest.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Tests/TgDownloaderDesktop.Tests.MSTest/TgDownloaderDesktop.Tests.MSTest.csproj b/Tests/TgDownloaderDesktop.Tests.MSTest/TgDownloaderDesktop.Tests.MSTest.csproj
@@ -9,7 +9,7 @@
     <UseWinUI>true</UseWinUI>
 	<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <ProjectPriFileName>resources.pri</ProjectPriFileName>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2">

diff --git a/Tests/TgDownloaderTest/TgDownloaderTest.csproj b/Tests/TgDownloaderTest/TgDownloaderTest.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Tests/TgStorageTest/TgStorageTest.csproj b/Tests/TgStorageTest/TgStorageTest.csproj
@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <Version>0.5.300.0</Version>
+    <Version>0.5.310.0</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">