Merge branch 'EXP-TVE3.5-master_merge_WiP' into EXP-TVE3.5-MP1-MP2

Conflicts:
	Common-MP-TVE3/Common.Utils/OsInfo/OSInfo.cs
	TvEngine3/Mediaportal/TV/Server/TVDatabase/EntityModel/ObjContext/ObjectContextManager.cs
	TvEngine3/Mediaportal/TV/Server/TVDatabase/Presentation/Presentation.csproj
	TvEngine3/Mediaportal/TV/Server/TVLibrary/Implementations/TvCardBase.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Integration.MP1/TvLibrary.Integration.MP1.csproj
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Interfaces/Instantiator.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Interfaces/Integration/IntegrationProviderHelper.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Services/TvLibrary.Services.csproj
	tvengine3/mediaportal/tv/server/Plugins/CustomDevices/AVerMedia/AVerMedia.csproj
	tvengine3/mediaportal/tv/server/Plugins/CustomDevices/AVerMedia/Properties/AssemblyInfo.cs

Common-MP-TVE3/Common.Utils/Common.Utils.csproj

@@ -52,12 +52,46 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Debug\Common.Utils.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType />
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\Common.Utils.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

Common-MP-TVE3/Common.Utils/Compatibility/CompatibilityManager.cs

@@ -44,7 +44,7 @@ public int GetHashCode(UsesSubsystemAttribute obj)
     private static readonly HashSet<Assembly> AppAssemblies = new HashSet<Assembly>();
     private static readonly Dictionary<string, Version> SubSystemVersions = new Dictionary<string, Version>();
     private static readonly Version AppVersion;
-    public static readonly Version SkinVersion = new Version(1, 3, 0, 0);
+    public static readonly Version SkinVersion = new Version(1, 3, 0, 1);
     private static readonly string MinRequiredVersionDefault = "1.1.8.0"; // 1.2.0 RC1
 
     static CompatibilityManager()

Common-MP-TVE3/OsInfo/OSPrerequisites.cs → Common-MP-TVE3/Common.Utils/OsInfo/OSPrerequisites.cs

@@ -1,24 +1,24 @@
-#region Copyright (C) 2005-2011 Team MediaPortal
-
-// Copyright (C) 2005-2011 Team MediaPortal
-// http://www.team-mediaportal.com
-// 
-// MediaPortal is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 2 of the License, or
-// (at your option) any later version.
-// 
-// MediaPortal is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
-
-#endregion
-
-using System;
+#region Copyright (C) 2005-2011 Team MediaPortal
+
+// Copyright (C) 2005-2011 Team MediaPortal
+// http://www.team-mediaportal.com
+// 
+// MediaPortal is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+// 
+// MediaPortal is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with MediaPortal. If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System;
 using System.Windows.Forms;
 
 #if MediaPortal
@@ -27,65 +27,66 @@
 
 #else
 using Mediaportal.TV.Server.TVLibrary.Interfaces.Logging;
-#endif
-
-namespace OSPrerequisites
-{
-  ///<summary>
-  /// OS related checks
-  ///</summary>
-  public class OSPrerequisites
-  {
-    private const string MSG_NOT_SUPPORTED =
-      "Your platform is not supported by MediaPortal Team because it lacks critical hotfixes! \nPlease check our Wiki's requirements page.";
-
-    private const string MSG_NOT_INSTALLABLE =
-      "Your platform is not supported and cannot be used for MediaPortal/TV-Server! \nPlease check our Wiki's requirements page.";
-
-    private const string MSG_BETA_SERVICE_PACK =
-      "You are running a BETA version of Service Pack {0}.\n Please don't do bug reporting with such configuration.";
-
-    ///<summary>
-    /// Log and warn user if OS is not supported or is blacklisted
-    ///</summary>
-    public static void OsCheck(bool dispMessage)
-    {
-      DialogResult res;
-
-      switch (OSInfo.OSInfo.GetOSSupported())
-      {
-        case OSInfo.OSInfo.OsSupport.Blocked:
-          Log.Error("*******************************************");
-          Log.Error("* ERROR, OS can't be used for MediaPortal *");
-          Log.Error("*******************************************");
-          if (dispMessage)
-          {
-            MessageBox.Show(MSG_NOT_INSTALLABLE, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OK,
-                            MessageBoxIcon.Error);
-          }
-          Environment.Exit(-100);
-          break;
-        case OSInfo.OSInfo.OsSupport.NotSupported:
-          //Used .Info as .Warning is missing
-          Log.Info("*******************************************");
-          Log.Info("* WARNING, OS not officially supported    *");
-          Log.Info("*******************************************");
-          if (dispMessage)
-          {
-            res = MessageBox.Show(MSG_NOT_SUPPORTED, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OKCancel,
-                                  MessageBoxIcon.Warning);
-            if (res == DialogResult.Cancel) Environment.Exit(-200);
-          }
-          break;
-        default:
-          break;
-      }
-      if (dispMessage && OSInfo.OSInfo.OSServicePackMinor != 0)
-      {
-        res = MessageBox.Show(MSG_BETA_SERVICE_PACK, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OKCancel,
-                              MessageBoxIcon.Warning);
-        if (res == DialogResult.Cancel) Environment.Exit(-300);
-      }
-    }
-  }
+#endif
+
+
+namespace OSPrerequisites
+{
+  ///<summary>
+  /// OS related checks
+  ///</summary>
+  public class OSPrerequisites
+  {
+    private const string MSG_NOT_SUPPORTED =
+      "Your platform is not supported by MediaPortal\nPlease check our Wiki's requirements page.";
+
+    private const string MSG_NOT_INSTALLABLE =
+      "Your platform is not supported and cannot be used for MediaPortal/TV-Server! \nPlease check our Wiki's requirements page.";
+
+    private const string MSG_BETA_SERVICE_PACK =
+      "You are running a BETA version of Service Pack {0}.\n Please don't do bug reporting with such configuration.";
+
+    ///<summary>
+    /// Log and warn user if OS is not supported or is blacklisted
+    ///</summary>
+    public static void OsCheck(bool dispMessage)
+    {
+      DialogResult res;
+
+      switch (OSInfo.OSInfo.GetOSSupported())
+      {
+        case OSInfo.OSInfo.OsSupport.Blocked:
+          Log.Error("*******************************************");
+          Log.Error("* ERROR, OS can't be used for MediaPortal *");
+          Log.Error("*******************************************");
+          if (dispMessage)
+          {
+            MessageBox.Show(MSG_NOT_INSTALLABLE, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OK,
+                            MessageBoxIcon.Error);
+          }
+          Environment.Exit(-100);
+          break;
+        case OSInfo.OSInfo.OsSupport.NotSupported:
+          //Used .Info as .Warning is missing
+          Log.Info("*******************************************");
+          Log.Info("* WARNING, OS not officially supported    *");
+          Log.Info("*******************************************");
+          if (dispMessage)
+          {
+            res = MessageBox.Show(MSG_NOT_SUPPORTED, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OKCancel,
+                                  MessageBoxIcon.Warning);
+            if (res == DialogResult.Cancel) Environment.Exit(-200);
+          }
+          break;
+        default:
+          break;
+      }
+      if (dispMessage && OSInfo.OSInfo.OSServicePackMinor != 0)
+      {
+        res = MessageBox.Show(MSG_BETA_SERVICE_PACK, OSInfo.OSInfo.GetOSDisplayVersion(), MessageBoxButtons.OKCancel,
+                              MessageBoxIcon.Warning);
+        if (res == DialogResult.Cancel) Environment.Exit(-300);
+      }
+    }
+  }
 }

Common-MP-TVE3/Gentle.config

@@ -58,7 +58,7 @@
                 <Namespace namespace="Gentle.Second" provider="SQLServer" connectionString="..." />
             </NamespaceProviders>
             -->
-  <DefaultProvider name="MySQL" connectionString="Server=localhost;Database=MpTvDb;User ID=root;Password=MediaPortal;charset=utf8;Connection Timeout=300;" />
+  <DefaultProvider name="MySQL" connectionString="Server=-;Database=MpTvDb;User ID=root;Password=MediaPortal;charset=utf8;Connection Timeout=300;" />
   <!--
             <DefaultProvider name="Firebird" connectionString="User=SYSDBA;Password=masterkey;Data Source=TvLibrary.fdb;ServerType=1;Charset=UNICODE_FSS;" />
             <DefaultProvider name="Jet" connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\Code\Gentle.NET\Source\Gentle.Framework.Tests\Database Files\Gentle_MSAccess.mdb;OLE DB Services=-1;" />

Common-MP-TVE3/PowerScheduler.Interfaces/PowerScheduler.Interfaces.csproj

@@ -64,9 +64,6 @@
   </Target>
   -->
   <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>SolutionInfo.cs</Link>
-    </Compile>
     <Compile Include="EPGWakeupConfig.cs" />
     <Compile Include="Interfaces\IEpgHandler.cs" />
     <Compile Include="Interfaces\IPowerController.cs" />

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.100.0")]
-[assembly: AssemblyFileVersion("1.2.100.0")]
+[assembly: AssemblyVersion("1.2.200.0")]
+[assembly: AssemblyFileVersion("1.2.200.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]