Merge branch '2.6-official'

jonthysell · Mar 8, 2022 · 11804f2 · 11804f2
2 parents 8b6aeb6 + c369463
commit 11804f2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ on:
   push:
     branches:
       - main
+      - 2.6-official
 
 defaults:
   run:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - main
+      - 2.6-official
 
 jobs:
   pr_build_and_test:

diff --git a/CHANGELIST.md b/CHANGELIST.md
@@ -1,5 +1,10 @@
 # Chordious Changelist #
 
+## 2.6.2 ##
+
+* Reverted SVG.NET to v3.1.1
+* Fixed issue with chord quality abbreviations overlapping the root note in titles
+
 ## 2.6.1 ##
 
 * Fixed issue with exporting scaled images

diff --git a/src/Chordious.WPF/Chordious.WPF.csproj b/src/Chordious.WPF/Chordious.WPF.csproj
@@ -45,7 +45,7 @@
   <ItemGroup>
     <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.100" />
     <PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" />
-    <PackageReference Include="Svg" Version="3.4.0" />
+    <PackageReference Include="Svg" Version="3.1.1" />
    </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Chordious.WinStore/Package.appxmanifest b/src/Chordious.WinStore/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
-  <Identity Name="32728JonThysell.Chordious" Publisher="CN=3E953986-6DBE-4C0E-B918-B1BB3B0F02EF" Version="2.6.1.0" />
+  <Identity Name="32728JonThysell.Chordious" Publisher="CN=3E953986-6DBE-4C0E-B918-B1BB3B0F02EF" Version="2.6.2.0" />
   <Properties>
     <DisplayName>Chordious</DisplayName>
     <PublisherDisplayName>Jon Thysell</PublisherDisplayName>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,7 +7,7 @@
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/jonthysell/Chordious</RepositoryUrl>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2.6.1</Version>
+    <Version>2.6.2</Version>
     <AssemblyVersion>$(Version).0</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>

diff --git a/update.xml b/update.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <updates>
-  <update version="2.6.1" url="https://chordious.com/download/" channel="Official" />
-  <update version="2.6.1" url="https://chordious.com/download/" channel="Preview" />
+  <update version="2.6.2" url="https://chordious.com/download/" channel="Official" />
+  <update version="2.6.2" url="https://chordious.com/download/" channel="Preview" />
 </updates>
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ on: @@
       push:
         branches:
           - main
+          - 2.6-official
     defaults:
       run:
@@ Expand Down @@