Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into BUG_AMG_Scr…
Browse files Browse the repository at this point in the history 
…aper_NUGET

Conflicts:
	.gitignore
	Build/BuildInit.bat
	mediaportal/Databases/Databases.csproj
  • Loading branch information
@Sebastiii
Sebastiii committed Nov 2, 2013
2 parents b28e40d + 48df578 commit b5f471b
Show file tree
Hide file tree
Showing 629 changed files with 34,851 additions and 34,656 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Expand Up @@ -11,4 +11,4 @@ Thumbs.db
*.bak
/mediaportal/Setup/uninstall.nsh
Packages
/Build/NuGet.exe
*.DotSettings/Build/NuGet.exe
2 changes: 1 addition & 1 deletion Build/MSBUILD_Rebuild_All_MediaPortal_Debug.bat
View file
Expand Up @@ -20,7 +20,7 @@ set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand Down
6 changes: 3 additions & 3 deletions Build/MSBUILD_Rebuild_All_MediaPortal_Release.bat
View file
Expand Up @@ -20,7 +20,7 @@ set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand Down Expand Up @@ -57,7 +57,7 @@ set xml=Build_Report_%BUILD_TYPE%_TvLibrary.xml
set html=Build_Report_%BUILD_TYPE%_TvLibrary.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand All @@ -66,7 +66,7 @@ set xml=Build_Report_%BUILD_TYPE%_TvPlugin.xml
set html=Build_Report_%BUILD_TYPE%_TvPlugin.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand Down
2 changes: 1 addition & 1 deletion Build/MSBUILD_Rebuild_Release_MediaPortal.bat
View file
Expand Up @@ -16,7 +16,7 @@ set xml=Build_Report_%BUILD_TYPE%_MediaPortal.xml
set html=Build_Report_%BUILD_TYPE%_MediaPortal.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%MediaPortal%\MediaPortal.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand Down
18 changes: 9 additions & 9 deletions Build/MSBUILD_Rebuild_Release_TVServer_Client.bat
View file
Expand Up @@ -6,17 +6,17 @@ call BuildInit.bat %1

rem build
echo.
echo Writing GIT revision assemblies...
rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log%
echo Writing GIT revision assemblies...
rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" >> %log%

echo.
echo Building TV Server...
set xml=Build_Report_%BUILD_TYPE%_TvLibrary.xml
set html=Build_Report_%BUILD_TYPE%_TvLibrary.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvLibrary.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
Expand All @@ -25,17 +25,17 @@ set xml=Build_Report_%BUILD_TYPE%_TvPlugin.xml
set html=Build_Report_%BUILD_TYPE%_TvPlugin.html
set logger=/l:XmlFileLogger,"BuildReport\MSBuild.ExtensionPack.Loggers.dll";logfile=%xml%

"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /tv:3.5 /p:TargetFrameworkVersion=v3.5 /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
"%WINDIR%\Microsoft.NET\Framework\v4.0.30319\MSBUILD.exe" %logger% /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 "%TVLibrary%\TvPlugin\TvPlugin.sln" >> %log%
BuildReport\msxsl %xml% _BuildReport_Files\BuildReport.xslt -o %html%

echo.
echo Reverting assemblies...
rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" /revert >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" /revert >> %log%
rem %DeployVersionGIT% /git="%GIT_ROOT%" /path="%TVLibrary%" /revert >> %log%
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" /revert >> %log%

echo.
echo Reading the GIT revision...
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" /GetVersion >> %log%
echo Reading the GIT revision...
%DeployVersionGIT% /git="%GIT_ROOT%" /path="%CommonMPTV%" /GetVersion >> %log%
rem SET /p version=<version.txt >> %log%
SET version=%errorlevel%
DEL version.txt >> %log%
Expand Down
3 changes: 2 additions & 1 deletion Common-MP-TVE3/Common.Utils/Common.Utils.csproj
View file
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MediaPortal.Common.Utils</RootNamespace>
<AssemblyName>Common.Utils</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand All @@ -31,6 +31,7 @@
<IsWebBootstrapper>true</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
20 changes: 10 additions & 10 deletions Common-MP-TVE3/Common.Utils/Logger/CommonLog4NetLogger.cs
View file
Expand Up @@ -68,12 +68,12 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" <log4net>");
tw.WriteLine(" <appender name=\"DefaultLogAppender\" type=\"log4net.Appender.RollingFileAppender\">");
tw.WriteLine(" <file value=\"[Name].log\" />");
tw.WriteLine(" <encoding value=\"utf-8\" />");
tw.WriteLine(" <encoding type=\"System.Text.UTF8Encoding\" />");
tw.WriteLine(" <appendToFile value=\"true\" />");
tw.WriteLine(" <lockingModel type=\"log4net.Appender.FileAppender+MinimalLock\" />");
tw.WriteLine(" <rollingStyle value=\"Once\" />");
tw.WriteLine(" <maxSizeRollBackups value=\"4\" />");
tw.WriteLine(" <maximumFileSize value=\"1MB\" />");
tw.WriteLine(" <rollingStyle value=\"Size\" />");
tw.WriteLine(" <maxSizeRollBackups value=\"5\" />");
tw.WriteLine(" <maximumFileSize value=\"5MB\" />");
tw.WriteLine(" <staticLogFileName value=\"true\" />");
tw.WriteLine(" <PreserveLogFileNameExtension value=\"true\" />");
tw.WriteLine(" <layout type=\"log4net.Layout.PatternLayout\">");
Expand All @@ -83,12 +83,12 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" ");
tw.WriteLine(" <appender name=\"ErrorLogAppender\" type=\"log4net.Appender.RollingFileAppender\">");
tw.WriteLine(" <file value=\"[Name]-Error.log\" />");
tw.WriteLine(" <encoding value=\"utf-8\" />");
tw.WriteLine(" <encoding type=\"System.Text.UTF8Encoding\" />");
tw.WriteLine(" <appendToFile value=\"true\" />");
tw.WriteLine(" <lockingModel type=\"log4net.Appender.FileAppender+MinimalLock\" />");
tw.WriteLine(" <rollingStyle value=\"Once\" />");
tw.WriteLine(" <maxSizeRollBackups value=\"4\" />");
tw.WriteLine(" <maximumFileSize value=\"1MB\" />");
tw.WriteLine(" <rollingStyle value=\"Size\" />");
tw.WriteLine(" <maxSizeRollBackups value=\"5\" />");
tw.WriteLine(" <maximumFileSize value=\"5MB\" />");
tw.WriteLine(" <staticLogFileName value=\"true\" />");
tw.WriteLine(" <PreserveLogFileNameExtension value=\"true\" />");
tw.WriteLine(" <layout type=\"log4net.Layout.PatternLayout\">");
Expand All @@ -98,7 +98,7 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" ");
tw.WriteLine(" <appender name=\"ErrorLossyFileAppender\" type=\"log4net.Appender.BufferingForwardingAppender\">");
tw.WriteLine(" <bufferSize value=\"1\" />");
tw.WriteLine(" <encoding value=\"utf-8\" />");
tw.WriteLine(" <encoding type=\"System.Text.UTF8Encoding\" />");
tw.WriteLine(" <lossy value=\"true\"/>");
tw.WriteLine(" <evaluator type=\"log4net.Core.LevelEvaluator\">");
tw.WriteLine(" <threshold value=\"ERROR\" />");
Expand All @@ -108,7 +108,7 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" </appender>");
tw.WriteLine(" ");
tw.WriteLine(" <appender name=\"ConsoleAppender\" type=\"log4net.Appender.ConsoleAppender\">");
tw.WriteLine(" <encoding value=\"utf-8\" />");
tw.WriteLine(" <encoding type=\"System.Text.UTF8Encoding\" />");
tw.WriteLine(" <layout type=\"log4net.Layout.PatternLayout\">");
tw.WriteLine(" <lockingModel type=\"log4net.Appender.FileAppender+MinimalLock\" />");
tw.WriteLine(" <conversionPattern value=\"[%date] [%-7logger] [%-9thread] [%-5level] - %message%newline\" />");
Expand Down
4 changes: 3 additions & 1 deletion Common-MP-TVE3/DirectShowLib/AXExtend.cs
View file
Expand Up @@ -2255,7 +2255,9 @@ public interface IEncoderAPI
[ComImport, SuppressUnmanagedCodeSecurity,
Guid("02997C3B-8E1B-460e-9270-545E0DE9563E"),
InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
public interface IVideoEncoder : IEncoderAPI
#pragma warning disable 612,618
public interface IVideoEncoder : IEncoderAPI
#pragma warning restore 612,618
{
#region IEncoderAPI Methods

Expand Down
4 changes: 3 additions & 1 deletion Common-MP-TVE3/DirectShowLib/AssemblyInfo.cs
View file
Expand Up @@ -53,5 +53,7 @@
[assembly: AssemblyKeyName("")]
[assembly: ComVisible(false)]
[assembly: CLSCompliant(true)]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
#pragma warning disable 612,618
[assembly: SecurityPermission(action: SecurityAction.RequestMinimum, UnmanagedCode = true)]
#pragma warning restore 612,618
[assembly: AssemblyFileVersion("2.0.0.0")]

0 comments on commit b5f471b

Please sign in to comment.