Merge branch 'Release' into Develop

Author: ElvenBless

Source/StaX.Desktop/Assets/StaX.ico

@@ -7,7 +7,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
+    <ApplicationIcon>Assets\StaX.ico</ApplicationIcon>
     <OutDir>../../Build</OutDir>
     <Version>1.1.0.0</Version>
     <Company>ADVIN</Company>
@@ -23,11 +23,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Assets\logo.ico" />
+    <None Remove="Assets\StaX.ico" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Assets\logo.ico" />
+    <Content Include="Assets\StaX.ico" />
   </ItemGroup>
 
   <ItemGroup>

Source/StaX.Desktop/Assets/logo.ico

@@ -28,7 +28,7 @@
                         Stretch="UniformToFill" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>-->
-            <ui:ImageIconSource x:Key="AppLogo" Source="/Assets/logo.ico" />
+            <ui:ImageIconSource x:Key="AppLogo" Source="/Assets/StaX.ico" />
         </ResourceDictionary>
     </UserControl.Resources>
 

Source/StaX.Desktop/StaX.Desktop.csproj

@@ -10,7 +10,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     Background="{DynamicResource ApplicationPageBackgroundBrush}"
-    Icon="/Assets/logo.ico"
+    Icon="/Assets/StaX.ico"
     TransparencyLevelHint="AcrylicBlur"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
@@ -51,7 +51,7 @@
                         Stretch="UniformToFill" />-->
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-            <ui:ImageIconSource x:Key="AppLogo" Source="/Assets/logo.ico" />
+            <ui:ImageIconSource x:Key="AppLogo" Source="/Assets/StaX.ico" />
         </ResourceDictionary>
     </Window.Resources>