diff --git a/APRA.ico b/APRA.ico new file mode 100644 index 0000000..0b53931 Binary files /dev/null and b/APRA.ico differ diff --git a/CombatZoneDialog.xaml b/CombatZoneDialog.xaml index c96769c..b14a2a0 100644 --- a/CombatZoneDialog.xaml +++ b/CombatZoneDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Add Combat Zone Wins" Height="150" Width="370" Icon="EliteBGS.ico" WindowStartupLocation="CenterOwner"> + Title="Add Combat Zone Wins" Height="150" Width="370" Icon="apra.png" WindowStartupLocation="CenterOwner"> diff --git a/EliteBGS.csproj b/EliteBGS.csproj index 2eb4d3d..a0fb405 100644 --- a/EliteBGS.csproj +++ b/EliteBGS.csproj @@ -14,6 +14,21 @@ 4 true true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -38,7 +53,7 @@ EliteBGSApplication - EliteBGS.ico + APRA.ico @@ -112,6 +127,11 @@ LoadEntriesWindow.xaml + + True + True + Resources.resx + True True @@ -168,11 +188,6 @@ Code - - True - True - Resources.resx - True Settings.settings @@ -181,9 +196,11 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer ResXFileCodeGenerator + Designer Resources.Designer.cs @@ -199,6 +216,9 @@ + + + Always @@ -233,10 +253,16 @@ - - - - + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + \ No newline at end of file diff --git a/EliteBGS.ico b/EliteBGS.ico deleted file mode 100644 index f2b0958..0000000 Binary files a/EliteBGS.ico and /dev/null differ diff --git a/LoadEntriesWindow.xaml b/LoadEntriesWindow.xaml index 545c6f5..f029c6e 100644 --- a/LoadEntriesWindow.xaml +++ b/LoadEntriesWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Load Entries" Height="450" Width="600"> + Title="Load Entries" Height="450" Width="600" Icon="apra.png"> diff --git a/MainWindow.xaml b/MainWindow.xaml index e31461f..acfaf95 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -7,7 +7,7 @@ xmlns:local="clr-namespace:EliteBGS" xmlns:BGS="clr-namespace:EliteBGS.BGS" xmlns:Util="clr-namespace:EliteBGS.Util" d:DataContext="{d:DesignInstance Type=Util:AppConfig}" x:Name="window" x:Class="EliteBGS.MainWindow" mc:Ignorable="d" - Title="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="EliteBGS.ico" Closing="window_Closing"> + Title="Elite: Dangerous BGS Helper" Height="520" Width="890" Icon="apra.png" Closing="window_Closing"> diff --git a/ProgressDialog.xaml b/ProgressDialog.xaml index c7cc8a2..d56fc7d 100644 --- a/ProgressDialog.xaml +++ b/ProgressDialog.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:EliteBGS" mc:Ignorable="d" - Title="Progress" Height="100" Width="450" Icon="EliteBGS.ico"> + Title="Progress" Height="100" Width="450" Icon="apra.png"> diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 0b1a21e..9391b55 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -59,15 +59,5 @@ namespace EliteBGS.Properties { resourceCulture = value; } } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon EliteBGS { - get { - object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 7119902..1af7de1 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/Resources.Designer.cs b/Resources.Designer.cs index a0a6d9d..f866406 100644 --- a/Resources.Designer.cs +++ b/Resources.Designer.cs @@ -59,15 +59,5 @@ namespace EliteBGS { resourceCulture = value; } } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon EliteBGS { - get { - object obj = ResourceManager.GetObject("EliteBGS", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } } } diff --git a/Resources.resx b/Resources.resx index ac522fb..1af7de1 100644 --- a/Resources.resx +++ b/Resources.resx @@ -117,8 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - EliteBGS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ No newline at end of file diff --git a/Resources/APRA.ico b/Resources/APRA.ico new file mode 100644 index 0000000..0b53931 Binary files /dev/null and b/Resources/APRA.ico differ diff --git a/Resources/EliteBGS.ico b/Resources/EliteBGS.ico deleted file mode 100644 index 5d06b9f..0000000 Binary files a/Resources/EliteBGS.ico and /dev/null differ diff --git a/apra.png b/apra.png new file mode 100644 index 0000000..290ebbb Binary files /dev/null and b/apra.png differ