diff --git a/DICUI.Avalonia/DICUI.Avalonia.csproj b/DICUI.Avalonia/DICUI.Avalonia.csproj index 4f9bf7b8..bd947229 100644 --- a/DICUI.Avalonia/DICUI.Avalonia.csproj +++ b/DICUI.Avalonia/DICUI.Avalonia.csproj @@ -1,7 +1,10 @@ - + WinExe net472;net48;netcoreapp3.1 + Icon.ico + 1.16.1 + Copyright © 2020 @@ -26,4 +29,7 @@ OptionsWindow.axaml + + + diff --git a/DICUI.Avalonia/DiscInformationWindow.axaml b/DICUI.Avalonia/DiscInformationWindow.axaml index e35fe1fc..52e22e14 100644 --- a/DICUI.Avalonia/DiscInformationWindow.axaml +++ b/DICUI.Avalonia/DiscInformationWindow.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="705" Width="515.132" Height="705" - x:Class="DICUI.Avalonia.DiscInformationWindow" CanResize="False" + x:Class="DICUI.Avalonia.DiscInformationWindow" Icon="Icon.ico" CanResize="False" Title="Disc Information" Closed="OnClosed"> diff --git a/DICUI.Avalonia/Icon.ico b/DICUI.Avalonia/Icon.ico new file mode 100644 index 00000000..370e6559 Binary files /dev/null and b/DICUI.Avalonia/Icon.ico differ diff --git a/DICUI.Avalonia/LogWindow.axaml b/DICUI.Avalonia/LogWindow.axaml index 07353b19..92e52a96 100644 --- a/DICUI.Avalonia/LogWindow.axaml +++ b/DICUI.Avalonia/LogWindow.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:DICUI.Avalonia" mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="350" Width="600" Height="350" - x:Class="DICUI.Avalonia.LogWindow" + x:Class="DICUI.Avalonia.LogWindow" Icon="Icon.ico" CanResize="False" Title="Log Window"> diff --git a/DICUI.Avalonia/MainWindow.axaml b/DICUI.Avalonia/MainWindow.axaml index 92dc64df..a909fedf 100644 --- a/DICUI.Avalonia/MainWindow.axaml +++ b/DICUI.Avalonia/MainWindow.axaml @@ -4,8 +4,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:DICUI.Avalonia" mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="450" Width="600" Height="450" - x:Class="DICUI.Avalonia.MainWindow" - Title="DICUI" WindowStartupLocation="CenterScreen" CanResize="False" + x:Class="DICUI.Avalonia.MainWindow" Icon="Icon.ico" CanResize="False" + Title="DICUI" WindowStartupLocation="CenterScreen" PositionChanged="MainWindowLocationChanged" Activated="MainWindowActivated" Closing="MainWindowClosing"> diff --git a/DICUI.Avalonia/MainWindow.axaml.cs b/DICUI.Avalonia/MainWindow.axaml.cs index bcfbc98e..1cda11d6 100644 --- a/DICUI.Avalonia/MainWindow.axaml.cs +++ b/DICUI.Avalonia/MainWindow.axaml.cs @@ -592,7 +592,7 @@ namespace DICUI.Avalonia { // Get the current internal version var assemblyVersion = Assembly.GetEntryAssembly().GetName().Version; - string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.MajorRevision != 0 ? $".{assemblyVersion.MajorRevision}" : string.Empty); + string version = $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty); // Get the latest tag from GitHub using (var client = new RedumpWebClient()) diff --git a/DICUI.Avalonia/MessageBox.axaml b/DICUI.Avalonia/MessageBox.axaml index f8e2738b..c134a199 100644 --- a/DICUI.Avalonia/MessageBox.axaml +++ b/DICUI.Avalonia/MessageBox.axaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" Icon="Icon.ico" x:Class="DICUI.Avalonia.MessageBox" SizeToContent="WidthAndHeight" CanResize="False"> diff --git a/DICUI.Avalonia/OptionsWindow.axaml b/DICUI.Avalonia/OptionsWindow.axaml index 183140f5..4e3f436d 100644 --- a/DICUI.Avalonia/OptionsWindow.axaml +++ b/DICUI.Avalonia/OptionsWindow.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:DICUI.Avalonia" mc:Ignorable="d" d:DesignWidth="515.132" d:DesignHeight="600" Width="515.132" Height="600" - x:Class="DICUI.Avalonia.OptionsWindow" + x:Class="DICUI.Avalonia.OptionsWindow" Icon="Icon.ico" CanResize="False" Title="Options"> diff --git a/appveyor.yml b/appveyor.yml index ab5d37e6..e71d835c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,27 +36,21 @@ after_build: - ps: appveyor DownloadFile http://www.chrysocome.net/downloads/8ab730cd2a29e76ddd89be1f99357942/dd-0.6beta3.zip - ps: appveyor DownloadFile https://github.com/saramibreak/DiscImageCreator/files/4931645/DiscImageCreator_20200716.zip - ps: appveyor DownloadFile https://archive.org/download/subdump_fua_0x28/subdump_fua_0x28.zip -- 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net462\Programs\Aaru * - 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net472\Programs\Aaru * - 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\net48\Programs\Aaru * - 7z e aaru-5.1.0.3214-1_windows_x64.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Aaru * -- 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net462\Programs\DD * - 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net472\Programs\DD * - 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\net48\Programs\DD * - 7z e dd-0.6beta3.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\DD * -- 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\net462\Programs\Creator Release_ANSI\* - 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\net472\Programs\Creator Release_ANSI\* - 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\net48\Programs\Creator Release_ANSI\* - 7z e DiscImageCreator_20200716.zip -oDICUI\bin\Debug\netcoreapp3.1\Programs\Creator Release_ANSI\* -- 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net462 * -- mkdir DICUI\bin\Debug\net462\Programs\Subdump -- mv DICUI\bin\Debug\net462\subdump_fua_0x28.exe DICUI\bin\Debug\net462\Programs\Subdump\subdump.exe - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net472 * - mkdir DICUI\bin\Debug\net472\Programs\Subdump - mv DICUI\bin\Debug\net472\subdump_fua_0x28.exe DICUI\bin\Debug\net472\Programs\Subdump\subdump.exe - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\net48 * - mkdir DICUI\bin\Debug\net48\Programs\Subdump -- mv DICUI\bin\Debug\net48\subdump_fua_0x28.exe DICUI\bin\Debug\net462\Programs\Subdump\subdump.exe +- mv DICUI\bin\Debug\net48\subdump_fua_0x28.exe DICUI\bin\Debug\net48\Programs\Subdump\subdump.exe - 7z e subdump_fua_0x28.zip -oDICUI\bin\Debug\netcoreapp3.1 * - mkdir DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump - mv DICUI\bin\Debug\netcoreapp3.1\subdump_fua_0x28.exe DICUI\bin\Debug\netcoreapp3.1\Programs\Subdump\subdump.exe