Merge branch 'master' into development

Author: SergioMurru

AnalyzeInExcel/AnalyzeInExcel.csproj

@@ -61,7 +61,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>sqlbi-2400.ico</ApplicationIcon>
+    <ApplicationIcon>icon-2400px.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AutoUpdater.NET, Version=1.6.0.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
@@ -173,7 +173,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="icon-2400px.png" />
+    <Resource Include="icon-2400px.ico" />
     <None Include="AnalyzeInExcelAutoUpdater.xml" />
+    <Resource Include="banner-500x70.jpg" />
     <Content Include="ExcelIconFromSvg.png" />
   </ItemGroup>
   <ItemGroup>
@@ -186,15 +189,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="sqlbi-2400.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="sqlbi-2400.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="sqlbi-500x70.jpg" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

AnalyzeInExcel/AnalyzeInExcelAutoUpdater.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <item>
-	<version>1.1.1.0</version>
+	<version>1.1.2.0</version>
 	<url>https://cdn.sqlbi.com/updates/AnalyzeInExcel-1.1.2.msi</url>
 	<changelog>https://github.com/sql-bi/AnalyzeInExcel/releases/</changelog>
 	<mandatory>false</mandatory>

AnalyzeInExcel/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:AnalyzeInExcel"
         mc:Ignorable="d"
-        Title="Analyze in Excel for Power BI Desktop" Height="300" Width="800" Icon="sqlbi-2400.png">
+        Title="Analyze in Excel for Power BI Desktop" Height="300" Width="800" Icon="icon-2400px.png">
     <Grid>
         <DockPanel>
             <Label DockPanel.Dock="Top" Content="Analyze in Excel for Power BI Desktop is not able to launch Excel." HorizontalAlignment="Left" VerticalAlignment="Top" FontFamily="Calibri" FontSize="14" FontWeight="Bold"/>

AnalyzeInExcel/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2.0")]
-[assembly: AssemblyFileVersion("1.1.2.0")]
+[assembly: AssemblyVersion("1.1.3.0")]
+[assembly: AssemblyFileVersion("1.1.3.0")]