Merge pull request #1732 from mungojam/dotnet-core-initial-support

Add support for language neutral VersionInfo in target .exes

Author: anaisbetts

src/Squirrel/SquirrelAwareExecutableDetector.cs

@@ -70,8 +70,21 @@ public static List<string> GetAllSquirrelAwareApps(string directory, int minimum
             var buf = new byte[size];
             if (!NativeMethods.GetFileVersionInfo(executable, 0, size, buf)) return null;
 
-            IntPtr result; int resultSize;
-            if (!NativeMethods.VerQueryValue(buf, "\\StringFileInfo\\040904B0\\SquirrelAwareVersion", out result, out resultSize)) {
+            const string englishUS = "040904B0";
+            const string neutral = "000004B0";
+            var supportedLanguageCodes = new[] {englishUS, neutral};
+
+            IntPtr result;
+            int resultSize;
+            if (!supportedLanguageCodes.Any(
+                languageCode =>
+                    NativeMethods.VerQueryValue(
+                        buf,
+                        $"\\StringFileInfo\\{languageCode}\\SquirrelAwareVersion",
+                        out result, out resultSize
+                    )
+            ))
+            {
                 return null;
             }
 

test/SquirrelAwareExecutableDetectorTests.cs

@@ -41,6 +41,19 @@ public void SquirrelAwareViaVersionBlock()
             Assert.Equal(1, ret.Value);
         }
 
+        [Fact]
+        public void SquirrelAwareViaLanguageNeutralVersionBlock()
+        {
+            var target = IntegrationTestHelper.GetPath("fixtures", "SquirrelAwareTweakedNetCoreApp.exe");
+            Assert.True(File.Exists(target));
+
+            var ret = SquirrelAwareExecutableDetector.GetPESquirrelAwareVersion(target);
+            
+            Assert.NotNull(ret);
+            Assert.Equal(1, ret.Value);
+        }
+
+
         [Fact]
         public void SquirrelAwareViaAssemblyAttribute()
         {