From 688c8ff4e4e6132c7a8caa9705649a5e842a899e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Sat, 16 Jan 2021 15:27:50 +0000
Subject: [PATCH] Fixed Avalonia version in About dialog. Hide "Development
 Build" text in release versions.

---
 src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml    | 6 +++---
 src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
index e51cc2f3ce..c5e1d43d80 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
@@ -79,8 +79,8 @@
         <DrawingPresenter Drawing="{DynamicResource AvaloniaLogo}" />
       </Border>
       <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,-10,0,0">
-        <TextBlock Text="Avalonia 0.9" FontSize="40" Foreground="White" />
-        <TextBlock Text="Development Build" Margin="0,-10,0,0" FontSize="15" Foreground="White" />
+        <TextBlock Text="{Binding Version, StringFormat=Avalonia {0}}" FontSize="40" Foreground="White" />
+        <TextBlock Text="Development Build" IsVisible="{Binding IsDevelopmentBuild}" Margin="0,-10,0,0" FontSize="15" Foreground="White" />
       </StackPanel>
     </StackPanel>
     <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Spacing="20" Margin="10 60 10 0">
@@ -102,4 +102,4 @@
       <TextBlock Text="© 2020 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
     </StackPanel>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
index 09fab0ed3f..55e30396e1 100644
--- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
+++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
@@ -7,12 +8,18 @@ namespace Avalonia.Dialogs
 {
     public class AboutAvaloniaDialog : Window
     {
+        private static readonly Version s_version = typeof(AboutAvaloniaDialog).Assembly.GetName().Version;
+
+        public static string Version { get; } = s_version.ToString(2);
+
+        public static bool IsDevelopmentBuild { get; } = s_version.Revision == 999;
+
         public AboutAvaloniaDialog()
         {
             AvaloniaXamlLoader.Load(this);
             DataContext = this;
         }
- 
+
         public static void OpenBrowser(string url)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))