From a2b98e1e473f997ea41893d1aadc349ce755d511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Fri, 1 Sep 2017 23:02:15 +0200
Subject: [PATCH] corrected .net version

---
 Installer/setup.aip | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Installer/setup.aip b/Installer/setup.aip
index 0678a6b6..1309ecc0 100644
--- a/Installer/setup.aip
+++ b/Installer/setup.aip
@@ -640,7 +640,7 @@
     <ROW Component="Avatar_f.png" ComponentId="{030FF904-4C4F-48BC-B876-3FBC26324064}" Directory_="Profiles_Dir" Attributes="0" KeyPath="Avatar_f.png" Type="0"/>
     <ROW Component="B63_41B8_9CB7_8C5E07C0FC18_" ComponentId="{557AD023-A2C0-4889-A7C5-1A033056EEB0}" Directory_="APPDIR" Attributes="260" KeyPath="B63_41B8_9CB7_8C5E07C0FC18_" Options="2"/>
     <ROW Component="Button.png" ComponentId="{4D6F60BF-0F5F-4DC6-8FD9-3B92481F76C1}" Directory_="Ambient_Dir" Attributes="0" KeyPath="Button.png" Type="0"/>
-    <ROW Component="C8B23E544BA99E5809B4D984F750" ComponentId="{62798072-D08F-40E3-A53A-00DEE6901676}" Directory_="APPDIR" Attributes="260" KeyPath="C8B23E544BA99E5809B4D984F750" Options="2"/>
+    <ROW Component="C673FE9433B49AFAC9592AB26B8F8E4" ComponentId="{794ECF65-28F2-4F17-AFA1-BD230EE7AF43}" Directory_="APPDIR" Attributes="260" KeyPath="C673FE9433B49AFAC9592AB26B8F8E4" Options="2"/>
     <ROW Component="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" ComponentId="{2C409031-4C62-4AF9-A9D7-6306EF21A9BD}" Directory_="APPDIR" Attributes="260" KeyPath="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" Options="2"/>
     <ROW Component="CChallengeRounds.cs" ComponentId="{EEE798B4-77D8-4DE4-8465-8EDD4A24B0AD}" Directory_="Code_Dir" Attributes="0" KeyPath="CChallengeRounds.cs" Type="0"/>
     <ROW Component="CChallengeRounds.cs_1" ComponentId="{F3BE8F3C-341D-4A01-A132-20D51700F7C4}" Directory_="Code_1_Dir" Attributes="0" KeyPath="CChallengeRounds.cs_1" Type="0"/>
@@ -1706,7 +1706,7 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="B63_41B8_9CB7_8C5E07C0FC18_" Title="Visual C++ 2010 SP1 x64 (MFC Security Update)" Description="Visual C++ 2010 SP1 x64 (MFC Security Update)" Display="7" Level="1" Attributes="0" Components="B63_41B8_9CB7_8C5E07C0FC18_"/>
-    <ROW Feature="C8B23E544BA99E5809B4D984F750" Title=".NET Framework 4.7" Description=".NET Framework 4.7" Display="11" Level="1" Attributes="0" Components="C8B23E544BA99E5809B4D984F750"/>
+    <ROW Feature="C673FE9433B49AFAC9592AB26B8F8E4" Title=".NET Framework 4.0" Description=".NET Framework 4.0" Display="13" Level="1" Attributes="0" Components="C673FE9433B49AFAC9592AB26B8F8E4"/>
     <ROW Feature="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" Title="Visual C++ 2010 SP1 x86 (MFC Security Update)" Description="Visual C++ 2010 SP1 x86 (MFC Security Update)" Display="9" Level="1" Attributes="0" Components="CB585686_DAA3_4384_BDDF_08ABA631E9F3_"/>
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="16" Components="AForge.Video.DirectShow.dll AForge.Video.dll AIShRegAnswer AI_ExePath Ambient.xml AmbientBlue.xml Asturian.xml Asturian.xml_1 Asturian.xml_2 Avatar_f.png Button.png CChallengeRounds.cs CChallengeRounds.cs_1 CPartyModeTicTacToe.cs Challenge.xml Changelog_ScreenHighscore.txt Community.CsharpSqlite.dll CreditsRessourcesDB.sqlite Czech.xml DJadWalkingAloneLicense.txt Default.xml Default.xml_1 Default.xml_2 Default.xml_3 Default.xml_4 Default.xml_5 Fonts.xml FreeSans.ttf Hz.mp3 LICENSE.txt LICENSE.txt_1 License.txt Logo.png Mono.Data.Sqlite.dll NewFolder NoCover.png NoCover.png_1 NoCover.png_2 NoCover.png_3 Normal.psd Normal.psd_1 Normal.psd_2 Normal.psd_3 OpenTK.Compatibility.dll OpenTK.GLControl.dll OpenTK.dll PartyScreenChallengeConfig.xml PartyScreenChallengeMedleyConfig.xml PartyScreenTicTacToeConfig.xml PopupScreenPlayerControl.xml PortAudio.dll PortAudioSharp.dll PortAudioSharp.dll.config ProductInformation QRCoder.dll QRCoder.txt SHORTCUTDIR Security.Cryptography.dll SlimDX.dll System.Data.Portable.dll System.Data.SQLite.dll Vocaluxe.exe VocaluxeLib.dll VocaluxeServerConfig.exe acinerella.dll addPlaylist.png ajaxloader.gif avcodec57.dll avformat57.dll avutil55.dll blank.cur copyright.txt cs.json glibsharp.dll gpl3.0.txt gstreamersharp.dll hidapi.dll i18next1.7.1.min.js index.html jquery.mobile1.3.2.min.css libgstreamersharpglue1.0.0.dll swresample2.dll swscale4.dll"/>
     <ROW Feature="TileAssets_DefaultBuild" Title="TileAssets_DefaultBuild" Description="Description" Display="0" Level="1" Directory_="APPDIR" Attributes="0" Components="Vocaluxe.VisualElementsManifest.xml" Builds="DefaultBuild;x64_1"/>
@@ -3968,9 +3968,9 @@
     <ROW Action="AI_DATA_SETTER_1" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6401"/>
     <ROW Action="AI_VerifyPrereq" Sequence="1101"/>
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="201"/>
-    <ROW Action="AI_AiRemoveFilesImmediate" Sequence="3499"/>
     <ROW Action="AI_AiRemoveFilesRollback" Sequence="3099"/>
     <ROW Action="AI_PromptUserBasicUI" Condition="(REMOVE = &quot;ALL&quot;)" Sequence="2501"/>
+    <ROW Action="AI_AiRemoveFilesImmediate" Sequence="3499"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
     <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
@@ -4006,7 +4006,7 @@
     <ROW Registry="AIShRegAnswer" Root="-1" Key="Software\Caphyon\Advanced Installer\Installs\[ProductCode]" Name="AIShRegAnswer" Value="[AI_SHORTCUTSREG]" Component_="AIShRegAnswer"/>
     <ROW Registry="AI_ExePath" Root="-1" Key="Software\Caphyon\Advanced Installer\LZMA\[ProductCode]\[ProductVersion]" Name="AI_ExePath" Value="[AI_SETUPEXEPATH]" Component_="AI_ExePath"/>
     <ROW Registry="B63_41B8_9CB7_8C5E07C0FC18_" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="B63_41B8_9CB7_8C5E07C0FC18_" Value="1" Component_="B63_41B8_9CB7_8C5E07C0FC18_"/>
-    <ROW Registry="C8B23E544BA99E5809B4D984F750" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="C8B23E544BA99E5809B4D984F750" Value="1" Component_="C8B23E544BA99E5809B4D984F750"/>
+    <ROW Registry="C673FE9433B49AFAC9592AB26B8F8E4" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="C673FE9433B49AFAC9592AB26B8F8E4" Value="1" Component_="C673FE9433B49AFAC9592AB26B8F8E4"/>
     <ROW Registry="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" Value="1" Component_="CB585686_DAA3_4384_BDDF_08ABA631E9F3_"/>
     <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
@@ -4027,13 +4027,13 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
     <ROW PrereqKey="B63_41B8_9CB7_8C5E07C0FC18_" DisplayName="Visual C++ 2010 SP1 x64 (MFC Security Update)" VersionMin="10.0" SetupFileUrl="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe" Location="1" ExactSize="10274136" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" Options="f" MD5="c9d9eebccef20d637f193490cec05e79" TargetName="Visual C++ 2010 SP1" Feature="B63_41B8_9CB7_8C5E07C0FC18_"/>
-    <ROW PrereqKey="C8B23E544BA99E5809B4D984F750" DisplayName=".NET Framework 4.7" SetupFileUrl="https://download.microsoft.com/download/D/D/3/DD35CC25-6E9C-484B-A746-C5BE0C923290/NDP47-KB3186497-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="61586744" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86, Windows 10 version 1507 x86, Windows 10 version 1511 x86, Windows 10 version 1703 x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64, Windows 10 version 1703 x64" Operator="1" Options="xf" MD5="b59040e489bff55433508438627d11e6" TargetName=".NET Framework 4.7" Feature="C8B23E544BA99E5809B4D984F750"/>
+    <ROW PrereqKey="C673FE9433B49AFAC9592AB26B8F8E4" DisplayName=".NET Framework 4.0" SetupFileUrl="http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe" Location="1" ExactSize="50449456" Operator="1" Options="xf" MD5="251743dfd3fda414570524bac9e55381" TargetName=".NET Framework 4.0" Feature="C673FE9433B49AFAC9592AB26B8F8E4"/>
     <ROW PrereqKey="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" DisplayName="Visual C++ 2010 SP1 x86 (MFC Security Update)" VersionMin="10.0" SetupFileUrl="http://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe" Location="1" ExactSize="8990552" WinNT64Versions="Windows XP/Vista/Windows 7/Windows 8 x64/Windows 8.1 x64/Windows 10 x64" Operator="1" Options="f" MD5="1801436936e64598bab5b87b37dc7f87" TargetName="Visual C++ 2010 SP1" Feature="CB585686_DAA3_4384_BDDF_08ABA631E9F3_"/>
-    <ATTRIBUTE name="PrereqsOrder" value="B63_41B8_9CB7_8C5E07C0FC18_ CB585686_DAA3_4384_BDDF_08ABA631E9F3_ C8B23E544BA99E5809B4D984F750"/>
+    <ATTRIBUTE name="PrereqsOrder" value="B63_41B8_9CB7_8C5E07C0FC18_ CB585686_DAA3_4384_BDDF_08ABA631E9F3_ C673FE9433B49AFAC9592AB26B8F8E4"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
     <ROW SearchKey="B63_41B8_9CB7_8C5E07C0FC18_Version" Prereq="B63_41B8_9CB7_8C5E07C0FC18_" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\10.0\red\amd64\1033\Version" VerMin="40219.325" Order="1" Property="PreReqSearch_B63_41B8_9CB7_8C5E07C0FC18_"/>
-    <ROW SearchKey="C8B23E544BA99E5809B4D984F750Release" Prereq="C8B23E544BA99E5809B4D984F750" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G460804" Order="1" Property="PreReqSearch_C8B23E544BA99E5809B4D984F750"/>
+    <ROW SearchKey="C673FE9433B49AFAC9592AB26B8F8E4Install" Prereq="C673FE9433B49AFAC9592AB26B8F8E4" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Install" RefContent="M1" Order="1" Property="PreReqSearch_C673FE9433B49AFAC9592AB26B8F8E4"/>
     <ROW SearchKey="CB585686_DAA3_4384_BDDF_08ABA631E9F3_Version" Prereq="CB585686_DAA3_4384_BDDF_08ABA631E9F3_" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\10.0\red\x86\1033\Version" VerMin="40219.325" Order="1" Property="PreReqSearch_CB585686_DAA3_4384_BDDF_08ABA631E9F3_"/>
   </COMPONENT>
 </DOCUMENT>