Merge branch 'master' into features/zxgraphics

Author: Duefectu

ZXBStudio/Dialogs/ZXBuildSettingsDialog.axaml

@@ -4,8 +4,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:wnd="using:ZXBasicStudio.Classes"
         mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="520"
-        MinWidth="400" MaxWidth="400"
-        MinHeight="450" MaxHeight="450" 
+        MinWidth="400" Width="400"
+        MinHeight="450" Height="450" 
         CanResize="False"
         Icon="/Assets/zxbs.ico"
         x:Class="ZXBasicStudio.Dialogs.ZXBuildSettingsDialog"

ZXBStudio/ZXBasicStudio.csproj

@@ -13,7 +13,7 @@
     <Title>ZX Basic Studio</Title>
     <AssemblyVersion>1.2.*</AssemblyVersion>
     <Deterministic>False</Deterministic>
-    <Version>1.1</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaXaml Remove="LanguageDefinitions\**" />