diff --git a/Plan B Html Parser.sln b/Plan B Html Parser.sln index 3483fd1..1be3016 100644 --- a/Plan B Html Parser.sln +++ b/Plan B Html Parser.sln @@ -1,28 +1,32 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plan B Html Parser", "Plan B Html Parser\Plan B Html Parser.csproj", "{A6FA0455-ACB5-4E80-9E58-6B79976AA717}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{9E7D5692-C2E9-4219-977E-143CC75B5737}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AD007B35-38A3-47C0-B9DE-A1805B67270C}" ProjectSection(SolutionItems) = preProject LocalTestRun.testrunconfig = LocalTestRun.testrunconfig Plan B Html Parser.vsmdi = Plan B Html Parser.vsmdi EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plan B Html Parser", "Plan B Html Parser\Plan B Html Parser.csproj", "{A6FA0455-ACB5-4E80-9E58-6B79976AA717}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject1", "TestProject1\TestProject1.csproj", "{9E7D5692-C2E9-4219-977E-143CC75B5737}" -EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 3 + SccNumberOfProjects = 4 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs14 + SccTeamFoundationServer = https://tfs.codeplex.com/tfs/TFS14 SccLocalPath0 = . - SccProjectUniqueName1 = Plan\u0020B\u0020Html\u0020Parser\\Plan\u0020B\u0020Html\u0020Parser.csproj - SccProjectName1 = Plan\u0020B\u0020Html\u0020Parser - SccLocalPath1 = Plan\u0020B\u0020Html\u0020Parser - SccProjectUniqueName2 = TestProject1\\TestProject1.csproj - SccProjectName2 = TestProject1 - SccLocalPath2 = TestProject1 + SccProjectUniqueName1 = Plan\u0020B\u0020Html\u0020Parser\\Content\\Content.contentproj + SccProjectTopLevelParentUniqueName1 = Plan\u0020B\u0020Html\u0020Parser\\Plan\u0020B\u0020Html\u0020Parser.csproj + SccProjectName1 = Plan\u0020B\u0020Html\u0020Parser/Content + SccLocalPath1 = Plan\u0020B\u0020Html\u0020Parser\\Content + SccProjectUniqueName2 = Plan\u0020B\u0020Html\u0020Parser\\Plan\u0020B\u0020Html\u0020Parser.csproj + SccProjectName2 = Plan\u0020B\u0020Html\u0020Parser + SccLocalPath2 = Plan\u0020B\u0020Html\u0020Parser + SccProjectUniqueName3 = TestProject1\\TestProject1.csproj + SccProjectName3 = TestProject1 + SccLocalPath3 = TestProject1 EndGlobalSection GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = Plan B Html Parser.vsmdi @@ -56,6 +60,12 @@ Global {9E7D5692-C2E9-4219-977E-143CC75B5737}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {9E7D5692-C2E9-4219-977E-143CC75B5737}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9E7D5692-C2E9-4219-977E-143CC75B5737}.Release|x86.ActiveCfg = Release|Any CPU + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Debug|x86.ActiveCfg = Debug|x86 + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Release|Any CPU.ActiveCfg = Release|x86 + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {730F03D9-CB96-43A9-88E3-A8687A66CF5E}.Release|x86.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Plan B Html Parser/Nodes/HtmlNode.cs b/Plan B Html Parser/Nodes/HtmlNode.cs index 535c186..3e96852 100644 --- a/Plan B Html Parser/Nodes/HtmlNode.cs +++ b/Plan B Html Parser/Nodes/HtmlNode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; using PlanB.Html.Utility; namespace PlanB.Html.Nodes diff --git a/Plan B Html Parser/Plan B Html Parser.csproj b/Plan B Html Parser/Plan B Html Parser.csproj index 4cb892d..80732a8 100644 --- a/Plan B Html Parser/Plan B Html Parser.csproj +++ b/Plan B Html Parser/Plan B Html Parser.csproj @@ -1,5 +1,4 @@ - - + {A6FA0455-ACB5-4E80-9E58-6B79976AA717} {6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -9,24 +8,10 @@ Properties PlanB.Html Plan B Html Parser - v4.0 - v4.0 + v3.5 + v3.1 Windows 1aed1ad2-9777-46c5-92fe-ef987622475f - false - SAK - SAK - SAK - SAK - - - Library - Reach - Client - - - 3.5 - publish\ true Disk @@ -39,8 +24,13 @@ true 0 1.0.0.%2a + false false true + SAK + SAK + SAK + SAK true @@ -54,7 +44,6 @@ false x86 false - AllRules.ruleset pdbonly @@ -66,39 +55,16 @@ true false x86 - True - AllRules.ruleset + true - + False + True - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - + False + True False @@ -111,9 +77,11 @@ False + 3.5 False + 3.5 False @@ -144,11 +112,6 @@ - - False - .NET Framework 3.5 SP1 Client Profile - false - False .NET Framework 2.0 %28x86%29 @@ -164,11 +127,6 @@ .NET Framework 3.5 true - - False - .NET Framework 3.5 SP1 - false - False Windows Installer 3.1 @@ -179,11 +137,6 @@ Microsoft XNA Framework Redistributable 3.1 true - - False - Microsoft XNA Framework Redistributable 4.0 - true - diff --git a/Plan B Html Parser/Properties/AssemblyInfo.cs b/Plan B Html Parser/Properties/AssemblyInfo.cs index c09f369..04e9295 100644 --- a/Plan B Html Parser/Properties/AssemblyInfo.cs +++ b/Plan B Html Parser/Properties/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b8545a1e-c024-4eec-9d5e-a3e470e43671")] +[assembly: Guid("25b75844-05a1-4b9c-b054-a3835cbda08c")] // Version information for an assembly consists of the following four values: // diff --git a/Plan B Html Parser/Utility/ColorHelper.cs b/Plan B Html Parser/Utility/ColorHelper.cs index 6e8d6f2..0337e20 100644 --- a/Plan B Html Parser/Utility/ColorHelper.cs +++ b/Plan B Html Parser/Utility/ColorHelper.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; namespace PlanB.Html.Utility { @@ -35,7 +36,7 @@ namespace PlanB.Html.Utility v.Y = green / 255.0f; v.Z = blue / 255.0f; - return Color.FromNonPremultiplied(v); + return new Color(v); } else { diff --git a/TestProject1/TestProject1.csproj b/TestProject1/TestProject1.csproj index 78ba581..7c04cab 100644 --- a/TestProject1/TestProject1.csproj +++ b/TestProject1/TestProject1.csproj @@ -1,5 +1,4 @@ - - + Debug AnyCPU @@ -10,32 +9,13 @@ Properties TestProject1 TestProject1 - v4.0 + v3.5 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} SAK SAK SAK SAK - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true true @@ -45,7 +25,6 @@ DEBUG;TRACE prompt 4 - AllRules.ruleset pdbonly @@ -54,10 +33,9 @@ TRACE prompt 4 - AllRules.ruleset - + 3.5 @@ -79,28 +57,6 @@ Plan B Html Parser - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - -