v0.0.0.1

Author: jacob-ronstadt

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQL.VisualStudio.csproj

@@ -150,7 +150,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="icon.png" />
+    <Content Include="icon.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <Resource Include="Icons\db.ico" />
     <Resource Include="Icons\Gear.ico" />
     <Resource Include="Icons\stop.ico" />

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQLCommand.cs

@@ -224,7 +224,7 @@ private async System.Threading.Tasks.Task MenuItemCallbackAsync(object sender, E
                         {
                             CodeQLService.Instance.ClearTask();
                             VsShellUtilities.ShowMessageBox(Microsoft.VisualStudio.Shell.ServiceProvider.GlobalProvider,
-                                                            $"CodeQL analysis failed. " + ex.Message + " See output for details.",
+                                                            $"CodeQL analysis failed with message: " + ex.Message,
                                                             null, // title
                                                             OLEMSGICON.OLEMSGICON_CRITICAL,
                                                             OLEMSGBUTTON.OLEMSGBUTTON_OK,

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/InstallWindow.xaml

@@ -7,10 +7,10 @@
         mc:Ignorable="d"
         Title="CodeQL" WindowStyle="ToolWindow" ResizeMode="NoResize" Topmost="True" WindowStartupLocation="CenterOwner" Cursor="Wait" SizeToContent="WidthAndHeight">
     <Grid>
-        <StackPanel Margin="20, 20, 20, 20" MinHeight="50" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-            <TextBlock Margin="0, 0, 0, 30" HorizontalAlignment="Stretch" TextWrapping="Wrap" Text="Please wait..."/>
-            <ProgressBar Margin="0, 0, 0,40" HorizontalAlignment="Stretch" Height="17"   VerticalAlignment="stretch" IsIndeterminate="True"/>
-            <Button Name="buttonCancel" Margin="0, 0, 0, 0"  Click="ButtonCancel_Click" HorizontalAlignment="Right"  Height="23" Content="Cancel" Width="74" />
+        <StackPanel Margin="10, 10, 10, 10" >
+            <ProgressBar Margin="0, 30, 0, 0" HorizontalAlignment="Stretch" Height="15" Width="150"  VerticalAlignment="stretch" IsIndeterminate="True" />
+            <TextBlock Margin="0, 0, 0, 0" HorizontalAlignment="Stretch" TextWrapping="Wrap" Text="Please wait..."/>
+            <Button Name="buttonCancel" Margin="0, 40, 0, 0"  Click="ButtonCancel_Click" HorizontalAlignment="Right"  Height="23" Content="Cancel" Width="74" />
         </StackPanel>
     </Grid>
 </Window>

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/icon.ico

@@ -5,7 +5,7 @@
         <DisplayName>CodeQL Visual Studio Extension</DisplayName>
         <Description xml:space="preserve">CodeQL Visual Studio Extension</Description>
         <License>License.txt</License>
-        <Icon>icon.png</Icon>
+        <Icon>icon.ico</Icon>
         <Preview>true</Preview>
     </Metadata>
     <Installation>