|
From: <fr...@us...> - 2011-12-01 10:24:30
|
Revision: 4360
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4360&view=rev
Author: framug
Date: 2011-12-01 10:24:20 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
- Fix ZguideTV url change.
- Visual Studio 2010 + dotnet 3.5 SP1 instead of Visual Studio 2008 + dotnet 2.0.
Modified Paths:
--------------
trunk/plugins/WebEPGfr/InfosSuivantSites.cs
trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs
trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs
trunk/plugins/WebEPGfr/WebEPGfr.csproj
trunk/plugins/WebEPGfr/WebEPGfr.sln
trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
Modified: trunk/plugins/WebEPGfr/InfosSuivantSites.cs
===================================================================
--- trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -82,7 +82,7 @@
{
//logique de recuperation
_oParametre.Add(InfosSuivantSites.Grabber.Kazer.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "Kazer", "Uri", ""));
- _oParametre.Add(InfosSuivantSites.Grabber.ZGuideTV.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/tnt.zip").ToString());
+ _oParametre.Add(InfosSuivantSites.Grabber.ZGuideTV.ToString(), XmlConfig.ReadXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/tnt.zip").ToString());
}
catch { }
}
@@ -122,7 +122,7 @@
sURL_de_verification = @"http://www.kazer.org";
break;
case Grabber.ZGuideTV:
- sURL_de_verification = @"http://xmltv.myftp.org/download/";
+ sURL_de_verification = @"http://xmltv.dyndns.org/download/";
break;
}
return sURL_de_verification;
Modified: trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/Properties/Resources.Designer.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -19,7 +19,7 @@
// à l'aide d'un outil, tel que ResGen ou Visual Studio.
// Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
// avec l'option /str ou régénérez votre projet VS.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/Properties/Settings.Designer.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/plugins/WebEPGfr/WebEPGfr.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,7 +16,24 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +43,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -33,6 +52,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86">
@@ -189,6 +209,23 @@
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -198,6 +235,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent>
+ <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/WebEPGfr/WebEPGfr.sln
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr.sln 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr.sln 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebEPGfr", "WebEPGfr.csproj", "{1F927022-1A44-432D-B98B-82ECBF9765A7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebEPGfr_planification", "WebEPGfr_planification\WebEPGfr_planification.csproj", "{91C8D605-35D6-4CFF-B36D-95C6E7AD6E99}"
Modified: trunk/plugins/WebEPGfr/WebEPGfrSetup.cs
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-12-01 10:24:20 UTC (rev 4360)
@@ -196,11 +196,11 @@
XmlConfig.WriteXmlConfig("WebEPGfr", "Kazer", "Uri", kazer_UserName.Text.ToString());
if (Bouton_ZguideTV_TNT.Checked)
{
- XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/tnt.zip");
+ XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/tnt.zip");
}
else
{
- XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.myftp.org/download/complet.zip");
+ XmlConfig.WriteXmlConfig("WebEPGfr", "ZguideTV", "Uri", @"http://xmltv.dyndns.org/download/complet.zip");
}
}
@@ -350,8 +350,8 @@
}
else
{
- if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip"); }
- else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip"); }
+ if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip"); }
+ else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip"); }
}
oGrabber.Configuration.MappingFile = InfosSuivantSites.GetMappingFileName(oUsedGrabber);
lXmlTvFileIsAvalaible = oGrabber.DownloadXmlTvFile(oGrabber.Configuration.DownloadUri);
@@ -407,8 +407,8 @@
}
else
{
- if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip"); }
- else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip"); }
+ if (Bouton_ZguideTV_TNT.Checked) { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip"); }
+ else { oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip"); }
}
oGrabber.Configuration.MappingFile = InfosSuivantSites.GetMappingFileName(oUsedGrabber);
lXmlTvFileIsAvalaible = oGrabber.DownloadXmlTvFile(oGrabber.Configuration.DownloadUri);
@@ -594,7 +594,7 @@
libinfo.Text = "Acc\xE8s \xE0 la page de t\xE9l\xE9chargement de ZguideTV";
libinfo.ForeColor = Color.Blue;
// On cha\xEEne sur le forum de ZguideTV
- Process.Start("http://xmltv.myftp.org/download/");
+ Process.Start("http://xmltv.dyndns.org/download/");
}
// On a cliqu\xE9 sur le nom d'utilisateur
@@ -750,8 +750,8 @@
string sDownloadUri;
//Choix du guide
if (Bouton_ZguideTV_TNT.Checked)
- { sDownloadUri = @"http://xmltv.myftp.org/download/tnt.zip"; }
- else { sDownloadUri = @"http://xmltv.myftp.org/download/complet.zip"; }
+ { sDownloadUri = @"http://xmltv.dyndns.org/download/tnt.zip"; }
+ else { sDownloadUri = @"http://xmltv.dyndns.org/download/complet.zip"; }
if (TestGrabber(sDownloadUri) == true)
{
@@ -846,7 +846,7 @@
libinfo.ForeColor = Color.Blue;
if (oGrabber != null)
{
- oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/tnt.zip");
+ oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/tnt.zip");
}
}
@@ -860,7 +860,7 @@
libinfo.ForeColor = Color.Blue;
if (oGrabber != null)
{
- oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.myftp.org/download/complet.zip");
+ oGrabber.Configuration.DownloadUri = new Uri(@"http://xmltv.dyndns.org/download/complet.zip");
}
}
#endregion
Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj
===================================================================
--- trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-11-30 08:19:55 UTC (rev 4359)
+++ trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-12-01 10:24:20 UTC (rev 4360)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,7 +14,24 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86">
@@ -64,6 +84,23 @@
<EmbeddedResource Include="WebEPGfr_planification.png" />
<EmbeddedResource Include="WebEPGfr_planificationDisabled.png" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -73,6 +110,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent>
+ <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|