diff --git a/Application/FileConverter/App.config b/Application/FileConverter/App.config index 8c7b37b..b19c16d 100644 --- a/Application/FileConverter/App.config +++ b/Application/FileConverter/App.config @@ -1,7 +1,7 @@  - + diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index ce47611..ce821bb 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -9,7 +9,7 @@ Properties FileConverter FileConverter - v4.6.1 + v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -178,12 +178,6 @@ - - Resources.fr.resx - True - True - True - Resources.en.resx True @@ -330,14 +324,11 @@ - - PublicResXFileCodeGenerator - Resources.fr.Designer.cs - PublicResXFileCodeGenerator Resources.en.Designer.cs + diff --git a/Application/FileConverter/Properties/Resources.fr.Designer.cs b/Application/FileConverter/Properties/Resources.fr.Designer.cs deleted file mode 100644 index e69de29..0000000 diff --git a/Application/FileConverterExtension/FileConverterExtension.csproj b/Application/FileConverterExtension/FileConverterExtension.csproj index 49034f6..5787777 100644 --- a/Application/FileConverterExtension/FileConverterExtension.csproj +++ b/Application/FileConverterExtension/FileConverterExtension.csproj @@ -9,7 +9,7 @@ Properties FileConverterExtension FileConverterExtension - v4.6.1 + v4.6.2 512 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bf0bcf..dc59b4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ - Tech: Update ffmpeg to v4.0.0 and ImageMagick to v7.12.0. - Tech: Update SharpShell to v2.7.1. - Tech: Update project to Visual Studio 2017 and installer Wix 3.11. -- Tech: Update project to .NET framework 4.6.1 (the last .NET version compatible with Windows Vista). +- Tech: Update project to .NET framework 4.6.2. - Tech: Check for .NET framework version in installer and prompt the user if the required version is not installed. - Tech: Remove sharpshell tools from installer dependencies. The shell extension is now registered by File Converter application (github issue #39 #46). diff --git a/Installer/Product.wxs b/Installer/Product.wxs index a633cc3..6cfa716 100644 --- a/Installer/Product.wxs +++ b/Installer/Product.wxs @@ -44,9 +44,9 @@ Initialize conversion presets - - - + + +