mirror of
https://github.com/Tichau/FileConverter.git
synced 2026-11-22 18:41:48 +01:00
Merge pull request #296 from Tichau/feature/migrate-to-visual-studio-2022
Migrate project to .net framework 4.6.2
This commit is contained in:
6 files changed
+8
-17
No files matched your search
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FileConverter</RootNamespace>
|
||||
<AssemblyName>FileConverter</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
@@ -178,12 +178,6 @@
|
||||
<Compile Include="Services\IUpgradeService.cs" />
|
||||
<Compile Include="Services\NavigationService.cs" />
|
||||
<Compile Include="PathHelpers.cs" />
|
||||
<Compile Include="Properties\Resources.fr.Designer.cs">
|
||||
<DependentUpon>Resources.fr.resx</DependentUpon>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
|
||||
</Compile>
|
||||
<Compile Include="Properties\Resources.en.Designer.cs">
|
||||
<DependentUpon>Resources.en.resx</DependentUpon>
|
||||
<AutoGen>True</AutoGen>
|
||||
@@ -330,14 +324,11 @@
|
||||
</Compile>
|
||||
<EmbeddedResource Include="Properties\Resources.de.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.es-ES.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.fr.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\Resources.en.resx">
|
||||
<Generator>PublicResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.en.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Properties\Resources.fr-FR.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.it-IT.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.pt-BR.resx" />
|
||||
<EmbeddedResource Include="Properties\Resources.pt.resx" />
|
||||
|
||||
Whitespace-only changes.
@@ -9,7 +9,7 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>FileConverterExtension</RootNamespace>
|
||||
<AssemblyName>FileConverterExtension</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
||||
+1
-1
@@ -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).
|
||||
|
||||
|
||||
@@ -44,9 +44,9 @@
|
||||
<ProgressText Action="PostInstallInit">Initialize conversion presets</ProgressText>
|
||||
</UI>
|
||||
|
||||
<PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED"/>
|
||||
<Condition Message="This application requires .NET Framework 4.6.1. Please install the .NET Framework then run this installer again.">
|
||||
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED]]>
|
||||
<PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED"/>
|
||||
<Condition Message="This application requires .NET Framework 4.6.2. Please install the .NET Framework then run this installer again.">
|
||||
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED]]>
|
||||
</Condition>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
|
||||
Reference in new issue
Block a user