More flexibly handling discovery of VS version in post-2015 registry keys, fixes #24

Author: SteveWilkes

ReadableExpressions.Visualizers.Installer.Custom/VsPost2017Data.cs

@@ -8,9 +8,9 @@ namespace AgileObjects.ReadableExpressions.Visualizers.Installer.Custom
 
     internal class VsPost2017Data : IDisposable
     {
-        private static readonly Dictionary<string, string> _vsVersionsByYear = new Dictionary<string, string>
+        private static readonly Dictionary<int, string> _vsVersionsByYear = new Dictionary<int, string>
         {
-            ["2017"] = "15.0"
+            [2017] = "15.0"
         };
 
         public VsPost2017Data(RegistryKey post2015Key)
@@ -36,15 +36,15 @@ private static string GetVsFullVersion(RegistryKey capabilitiesKey)
             {
                 return null;
             }
-            
-            var vsYearNumber = appName.TrimEnd().Split(' ').LastOrDefault();
 
-            if (vsYearNumber == null)
-            {
-                return null;
-            }
+            var vsYearNumber = appName
+                .TrimEnd()
+                .Split(' ')
+                .Reverse()
+                .Select(segment => int.TryParse(segment, out var yearNumber) ? yearNumber : default(int?))
+                .FirstOrDefault(yearNumber => yearNumber != default(int?));
 
-            return _vsVersionsByYear.TryGetValue(vsYearNumber, out var vsVersionNumber)
+            return vsYearNumber.HasValue && _vsVersionsByYear.TryGetValue(vsYearNumber.Value, out var vsVersionNumber)
                 ? vsVersionNumber : null;
         }
 

ReadableExpressions.Visualizers.Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Version="1.13.0.0" Name="AgileObjects.ReadableExpressions.Visualizers"
+  <Product Id="*" Version="1.13.1.0" Name="AgileObjects.ReadableExpressions.Visualizers"
            Language="1033"  Manufacturer="AgileObjects" UpgradeCode="BB7C528F-ECFD-45F2-B50C-9F0A71EC8BE9">
 
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
@@ -37,6 +37,7 @@
       <UIRef Id="WixUI_Minimal" />
     </UI>
     <WixVariable Id="WixUILicenseRtf" Value=".\license.rtf" />
+    <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Please report any issues using GitHub at https://github.com/agileobjects/ReadableExpressions"/>
 
     <InstallExecuteSequence>
       <Custom Action="VisualizersInstall" After="InstallInitialize">