From db955d01d09dcf1fd458f3653a55097e816d2071 Mon Sep 17 00:00:00 2001 From: Tichau Date: Mon, 6 Apr 2015 22:49:13 +0200 Subject: [PATCH] Clean plateform settings and extension installation. --- .../FileConverter/FileConverter.csproj | 8 +++++ Application/FileConverter/FileConverter.sln | 34 +++++-------------- Application/FileConverter/ReadMe.txt | 9 ++++- .../FileConverterExtension.csproj | 10 ++++++ Installer/Extension.wxs | 10 +++--- Installer/GenerateExtensionWxsFile.bat | 2 +- Installer/Installer.wixproj | 13 +++++-- Installer/Product.wxs | 5 +-- 8 files changed, 52 insertions(+), 39 deletions(-) diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj index f42db46..9ea5dc1 100644 --- a/Application/FileConverter/FileConverter.csproj +++ b/Application/FileConverter/FileConverter.csproj @@ -33,6 +33,14 @@ prompt 4 + + x64 + bin\x64\Debug\ + + + x64 + bin\x64\Release\ + diff --git a/Application/FileConverter/FileConverter.sln b/Application/FileConverter/FileConverter.sln index f98a17d..23ffe1e 100644 --- a/Application/FileConverter/FileConverter.sln +++ b/Application/FileConverter/FileConverter.sln @@ -9,54 +9,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileConverterExtension", ". EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x64.Build.0 = Debug|Any CPU {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.ActiveCfg = Debug|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Any CPU.Build.0 = Release|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Debug|x86.Build.0 = Debug|Any CPU {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.ActiveCfg = Release|Any CPU + {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x64.Build.0 = Release|Any CPU {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.ActiveCfg = Release|Any CPU - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {D27A76D2-43E4-43CC-9DA3-334B0B46F4E5}.Release|x86.Build.0 = Release|Any CPU {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.ActiveCfg = Debug|x64 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x64.Build.0 = Debug|x64 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.ActiveCfg = Debug|x86 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Debug|x86.Build.0 = Debug|x86 - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|Any CPU.ActiveCfg = Release|x86 - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|Mixed Platforms.Build.0 = Release|x86 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.ActiveCfg = Release|x64 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x64.Build.0 = Release|x64 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.ActiveCfg = Release|x86 {F14673DF-DF38-44B4-AB1D-99A59182C24C}.Release|x86.Build.0 = Release|x86 - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.ActiveCfg = Debug|Any CPU + {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x64.Build.0 = Debug|Any CPU {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.ActiveCfg = Debug|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Any CPU.Build.0 = Release|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Debug|x86.Build.0 = Debug|Any CPU {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.ActiveCfg = Release|Any CPU + {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x64.Build.0 = Release|Any CPU {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.ActiveCfg = Release|Any CPU + {0C44CA69-42D6-4357-BDFD-83069D1ABA2F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Application/FileConverter/ReadMe.txt b/Application/FileConverter/ReadMe.txt index 9c5bcc2..b10504b 100644 --- a/Application/FileConverter/ReadMe.txt +++ b/Application/FileConverter/ReadMe.txt @@ -1,5 +1,12 @@ ------------------------------------------------------------------------------- - File Converter v 0.x + File Converter v 0.1 ------------------------------------------------------------------------------- This program use ffmpeg. + + + Features +------------------------------------------------------------------------------- +Convert files from formats: Mp3, Ogg, Wav, Flac, Wma + +To formats: Mp3, Ogg, Wav, Flac \ No newline at end of file diff --git a/Application/FileConverterExtension/FileConverterExtension.csproj b/Application/FileConverterExtension/FileConverterExtension.csproj index 4145693..090eb2e 100644 --- a/Application/FileConverterExtension/FileConverterExtension.csproj +++ b/Application/FileConverterExtension/FileConverterExtension.csproj @@ -35,6 +35,16 @@ FileConverterExtensionKey.snk + + x64 + bin\x64\Debug\ + + + x64 + bin\x64\Release\ + + + ..\..\Middleware\SharpShell\SharpShell.dll diff --git a/Installer/Extension.wxs b/Installer/Extension.wxs index 217286b..25a5f1b 100644 --- a/Installer/Extension.wxs +++ b/Installer/Extension.wxs @@ -10,17 +10,17 @@ - - + + - + - + - + diff --git a/Installer/GenerateExtensionWxsFile.bat b/Installer/GenerateExtensionWxsFile.bat index d99f141..db8bc7b 100644 --- a/Installer/GenerateExtensionWxsFile.bat +++ b/Installer/GenerateExtensionWxsFile.bat @@ -1 +1 @@ -"C:\Program Files (x86)\Wix Toolset v3.9\bin\Heat.exe" file "..\Application\FileConverterExtension\bin\Debug\FileConverterExtension.dll" -dr INSTALLFOLDER -srd -gg -sfrag -suid -out "Extension.wxs" -b "..\Application\FileConverterExtension\bin\Debug\" \ No newline at end of file +"C:\Program Files (x86)\Wix Toolset v3.9\bin\Heat.exe" file "..\Application\FileConverterExtension\bin\Release\FileConverterExtension.dll" -dr INSTALLFOLDER -srd -gg -sfrag -suid -out "Extension.wxs" -b "..\Application\FileConverterExtension\bin\Release\" \ No newline at end of file diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj index 9739d7b..039b19e 100644 --- a/Installer/Installer.wixproj +++ b/Installer/Installer.wixproj @@ -12,14 +12,23 @@ $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - bin\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Configuration)\ Debug - bin\$(Configuration)\ + bin\$(Platform)\$(Configuration)\ obj\$(Configuration)\ + + Debug + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + diff --git a/Installer/Product.wxs b/Installer/Product.wxs index 8559255..da5de78 100644 --- a/Installer/Product.wxs +++ b/Installer/Product.wxs @@ -15,7 +15,7 @@ - + @@ -54,9 +54,6 @@ - - -