From 71251b8733602b2e3f7beeedc6a247f58e6b452e Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Tue, 16 Apr 2013 16:40:04 +0200
Subject: [PATCH] Fixed partymode names

---
 Output/PartyModes/Challenge.xml                     |  8 ++++----
 Output/PartyModes/ChallengeMedley.xml               |  8 ++++----
 Output/PartyModes/TicTacToe.xml                     |  8 ++++----
 ...PartyModeChallenge.cs => CPartyModeChallenge.cs} |  0
 ...engeConfig.cs => CPartyScreenChallengeConfig.cs} |  0
 ...hallengeMain.cs => CPartyScreenChallengeMain.cs} |  0
 ...llengeNames.cs => CPartyScreenChallengeNames.cs} |  0
 .../PartyModeChallenge/PartyModeChallenge.csproj    | 11 ++++-------
 .../{ChallengeRounds.cs => CChallengeRounds.cs}     |  0
 ...llengeMedley.cs => CPartyModeChallengeMedley.cs} |  0
 ...nfig.cs => CPartyScreenChallengeMedleyConfig.cs} |  0
 ...eyMain.cs => CPartyScreenChallengeMedleyMain.cs} |  0
 ...Names.cs => CPartyScreenChallengeMedleyNames.cs} |  0
 .../PartyModeChallengeMedley.csproj                 | 13 +++++--------
 ...PartyModeTicTacToe.cs => CPartyModeTicTacToe.cs} |  0
 ...cToeConfig.cs => CPartyScreenTicTacToeConfig.cs} |  0
 ...icTacToeMain.cs => CPartyScreenTicTacToeMain.cs} |  0
 ...TacToeNames.cs => CPartyScreenTicTacToeNames.cs} |  0
 .../PartyModeTicTacToe/PartyModeTicTacToe.csproj    | 11 ++++-------
 Vocaluxe/Properties/AssemblyInfo.cs                 |  2 +-
 Vocaluxe/Vocaluxe.csproj                            |  9 +++++++--
 VocaluxeLib/VocaluxeLib.csproj                      |  3 +--
 22 files changed, 34 insertions(+), 39 deletions(-)
 rename PartyModes/PartyModeChallenge/{PartyModeChallenge.cs => CPartyModeChallenge.cs} (100%)
 rename PartyModes/PartyModeChallenge/{PartyScreenChallengeConfig.cs => CPartyScreenChallengeConfig.cs} (100%)
 rename PartyModes/PartyModeChallenge/{PartyScreenChallengeMain.cs => CPartyScreenChallengeMain.cs} (100%)
 rename PartyModes/PartyModeChallenge/{PartyScreenChallengeNames.cs => CPartyScreenChallengeNames.cs} (100%)
 rename PartyModes/PartyModeChallengeMedley/{ChallengeRounds.cs => CChallengeRounds.cs} (100%)
 rename PartyModes/PartyModeChallengeMedley/{PartyModeChallengeMedley.cs => CPartyModeChallengeMedley.cs} (100%)
 rename PartyModes/PartyModeChallengeMedley/{PartyScreenChallengeMedleyConfig.cs => CPartyScreenChallengeMedleyConfig.cs} (100%)
 rename PartyModes/PartyModeChallengeMedley/{PartyScreenChallengeMedleyMain.cs => CPartyScreenChallengeMedleyMain.cs} (100%)
 rename PartyModes/PartyModeChallengeMedley/{PartyScreenChallengeMedleyNames.cs => CPartyScreenChallengeMedleyNames.cs} (100%)
 rename PartyModes/PartyModeTicTacToe/{PartyModeTicTacToe.cs => CPartyModeTicTacToe.cs} (100%)
 rename PartyModes/PartyModeTicTacToe/{PartyScreenTicTacToeConfig.cs => CPartyScreenTicTacToeConfig.cs} (100%)
 rename PartyModes/PartyModeTicTacToe/{PartyScreenTicTacToeMain.cs => CPartyScreenTicTacToeMain.cs} (100%)
 rename PartyModes/PartyModeTicTacToe/{PartyScreenTicTacToeNames.cs => CPartyScreenTicTacToeNames.cs} (100%)

diff --git a/Output/PartyModes/Challenge.xml b/Output/PartyModes/Challenge.xml
index c5fe5c94..9a609eb3 100644
--- a/Output/PartyModes/Challenge.xml
+++ b/Output/PartyModes/Challenge.xml
@@ -6,14 +6,14 @@
     <Author>brunzel</Author>
 	<Description>TR_PARTYMODE_DESCRIPTION</Description>
     <Folder>Challenge</Folder>
-	<PartyModeFile>PartyModeChallenge</PartyModeFile>
+	<PartyModeFile>CPartyModeChallenge</PartyModeFile>
     <PartyModeVersionMajor>0</PartyModeVersionMajor>
     <PartyModeVersionMinor>1</PartyModeVersionMinor>
 	<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
   </Info>
   <PartyScreens>
-    <ScreenFile>PartyScreenChallengeMain</ScreenFile>
-	<ScreenFile>PartyScreenChallengeConfig</ScreenFile>
-	<ScreenFile>PartyScreenChallengeNames</ScreenFile>
+    <ScreenFile>CPartyScreenChallengeMain</ScreenFile>
+	<ScreenFile>CPartyScreenChallengeConfig</ScreenFile>
+	<ScreenFile>CPartyScreenChallengeNames</ScreenFile>
   </PartyScreens>
 </root>
\ No newline at end of file
diff --git a/Output/PartyModes/ChallengeMedley.xml b/Output/PartyModes/ChallengeMedley.xml
index 7e1d6605..3f1063dc 100644
--- a/Output/PartyModes/ChallengeMedley.xml
+++ b/Output/PartyModes/ChallengeMedley.xml
@@ -6,14 +6,14 @@
     <Author>brunzel</Author>
 	<Description>TR_PARTYMODE_DESCRIPTION</Description>
     <Folder>ChallengeMedley</Folder>
-	<PartyModeFile>PartyModeChallengeMedley</PartyModeFile>
+	<PartyModeFile>CPartyModeChallengeMedley</PartyModeFile>
     <PartyModeVersionMajor>0</PartyModeVersionMajor>
     <PartyModeVersionMinor>1</PartyModeVersionMinor>
 	<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
   </Info>
   <PartyScreens>
-    <ScreenFile>PartyScreenChallengeMedleyMain</ScreenFile>
-	<ScreenFile>PartyScreenChallengeMedleyConfig</ScreenFile>
-	<ScreenFile>PartyScreenChallengeMedleyNames</ScreenFile>
+    <ScreenFile>CPartyScreenChallengeMedleyMain</ScreenFile>
+	<ScreenFile>CPartyScreenChallengeMedleyConfig</ScreenFile>
+	<ScreenFile>CPartyScreenChallengeMedleyNames</ScreenFile>
   </PartyScreens>
 </root>
\ No newline at end of file
diff --git a/Output/PartyModes/TicTacToe.xml b/Output/PartyModes/TicTacToe.xml
index 5ddf43da..0b877ed7 100644
--- a/Output/PartyModes/TicTacToe.xml
+++ b/Output/PartyModes/TicTacToe.xml
@@ -6,14 +6,14 @@
     <Author>flokuep</Author>
 	<Description>TR_PARTYMODE_DESCRIPTION</Description>
     <Folder>TicTacToe</Folder>
-	<PartyModeFile>PartyModeTicTacToe</PartyModeFile>
+	<PartyModeFile>CPartyModeTicTacToe</PartyModeFile>
     <PartyModeVersionMajor>0</PartyModeVersionMajor>
     <PartyModeVersionMinor>1</PartyModeVersionMinor>
 	<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
   </Info>
   <PartyScreens>
-    <ScreenFile>PartyScreenTicTacToeMain</ScreenFile>
-	<ScreenFile>PartyScreenTicTacToeConfig</ScreenFile>
-	<ScreenFile>PartyScreenTicTacToeNames</ScreenFile>
+    <ScreenFile>CPartyScreenTicTacToeMain</ScreenFile>
+	<ScreenFile>CPartyScreenTicTacToeConfig</ScreenFile>
+	<ScreenFile>CPartyScreenTicTacToeNames</ScreenFile>
   </PartyScreens>
 </root>
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
similarity index 100%
rename from PartyModes/PartyModeChallenge/PartyModeChallenge.cs
rename to PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs
similarity index 100%
rename from PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
rename to PartyModes/PartyModeChallenge/CPartyScreenChallengeConfig.cs
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
similarity index 100%
rename from PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
rename to PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
similarity index 100%
rename from PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
rename to PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
index 725cc119..edc62696 100644
--- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
@@ -109,10 +109,10 @@
   <ItemGroup>
     <Compile Include="ChallengeRounds.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeChallenge.cs" />
-    <Compile Include="PartyScreenChallengeConfig.cs" />
-    <Compile Include="PartyScreenChallengeMain.cs" />
-    <Compile Include="PartyScreenChallengeNames.cs" />
+    <Compile Include="CPartyModeChallenge.cs" />
+    <Compile Include="CPartyScreenChallengeConfig.cs" />
+    <Compile Include="CPartyScreenChallengeMain.cs" />
+    <Compile Include="CPartyScreenChallengeNames.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -123,10 +123,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs b/PartyModes/PartyModeChallengeMedley/CChallengeRounds.cs
similarity index 100%
rename from PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs
rename to PartyModes/PartyModeChallengeMedley/CChallengeRounds.cs
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
similarity index 100%
rename from PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
rename to PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyConfig.cs
similarity index 100%
rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
rename to PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyConfig.cs
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
similarity index 100%
rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
rename to PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyMain.cs
diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs b/PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
similarity index 100%
rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
rename to PartyModes/PartyModeChallengeMedley/CPartyScreenChallengeMedleyNames.cs
diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
index 0990e176..9a03d28d 100644
--- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
+++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
@@ -107,12 +107,12 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ChallengeRounds.cs" />
+    <Compile Include="CChallengeRounds.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeChallengeMedley.cs" />
-    <Compile Include="PartyScreenChallengeMedleyConfig.cs" />
-    <Compile Include="PartyScreenChallengeMedleyMain.cs" />
-    <Compile Include="PartyScreenChallengeMedleyNames.cs" />
+    <Compile Include="CPartyModeChallengeMedley.cs" />
+    <Compile Include="CPartyScreenChallengeMedleyConfig.cs" />
+    <Compile Include="CPartyScreenChallengeMedleyMain.cs" />
+    <Compile Include="CPartyScreenChallengeMedleyNames.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -123,10 +123,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
similarity index 100%
rename from PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
rename to PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
similarity index 100%
rename from PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
rename to PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
similarity index 100%
rename from PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
rename to PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
similarity index 100%
rename from PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
rename to PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
index ecb9f603..d061ae8d 100644
--- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
@@ -108,10 +108,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="PartyModeTicTacToe.cs" />
-    <Compile Include="PartyScreenTicTacToeConfig.cs" />
-    <Compile Include="PartyScreenTicTacToeMain.cs" />
-    <Compile Include="PartyScreenTicTacToeNames.cs" />
+    <Compile Include="CPartyModeTicTacToe.cs" />
+    <Compile Include="CPartyScreenTicTacToeConfig.cs" />
+    <Compile Include="CPartyScreenTicTacToeMain.cs" />
+    <Compile Include="CPartyScreenTicTacToeNames.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\VocaluxeLib\VocaluxeLib.csproj">
@@ -122,10 +122,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/Vocaluxe/Properties/AssemblyInfo.cs b/Vocaluxe/Properties/AssemblyInfo.cs
index 8ebe0768..5aa6b1d3 100644
--- a/Vocaluxe/Properties/AssemblyInfo.cs
+++ b/Vocaluxe/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Vocaluxe.Properties")]
+[assembly: AssemblyProduct("Vocaluxe")]
 [assembly: AssemblyCopyright("Copyright ©  2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 337515e2..2963f8a1 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -168,7 +168,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Base\CBackgroundMusic.cs" />
@@ -272,6 +272,11 @@
     <Content Include="Vocaluxe.ico" />
   </ItemGroup>
   <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client,KB2468871">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 und x64%29 und Update für .NET Framework 4 %28KB2468871%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
       <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
@@ -280,7 +285,7 @@
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
       <Visible>False</Visible>
       <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
+      <Install>false</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
       <Visible>False</Visible>
diff --git a/VocaluxeLib/VocaluxeLib.csproj b/VocaluxeLib/VocaluxeLib.csproj
index 97fcaf9e..038db9ed 100644
--- a/VocaluxeLib/VocaluxeLib.csproj
+++ b/VocaluxeLib/VocaluxeLib.csproj
@@ -105,10 +105,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GlobalSuppressions.cs" />