Revert "Merge branch 'git-based-build' into Release_1.2.x"

This reverts commit e4c4b61, reversing changes made to aad43cd. The original merge was accidental and reverted versions from 1.2.1 to 1.2.0
MediaPortal · Nov 28, 2011 · 177a6f1 · 177a6f1
1 parent 10f5c04
commit 177a6f1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs
@@ -51,8 +51,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
@@ -32,7 +32,7 @@
 
 !define VER_MAJOR       1
 !define VER_MINOR       2
-!define VER_REVISION    0
+!define VER_REVISION    1
 ;!define VER_TYPE        ""                 # can be "RC", "Beta". Please comment if Final release
 
 #**********************************************************************************************************#

diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs
@@ -551,8 +551,8 @@ public static Version GetPackageVersion(string type)
           break;
         case "max":
           major = 1;
-          minor = 1;
-          revision = 8; // 1.1.8 = 1.2.0 RC1
+          minor = 2;
+          revision = 0;
           break;
       }
       Version ver = new Version(major, minor, revision);
@@ -602,7 +602,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.2.0";
+      return "1.2.1";
     }
 
     #endregion

diff --git a/mediaportal/Configuration/App.config b/mediaportal/Configuration/App.config
@@ -6,6 +6,6 @@
     </assemblyBinding>
   </runtime>
   <appSettings>
-    <add key="version" value="1.2.0.0"/>
+    <add key="version" value="1.2.1.0"/>
   </appSettings>
 </configuration>
diff --git a/mediaportal/MediaPortal.Application/App.config b/mediaportal/MediaPortal.Application/App.config
@@ -8,7 +8,7 @@
 		</assemblyBinding>
 	</runtime>
 	<appSettings>
-		<add key="version" value="1.2.0.0"/>
+		<add key="version" value="1.2.1.0"/>
 		<add key="edtftp.log.level" value="ALL"/>
 	</appSettings>
 </configuration>