Skip to content

Commit

Permalink
Fix submodule integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamietre
jamietre committed Sep 26, 2012
1 parent 91a1bc6 commit 5d8ba86
Show file tree
Hide file tree
Showing 8 changed files with 1,294 additions and 46 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "source/HtmlParserSharp"]
path = source/HtmlParserSharp
[submodule "source/CsQuery/HtmlParserSharp"]
path = source/CsQuery/HtmlParserSharp
url = https://github.com/jamietre/HtmlParserSharp.git
1,284 changes: 1,258 additions & 26 deletions distribution/CsQuery.XML
View file

Large diffs are not rendered by default.

Binary file modified distribution/CsQuery.dll
View file
Binary file not shown.
Binary file modified distribution/CsQuery.pdb
View file
Binary file not shown.
12 changes: 2 additions & 10 deletions source/CsQuery.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csquery.Tests", "CsQuery.Tests\Csquery.Tests.csproj", "{F8920741-0BB4-4939-A774-0F9059B2B7F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlParserSharp", "htmlparsersharp\HtmlParserSharp\HtmlParserSharp.csproj", "{FD150915-D34F-436A-92C1-80AA505DA754}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2F9B2385-B8D2-4682-A76A-F308C3429A5E}"
ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config
Expand Down Expand Up @@ -42,19 +40,13 @@ Global
{F8920741-0BB4-4939-A774-0F9059B2B7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8920741-0BB4-4939-A774-0F9059B2B7F0}.Release|Any CPU.Build.0 = Release|Any CPU
{F8920741-0BB4-4939-A774-0F9059B2B7F0}.Release|x64.ActiveCfg = Release|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Debug|x64.ActiveCfg = Debug|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Release|Any CPU.Build.0 = Release|Any CPU
{FD150915-D34F-436A-92C1-80AA505DA754}.Release|x64.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
BuildVersion_AssemblyInfoFilename =
BuildVersion_UseGlobalSettings = False
BuildVersion_BuildVersioningStyle = None.None.None.None
BuildVersion_UseGlobalSettings = False
BuildVersion_AssemblyInfoFilename =
EndGlobalSection
EndGlobal
38 changes: 31 additions & 7 deletions source/CsQuery/CsQuery.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,36 @@
<Compile Include="ExtensionMethods\Xml\CqXmlNode.cs" />
<Compile Include="ExtensionMethods\Xml\Xml.cs" />
<Compile Include="ExtensionMethods\Xml\CqXmlNodeList.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\Attributes.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\DoctypeExpectation.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\DocumentMode.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\DocumentModeEventArgs.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\EncodingDetectedEventArgs.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\ITokenHandler.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\ParserErrorEventArgs.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Common\XmlViolationPolicy.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\AttributeName.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\CharsetState.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\CoalescingTreeBuilder.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\DispatchGroup.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\ElementName.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\HtmlAttributes.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\ILocator.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\InsertionMode.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\ITreeBuilderState.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\Locator.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\NamedCharacterAccel.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\NamedCharacters.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\NCName.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\Portability.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\StackNode.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\StateSnapshot.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\TaintableLocator.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\Tokenizer.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\TreeBuilder.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\TreeBuilderConstants.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\Core\UTF16Buffer.cs" />
<Compile Include="HtmlParserSharp\HtmlParserSharp\TreeBuilders\DomTreeBuilder.cs" />
<Compile Include="HtmlParser\CsQueryTreeBuilder.cs" />
<Compile Include="HtmlParser\ElementFactory.cs" />
<Compile Include="HtmlParser\HtmlPreprocessor.cs" />
Expand Down Expand Up @@ -432,12 +462,6 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\htmlparsersharp\HtmlParserSharp\HtmlParserSharp.csproj">
<Project>{fd150915-d34f-436a-92c1-80aa505da754}</Project>
<Name>HtmlParserSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>if not $(ConfigurationName) ==Release GOTO finished
Expand All @@ -453,7 +477,7 @@ xcopy $(TargetDir)CsQuery.xml $(SolutionDir)..\Distribution /Y
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_ConfigurationName="Any" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.None.Increment" />
<UserProperties BuildVersion_BuildVersioningStyle="None.None.None.Increment" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_ConfigurationName="Any" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UseGlobalSettings="True" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
0 source/HtmlParserSharp → source/CsQuery/HtmlParserSharp
Submodule HtmlParserSharp updated from 000000 to 08c3ef
2 changes: 1 addition & 1 deletion source/CsQuery/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("1.2.1.229")]
[assembly: AssemblyVersion("1.2.1.233")]

0 comments on commit 5d8ba86

Please sign in to comment.