Added check for .NET framework 4.7.

jpdillingham · Jul 6, 2017 · f5e3d51 · f5e3d51
1 parent 286f73a
commit f5e3d51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ILMergeGui/ILMergeGui.csproj b/ILMergeGui/ILMergeGui.csproj
@@ -130,7 +130,6 @@
       <DesignTime>True</DesignTime>
     </Compile>
     <None Include="app.config" />
-    <None Include="ILMergeGui_NewKey.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/ILMergeGui/Mainform.cs b/ILMergeGui/Mainform.cs
@@ -1187,7 +1187,7 @@ private void btnMerge_Click(object sender, EventArgs e)
 
             //! .Net v4.6 fixup.. 4.6 is an inplace upgrade of 4.0 which does not alter the version number.
             //! [workitem:8753]
-            if (Engine == Merger.ILMerge && framework.version.Major == 4 && (framework.version.Minor == 5 || framework.version.Minor == 6))
+            if (Engine == Merger.ILMerge && framework.version.Major == 4 && (framework.version.Minor == 5 || framework.version.Minor == 6 || framework.version.Minor == 7))
             {
                 frameversion = "4.0";
             }