Merge with master

axodox · Mar 15, 2017 · b84316b · b84316b
2 parents 4d39ad2 + f56254b
commit b84316b
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 109 deletions.
diff --git a/AxoCover.sln b/AxoCover.sln
@@ -23,6 +23,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxoCover.Host-x86", "AxoCov
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxoCover.Host-x64", "AxoCover.Host-x64\AxoCover.Host-x64.csproj", "{30A4D1CC-28C2-4822-B76A-5131DDD3666E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A39C9015-0D1C-4389-B58D-E71142DD8518}"
+	ProjectSection(SolutionItems) = preProject
+		appveyor.yml = appveyor.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/AxoCover/AxoCover.csproj b/AxoCover/AxoCover.csproj
diff --git a/AxoCover/Resources.Designer.cs b/AxoCover/Resources.Designer.cs
diff --git a/AxoCover/Resources.resx b/AxoCover/Resources.resx
@@ -477,4 +477,7 @@
   <data name="ShuttingDown" xml:space="preserve">
     <value>Shutting down...</value>
   </data>
+  <data name="AssemblyVersion" xml:space="preserve">
+    <value>Build version is {0}, please reference this in your feedback.</value>
+  </data>
 </root>
diff --git a/AxoCover/ViewModels/SettingsViewModel.cs b/AxoCover/ViewModels/SettingsViewModel.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
 using System.Windows.Media;
@@ -29,6 +30,14 @@ public PackageManifest Manifest
       }
     }
 
+    public string AssemblyVersion
+    {
+      get
+      {
+        return Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
+      }
+    }
+
     public bool IsTelemetryEnabled
     {
       get

diff --git a/AxoCover/Views/SettingsView.xaml b/AxoCover/Views/SettingsView.xaml
@@ -52,38 +52,36 @@
 
       <!-- About -->
       <Label Content="{x:Static res:Resources.About}" Style="{StaticResource Header}" Margin="-6,0"/>
-      <StackPanel>
-        <DockPanel>
-          <Image DockPanel.Dock="Right" Source="/AxoCover;component/Resources/icon.png" Stretch="Uniform" Margin="3,6,6,6" Width="64" VerticalAlignment="Top"/>
-          <StackPanel VerticalAlignment="Top" Margin="3">
-            <Label>
-              <TextBlock TextWrapping="Wrap">
-                <Run Text="{Binding Manifest.Name, Mode=OneTime}" FontWeight="Bold" FontSize="20px"/>
-                <Run Text="{Binding Manifest.Version, Mode=OneTime}" FontSize="16px"/>
-                <LineBreak/>
-                <Run Text="{Binding Manifest.Description, Mode=OneTime}"/>
-              </TextBlock>
-            </Label>
-            <StackPanel Margin="0,1.5">
-              <StackPanel.Resources>
-                <Style TargetType="controls:ActionButton">
-                  <Setter Property="Icon" Value="/AxoCover;component/Resources/open.png"/>
-                  <Setter Property="HorizontalAlignment" Value="Left"/>
-                  <Setter Property="Margin" Value="0,1.5"/>
-                </Style>
-              </StackPanel.Resources>
-              <controls:ActionButton Text="{x:Static res:Resources.WebSite}" 
-                                     Command="{Binding OpenWebSiteCommand}"/>
-              <controls:ActionButton Text="{x:Static res:Resources.ReleaseNotes}"
-                                     Command="{Binding OpenReleaseNotesDialogCommand}"/>
-              <controls:ActionButton Text="{x:Static res:Resources.SourceCode}"
-                                     Command="{Binding OpenSourceCodeCommand}"/>
-              <controls:ActionButton Text="{x:Static res:Resources.License}"
-                                     Command="{Binding OpenLicenseDialogCommand}"/>
-            </StackPanel>
-          </StackPanel>
-        </DockPanel>
-      </StackPanel>
+      <DockPanel>
+        <Image DockPanel.Dock="Right" Source="/AxoCover;component/Resources/icon.png" Stretch="Uniform" Margin="3,6,6,6" Width="64" VerticalAlignment="Top"/>
+        <StackPanel VerticalAlignment="Top" Margin="3">
+          <Label>
+            <TextBlock TextWrapping="Wrap">
+              <Run Text="{Binding Manifest.Name, Mode=OneTime}" FontWeight="Bold" FontSize="20px"/>
+              <Run Text="{Binding Manifest.Version, Mode=OneTime}" FontSize="16px"/>
+              <LineBreak/>
+              <Run Text="{Binding Manifest.Description, Mode=OneTime}"/>
+            </TextBlock>
+          </Label>
+          <StackPanel Margin="0,1.5">
+            <StackPanel.Resources>
+              <Style TargetType="controls:ActionButton">
+                <Setter Property="Icon" Value="/AxoCover;component/Resources/open.png"/>
+                <Setter Property="HorizontalAlignment" Value="Left"/>
+                <Setter Property="Margin" Value="0,1.5"/>
+              </Style>
+            </StackPanel.Resources>
+            <controls:ActionButton Text="{x:Static res:Resources.WebSite}" 
+                                    Command="{Binding OpenWebSiteCommand}"/>
+            <controls:ActionButton Text="{x:Static res:Resources.ReleaseNotes}"
+                                    Command="{Binding OpenReleaseNotesDialogCommand}"/>
+            <controls:ActionButton Text="{x:Static res:Resources.SourceCode}"
+                                    Command="{Binding OpenSourceCodeCommand}"/>
+            <controls:ActionButton Text="{x:Static res:Resources.License}"
+                                    Command="{Binding OpenLicenseDialogCommand}"/>
+          </StackPanel>          
+        </StackPanel>
+      </DockPanel>
 
       <!-- Feedback settings -->
       <Label Content="{x:Static res:Resources.Feedback}" Style="{StaticResource Header}"/>
@@ -95,12 +93,13 @@
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="Margin" Value="0,1.5"/>
           </Style>
-        </StackPanel.Resources>
+        </StackPanel.Resources>        
         <controls:ActionButton Text="{x:Static res:Resources.OpenIssues}" Command="{Binding OpenIssuesCommand}"/>
         <controls:ActionButton Text="{x:Static res:Resources.SendFeedback}" Command="{Binding SendFeedbackCommand}"/>
       </StackPanel>      
       <TextBlock Text="{x:Static res:Resources.TelemetryDescription}" Style="{StaticResource Description}"/>
-      <CheckBox Content="{x:Static res:Resources.EnableTelemetry}" IsChecked="{Binding IsTelemetryEnabled}" Margin="3"/>      
+      <CheckBox Content="{x:Static res:Resources.EnableTelemetry}" IsChecked="{Binding IsTelemetryEnabled}" Margin="3"/>
+      <TextBlock Text="{Binding AssemblyVersion, StringFormat={x:Static res:Resources.AssemblyVersion}}" Style="{StaticResource Description}"/>
 
       <!-- Visualization settings -->
       <Label Content="{x:Static res:Resources.VisualizationSettings}" Style="{StaticResource Header}"/>

diff --git a/AxoCover/packages.config b/AxoCover/packages.config
@@ -4,5 +4,35 @@
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.TestPlatform.ObjectModel" version="11.0.0" targetFramework="net45" />
   <package id="Unity" version="4.0.1" targetFramework="net45" />
-  <package id="VsixUpdater" version="1.0.28" targetFramework="net45" />
+  <package id="VsixUpdater" version="1.0.25" targetFramework="net45" />
+  <package id="VSSDK.CoreUtility" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.CoreUtility.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.DTE.10" version="10.0.4" targetFramework="net45" />
+  <package id="VSSDK.DTE.8" version="8.0.4" targetFramework="net45" />
+  <package id="VSSDK.DTE.9" version="9.0.4" targetFramework="net45" />
+  <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" />
+  <package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
+  <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
+  <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Interop.10" version="10.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Interop.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" />
+  <package id="VSSDK.Text" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.Text.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
+  <package id="VSSDK.VSLangProj" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.VSLangProj.10" version="10.0.4" targetFramework="net45" />
+  <package id="VSSDK.VSLangProj.11" version="11.0.4" targetFramework="net45" />
+  <package id="VSSDK.VSLangProj.8" version="8.0.4" targetFramework="net45" />
+  <package id="VSSDK.VSLangProj.9" version="9.0.4" targetFramework="net45" />
 </packages>
diff --git a/AxoCover/source.extension.vsixmanifest b/AxoCover/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="26901782-38e1-48d4-94e9-557d44db052e" Version="1.1.0.34" Language="en-US" Publisher="Péter Major" />
+    <Identity Id="26901782-38e1-48d4-94e9-557d44db052e" Version="1.1.0.35" Language="en-US" Publisher="Péter Major" />
     <DisplayName>AxoCover</DisplayName>
     <Description xml:space="preserve">Nice and free .Net code coverage support for Visual Studio with OpenCover.</Description>
     <MoreInfo>https://marketplace.visualstudio.com/items?itemName=axodox1.AxoCover</MoreInfo>

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,25 @@
+version: 1.1.{build}
+skip_tags: true
+configuration: Release
+platform: Any CPU
+assembly_info:
+  patch: true
+  file: '**\AssemblyInfo.*'
+  assembly_version: '{version}'
+  assembly_file_version: '{version}'
+  assembly_informational_version: '{version}'
+before_build:
+- cmd: nuget restore
+build:
+  project: AxoCover.sln
+  verbosity: minimal
+artifacts:
+- path: AxoCover\bin\Release\AxoCover.vsix
+  name: AxoCover.vsix
+deploy:
+- provider: GitHub
+  tag: ${appveyor_repo_branch}-${appveyor_build_version}
+  auth_token:
+    secure: Vak3FzsaGXTJb/S0Ee3fPOWlHPNi52kz2e7WCLhwAa6pNe4jfKjl5rNEFfcnecI8
+  artifact: AxoCover.vsix
+  prerelease: true