|
From: <che...@us...> - 2010-11-10 17:09:49
|
Revision: 3921
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3921&view=rev
Author: chef_koch
Date: 2010-11-10 17:09:40 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
reverted last commit
Modified Paths:
--------------
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs
trunk/plugins/FritzBox/FritzBox.sln
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
Property Changed:
----------------
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2010-11-10 16:50:21 UTC (rev 3920)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2010-11-10 17:09:40 UTC (rev 3921)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -16,27 +15,12 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>3.5</OldToolsVersion>
+ <OldToolsVersion>2.0</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -46,7 +30,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -55,7 +38,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
@@ -186,23 +168,6 @@
<None Include="Resources\fritzdial.sh" />
<None Include="Resources\MpeRelease\FritzBox.xmp2" />
</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.
Property changes on: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs 2010-11-10 16:50:21 UTC (rev 3920)
+++ trunk/plugins/FritzBox/FritzBox/Properties/Resources.Designer.cs 2010-11-10 17:09:40 UTC (rev 3921)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:4.0.30319.1
+// Laufzeitversion:2.0.50727.4927
//
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
@@ -19,7 +19,7 @@
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
Modified: trunk/plugins/FritzBox/FritzBox.sln
===================================================================
--- trunk/plugins/FritzBox/FritzBox.sln 2010-11-10 16:50:21 UTC (rev 3920)
+++ trunk/plugins/FritzBox/FritzBox.sln 2010-11-10 17:09:40 UTC (rev 3921)
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+# SharpDevelop 3.1.0.4977
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FritzBox", "FritzBox\FritzBox.csproj", "{7A458560-A537-429E-A016-1A4513CB586F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FritzBoxConfigTester", "Tools\FritzBoxConfigTester\FritzBoxConfigTester.csproj", "{5D751473-DCC5-4044-A6E3-403D97C5B9F9}"
@@ -10,21 +11,49 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Debug|x86.ActiveCfg = Debug|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A458560-A537-429E-A016-1A4513CB586F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|x86.ActiveCfg = Release|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|x86.ActiveCfg = Debug|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|x86.ActiveCfg = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|x86.ActiveCfg = Debug|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|x86.ActiveCfg = Release|Any CPU
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Debug|x86.Build.0 = Debug|x86
+ {FB2B1D6F-4580-4B3B-95A8-C9800F679D9F}.Release|x86.Build.0 = Release|x86
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Debug|x86.Build.0 = Debug|x86
+ {5D751473-DCC5-4044-A6E3-403D97C5B9F9}.Release|x86.Build.0 = Release|x86
+ {7A458560-A537-429E-A016-1A4513CB586F}.Debug|x86.Build.0 = Debug|x86
+ {7A458560-A537-429E-A016-1A4513CB586F}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2010-11-10 16:50:21 UTC (rev 3920)
+++ trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj 2010-11-10 17:09:40 UTC (rev 3921)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +9,7 @@
<RootNamespace>FritzBoxConfigTester</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
+ <OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<SccProjectName>
@@ -21,22 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
- <TargetFrameworkVersion>v2.0</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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,14 +27,12 @@
<Optimize>false</Optimize>
<OutputPath>.\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>.\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core">
@@ -73,23 +54,6 @@
<Name>FritzBox</Name>
</ProjectReference>
</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" />
<ProjectExtensions>
<VisualStudio AllowExistingFolder="true" />
Modified: trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
===================================================================
--- trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj 2010-11-10 16:50:21 UTC (rev 3920)
+++ trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj 2010-11-10 17:09:40 UTC (rev 3921)
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +9,7 @@
<RootNamespace>FritzBoxDebugger</RootNamespace>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
+ <OldToolsVersion>2.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<SccProjectName>
@@ -21,22 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
- <TargetFrameworkVersion>v2.0</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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -44,14 +27,12 @@
<Optimize>false</Optimize>
<OutputPath>.\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>.\bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core">
@@ -85,23 +66,6 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</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" />
<ProjectExtensions>
<VisualStudio AllowExistingFolder="true" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|