Skip to content

chore: drop Docfx.MarkdigEngine.Validators #8971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yufeih merged 1 commit into from
Jul 17, 2023
Merged

chore: drop Docfx.MarkdigEngine.Validators #8971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 13 additions & 28 deletions docfx.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.MarkdigEngine.Extensi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.MarkdigEngine.Tests", "test\Docfx.MarkdigEngine.Tests\Docfx.MarkdigEngine.Tests.csproj", "{DD9736B2-8AA2-44AE-B0B3-57510FF0D634}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.MarkdigEngine.Validators", "src\Docfx.MarkdigEngine.Validators\Docfx.MarkdigEngine.Validators.csproj", "{BD35FD90-4F00-4A19-9530-2279A6A15EE8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{377A4748-C426-4D5E-9A25-6D1809A7B85C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{C533106C-5699-450C-A18C-249364CBF58B}"
Expand All @@ -126,6 +124,18 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x64.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x64.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x86.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x86.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|Any CPU.Build.0 = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x64.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x64.Build.0 = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x86.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x86.Build.0 = Release|Any CPU
{7E877810-DC13-4A6C-8DFC-184C00A20B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7E877810-DC13-4A6C-8DFC-184C00A20B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7E877810-DC13-4A6C-8DFC-184C00A20B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -402,18 +412,6 @@ Global
{958DF90F-0528-4C50-9AC2-E86C60971B7D}.Release|x64.Build.0 = Release|Any CPU
{958DF90F-0528-4C50-9AC2-E86C60971B7D}.Release|x86.ActiveCfg = Release|Any CPU
{958DF90F-0528-4C50-9AC2-E86C60971B7D}.Release|x86.Build.0 = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x64.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x64.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x86.ActiveCfg = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Debug|x86.Build.0 = Debug|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|Any CPU.Build.0 = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x64.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x64.Build.0 = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x86.ActiveCfg = Release|Any CPU
{EF53214F-BA98-4026-BEED-CF771865C312}.Release|x86.Build.0 = Release|Any CPU
{E9795C9A-1F98-4716-A0FC-843C6B000BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9795C9A-1F98-4716-A0FC-843C6B000BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9795C9A-1F98-4716-A0FC-843C6B000BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -594,18 +592,6 @@ Global
{DD9736B2-8AA2-44AE-B0B3-57510FF0D634}.Release|x64.Build.0 = Release|Any CPU
{DD9736B2-8AA2-44AE-B0B3-57510FF0D634}.Release|x86.ActiveCfg = Release|Any CPU
{DD9736B2-8AA2-44AE-B0B3-57510FF0D634}.Release|x86.Build.0 = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|x64.ActiveCfg = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|x64.Build.0 = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|x86.ActiveCfg = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Debug|x86.Build.0 = Debug|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|Any CPU.Build.0 = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x64.ActiveCfg = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x64.Build.0 = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x86.ActiveCfg = Release|Any CPU
{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x86.Build.0 = Release|Any CPU
{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -673,6 +659,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{F922E543-9AD4-4031-8BD1-8A7AA9771D1E} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{C3023E7B-AA8B-469E-8333-5737093A9D60} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{EF53214F-BA98-4026-BEED-CF771865C312} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{7E877810-DC13-4A6C-8DFC-184C00A20B7C} = {C533106C-5699-450C-A18C-249364CBF58B}
{B6B96738-C338-4904-B932-4C05DB7D4DDE} = {C533106C-5699-450C-A18C-249364CBF58B}
{59CF2F0F-4D4D-4096-8D22-595856CCCF72} = {C533106C-5699-450C-A18C-249364CBF58B}
Expand All @@ -696,7 +683,6 @@ Global
{A95C5BAE-1D0D-44FD-A984-7CBF055A62E2} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
{B3EEB5FE-CF39-4CC7-9650-5709E71D2BA9} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
{958DF90F-0528-4C50-9AC2-E86C60971B7D} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
{EF53214F-BA98-4026-BEED-CF771865C312} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{E9795C9A-1F98-4716-A0FC-843C6B000BE5} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
{FF8D61D0-01C9-44B9-98F9-37FCBF20CD72} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{1D2D316B-4C70-4410-817A-DEDB5B0072A5} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
Expand All @@ -712,7 +698,6 @@ Global
{EA44B820-4C3A-476C-A514-C89CAA6A0F46} = {377A4748-C426-4D5E-9A25-6D1809A7B85C}
{FD0365CB-3F03-43B0-9FB2-FB50047BF3E5} = {377A4748-C426-4D5E-9A25-6D1809A7B85C}
{DD9736B2-8AA2-44AE-B0B3-57510FF0D634} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
{BD35FD90-4F00-4A19-9530-2279A6A15EE8} = {377A4748-C426-4D5E-9A25-6D1809A7B85C}
{377A4748-C426-4D5E-9A25-6D1809A7B85C} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{C533106C-5699-450C-A18C-249364CBF58B} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
{4C9CF944-2489-4AC2-9B18-497D12B53769} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
Expand Down
2 changes: 0 additions & 2 deletions src/Docfx.Build.Engine/DocumentBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ IMarkdownServiceProvider GetMarkdownServiceProvider()
{
return new MarkdigServiceProvider
{
Container = _container.GetExport<ICompositionContainer>(),
ConfigureMarkdig = parameters[0].ConfigureMarkdig
};
}
Expand Down Expand Up @@ -277,7 +276,6 @@ private MarkdigMarkdownService CreateMarkdigMarkdownService(DocumentBuildParamet
Extensions = parameters.MarkdownEngineParameters,
Tokens = TemplateProcessorUtility.LoadTokens(resourceProvider)?.ToImmutableDictionary(),
},
new CompositionContainer(CompositionContainer.DefaultContainer),
parameters.ConfigureMarkdig);
}

Expand Down
4 changes: 0 additions & 4 deletions src/Docfx.MarkdigEngine.Extensions/Docfx.MarkdigEngine.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Docfx.MarkdigEngine.Validators\Docfx.MarkdigEngine.Validators.csproj" />
</ItemGroup>

</Project>
36 changes: 0 additions & 36 deletions src/Docfx.MarkdigEngine.Extensions/Rewriter/MarkdownObjectRewriterFactory.cs
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions src/Docfx.MarkdigEngine.Extensions/Rewriter/MarkdownObjectValidatorAdapter.cs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/Docfx.MarkdigEngine.Validators/Docfx.MarkdigEngine.Validators.csproj
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Docfx.MarkdigEngine.Validators/IMarkdownObjectValidator.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/Docfx.MarkdigEngine.Validators/IMarkdownObjectValidatorProvider.cs
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions src/Docfx.MarkdigEngine.Validators/MarkdownLambdaObjectValidator.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/Docfx.MarkdigEngine.Validators/MarkdownObjectValidatorFactory.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Docfx.MarkdigEngine/Docfx.MarkdigEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Markdig" />
<PackageReference Include="System.Composition" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Collections.Immutable" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/Docfx.MarkdigEngine/MarkdigMarkdownService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ public class MarkdigMarkdownService : IMarkdownService

public MarkdigMarkdownService(
MarkdownServiceParameters parameters,
ICompositionContainer container = null,
Func<MarkdownPipelineBuilder, MarkdownPipelineBuilder> configureMarkdig = null)
{
_parameters = parameters;
_configureMarkdig = configureMarkdig;
_mvb = MarkdownValidatorBuilder.Create(parameters, container);
_mvb = MarkdownValidatorBuilder.Create(parameters);
_context = new MarkdownContext(
key => _parameters.Tokens.TryGetValue(key, out var value) ? value : null,
(code, message, origin, line) => Logger.LogInfo(message, null, InclusionContext.File.ToString(), line?.ToString(), code),
Expand Down
3 changes: 1 addition & 2 deletions src/Docfx.MarkdigEngine/MarkdigServiceProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace Docfx.MarkdigEngine;

public class MarkdigServiceProvider : IMarkdownServiceProvider
{
public ICompositionContainer Container { get; init; }
public Func<MarkdownPipelineBuilder, MarkdownPipelineBuilder> ConfigureMarkdig { get; init; }

public IMarkdownService CreateMarkdownService(MarkdownServiceParameters parameters)
{
return new MarkdigMarkdownService(parameters, Container, ConfigureMarkdig);
return new MarkdigMarkdownService(parameters, ConfigureMarkdig);
}
}
Loading