Skip to content

Commit

Permalink
Change version to 0.1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josefpihrt committed Oct 27, 2020
1 parent cdc83ed commit e4097f1
Show file tree
Hide file tree
Showing 17 changed files with 159 additions and 20 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.1.1 (2020-10-27)

* Add support for escaping angle brackets as `<` and `>` ([issue](https://github.com/JosefPihrt/DotMarkdown/issues/15))
* Add methods `MFactory.Label`
* Add overload `MarkdownWriter.Create(string, MarkdownWriterSettings)`

## 0.1.0 (2018-08-21)

### New API
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>

<PropertyGroup>
<Version>0.1.0.2</Version>
<Version>0.1.1.0</Version>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)global.ruleset</CodeAnalysisRuleSet>
<LangVersion>8.0</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)DotMarkdown.snk</AssemblyOriginatorKeyFile>
<Authors>Josef Pihrt</Authors>
<Copyright>Copyright (c) 2019-2020 Josef Pihrt</Copyright>
<Copyright>Copyright (c) 2017-2020 Josef Pihrt</Copyright>
</PropertyGroup>

</Project>
14 changes: 12 additions & 2 deletions docs/api.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
assembly DotMarkdown, Version=0.1.0.2, Culture=neutral, PublicKeyToken=117de6512634d621
assembly DotMarkdown, Version=0.1.1.0, Culture=neutral, PublicKeyToken=117de6512634d621

namespace DotMarkdown

Expand Down Expand Up @@ -166,8 +166,9 @@ namespace DotMarkdown

public class MarkdownFormat : IEquatable<MarkdownFormat>

public MarkdownFormat(EmphasisStyle boldStyle = Asterisk, EmphasisStyle italicStyle = Asterisk, BulletListStyle bulletListStyle = Asterisk, OrderedListStyle orderedListStyle = Dot, HeadingStyle headingStyle = NumberSign, HeadingOptions headingOptions = EmptyLineBeforeAndAfter, TableOptions tableOptions = FormatHeader | Padding | OuterDelimiter | EmptyLineBeforeAndAfter, CodeFenceStyle codeFenceStyle = Backtick, CodeBlockOptions codeBlockOptions = EmptyLineBeforeAndAfter, CharEntityFormat charEntityFormat = Hexadecimal, HorizontalRuleFormat? horizontalRuleFormat = null);
public MarkdownFormat(EmphasisStyle boldStyle = Asterisk, EmphasisStyle italicStyle = Asterisk, BulletListStyle bulletListStyle = Asterisk, OrderedListStyle orderedListStyle = Dot, HeadingStyle headingStyle = NumberSign, HeadingOptions headingOptions = EmptyLineBeforeAndAfter, TableOptions tableOptions = FormatHeader | Padding | OuterDelimiter | EmptyLineBeforeAndAfter, CodeFenceStyle codeFenceStyle = Backtick, CodeBlockOptions codeBlockOptions = EmptyLineBeforeAndAfter, CharEntityFormat charEntityFormat = Hexadecimal, HorizontalRuleFormat? horizontalRuleFormat = null, AngleBracketEscapeStyle angleBracketEscapeStyle = Backslash);

public AngleBracketEscapeStyle AngleBracketEscapeStyle { get; }
public EmphasisStyle BoldStyle { get; }
public BulletListStyle BulletListStyle { get; }
public CharEntityFormat CharEntityFormat { get; }
Expand Down Expand Up @@ -208,6 +209,7 @@ namespace DotMarkdown
public abstract WriteState WriteState { get; }

public virtual void Close();
public static MarkdownWriter Create(string fileName, MarkdownWriterSettings settings = null);
public static MarkdownWriter Create(StringBuilder output, MarkdownWriterSettings settings = null);
public static MarkdownWriter Create(TextWriter output, MarkdownWriterSettings settings = null);
public static MarkdownWriter Create(Stream stream, MarkdownWriterSettings settings = null);
Expand Down Expand Up @@ -335,6 +337,12 @@ namespace DotMarkdown
public static bool operator ==(in TableColumnInfo info1, in TableColumnInfo info2);
public static bool operator !=(in TableColumnInfo info1, in TableColumnInfo info2);

public enum AngleBracketEscapeStyle

Backslash = 0,
CharEntity = 1,
EntityRef = 2,

public enum BulletListStyle

Asterisk = 0,
Expand Down Expand Up @@ -677,6 +685,8 @@ namespace DotMarkdown.Linq
public static MItalic Italic(MItalic other);
public static MInline Join(object separator, params object[] values);
public static MInline Join(object separator, IEnumerable<object> values);
public static MLabel Label(MLabel other);
public static MLabel Label(string text, string url, string title = null);
public static MEntityRef LessThan();
public static MLink Link(MLink other);
public static MLink Link(object content, string url, string title = null);
Expand Down
24 changes: 24 additions & 0 deletions docs/api/DotMarkdown/AngleBracketEscapeStyle/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# AngleBracketEscapeStyle Enum

[Home](../../README.md) &#x2022; [Fields](#fields)

**Namespace**: [DotMarkdown](../README.md)

**Assembly**: DotMarkdown\.dll

```csharp
public enum AngleBracketEscapeStyle
```

### Inheritance

[Object](https://docs.microsoft.com/en-us/dotnet/api/system.object) &#x2192; [ValueType](https://docs.microsoft.com/en-us/dotnet/api/system.valuetype) &#x2192; [Enum](https://docs.microsoft.com/en-us/dotnet/api/system.enum) &#x2192; AngleBracketEscapeStyle
## Fields

| Name | Value | Summary |
| ---- | ----- | ------- |
| Backslash | 0 |
| CharEntity | 1 |
| EntityRef | 2 |

47 changes: 47 additions & 0 deletions docs/api/DotMarkdown/Linq/MFactory/Label/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# MFactory\.Label Method

[Home](../../../../README.md)

**Containing Type**: [MFactory](../README.md)

**Assembly**: DotMarkdown\.dll

## Overloads

| Method | Summary |
| ------ | ------- |
| [Label(MLabel)](#DotMarkdown_Linq_MFactory_Label_DotMarkdown_Linq_MLabel_) | |
| [Label(String, String, String)](#DotMarkdown_Linq_MFactory_Label_System_String_System_String_System_String_) | |

## Label\(MLabel\) <a id="DotMarkdown_Linq_MFactory_Label_DotMarkdown_Linq_MLabel_"></a>

```csharp
public static DotMarkdown.Linq.MLabel Label(DotMarkdown.Linq.MLabel other)
```

### Parameters

**other** &ensp; [MLabel](../../MLabel/README.md)

### Returns

[MLabel](../../MLabel/README.md)

## Label\(String, String, String\) <a id="DotMarkdown_Linq_MFactory_Label_System_String_System_String_System_String_"></a>

```csharp
public static DotMarkdown.Linq.MLabel Label(string text, string url, string title = null)
```

### Parameters

**text** &ensp; [String](https://docs.microsoft.com/en-us/dotnet/api/system.string)

**url** &ensp; [String](https://docs.microsoft.com/en-us/dotnet/api/system.string)

**title** &ensp; [String](https://docs.microsoft.com/en-us/dotnet/api/system.string)

### Returns

[MLabel](../../MLabel/README.md)

2 changes: 2 additions & 0 deletions docs/api/DotMarkdown/Linq/MFactory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public static class MFactory
| [Italic(Object\[\])](Italic/README.md#DotMarkdown_Linq_MFactory_Italic_System_Object___) | |
| [Join(Object, IEnumerable\<Object>)](Join/README.md#DotMarkdown_Linq_MFactory_Join_System_Object_System_Collections_Generic_IEnumerable_System_Object__) | |
| [Join(Object, Object\[\])](Join/README.md#DotMarkdown_Linq_MFactory_Join_System_Object_System_Object___) | |
| [Label(MLabel)](Label/README.md#DotMarkdown_Linq_MFactory_Label_DotMarkdown_Linq_MLabel_) | |
| [Label(String, String, String)](Label/README.md#DotMarkdown_Linq_MFactory_Label_System_String_System_String_System_String_) | |
| [LessThan()](LessThan/README.md) | |
| [Link(MLink)](Link/README.md#DotMarkdown_Linq_MFactory_Link_DotMarkdown_Linq_MLink_) | |
| [Link(Object, String, String)](Link/README.md#DotMarkdown_Linq_MFactory_Link_System_Object_System_String_System_String_) | |
Expand Down
8 changes: 5 additions & 3 deletions docs/api/DotMarkdown/MarkdownFormat/-ctor/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MarkdownFormat\(EmphasisStyle, EmphasisStyle, BulletListStyle, OrderedListStyle, HeadingStyle, HeadingOptions, TableOptions, CodeFenceStyle, CodeBlockOptions, CharEntityFormat, HorizontalRuleFormat?\) Constructor
# MarkdownFormat\(EmphasisStyle, EmphasisStyle, BulletListStyle, OrderedListStyle, HeadingStyle, HeadingOptions, TableOptions, CodeFenceStyle, CodeBlockOptions, CharEntityFormat, HorizontalRuleFormat?, AngleBracketEscapeStyle\) Constructor

[Home](../../../README.md)

Expand All @@ -7,7 +7,7 @@
**Assembly**: DotMarkdown\.dll

```csharp
public MarkdownFormat(DotMarkdown.EmphasisStyle boldStyle = Asterisk, DotMarkdown.EmphasisStyle italicStyle = Asterisk, DotMarkdown.BulletListStyle bulletListStyle = Asterisk, DotMarkdown.OrderedListStyle orderedListStyle = Dot, DotMarkdown.HeadingStyle headingStyle = NumberSign, DotMarkdown.HeadingOptions headingOptions = EmptyLineBeforeAndAfter, DotMarkdown.TableOptions tableOptions = FormatHeader | Padding | OuterDelimiter | EmptyLineBeforeAndAfter, DotMarkdown.CodeFenceStyle codeFenceStyle = Backtick, DotMarkdown.CodeBlockOptions codeBlockOptions = EmptyLineBeforeAndAfter, DotMarkdown.CharEntityFormat charEntityFormat = Hexadecimal, DotMarkdown.HorizontalRuleFormat? horizontalRuleFormat = null)
public MarkdownFormat(DotMarkdown.EmphasisStyle boldStyle = Asterisk, DotMarkdown.EmphasisStyle italicStyle = Asterisk, DotMarkdown.BulletListStyle bulletListStyle = Asterisk, DotMarkdown.OrderedListStyle orderedListStyle = Dot, DotMarkdown.HeadingStyle headingStyle = NumberSign, DotMarkdown.HeadingOptions headingOptions = EmptyLineBeforeAndAfter, DotMarkdown.TableOptions tableOptions = FormatHeader | Padding | OuterDelimiter | EmptyLineBeforeAndAfter, DotMarkdown.CodeFenceStyle codeFenceStyle = Backtick, DotMarkdown.CodeBlockOptions codeBlockOptions = EmptyLineBeforeAndAfter, DotMarkdown.CharEntityFormat charEntityFormat = Hexadecimal, DotMarkdown.HorizontalRuleFormat? horizontalRuleFormat = null, DotMarkdown.AngleBracketEscapeStyle angleBracketEscapeStyle = Backslash)
```

### Parameters
Expand All @@ -32,4 +32,6 @@ public MarkdownFormat(DotMarkdown.EmphasisStyle boldStyle = Asterisk, DotMarkdow

**charEntityFormat** &ensp; [CharEntityFormat](../../CharEntityFormat/README.md)

**horizontalRuleFormat** &ensp; [HorizontalRuleFormat](../../HorizontalRuleFormat/README.md)?
**horizontalRuleFormat** &ensp; [HorizontalRuleFormat](../../HorizontalRuleFormat/README.md)?

**angleBracketEscapeStyle** &ensp; [AngleBracketEscapeStyle](../../AngleBracketEscapeStyle/README.md)
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# MarkdownFormat\.AngleBracketEscapeStyle Property

[Home](../../../README.md)

**Containing Type**: [MarkdownFormat](../README.md)

**Assembly**: DotMarkdown\.dll

```csharp
public DotMarkdown.AngleBracketEscapeStyle AngleBracketEscapeStyle { get; }
```

### Property Value

[AngleBracketEscapeStyle](../../AngleBracketEscapeStyle/README.md)

3 changes: 2 additions & 1 deletion docs/api/DotMarkdown/MarkdownFormat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ public class MarkdownFormat : IEquatable<DotMarkdown.MarkdownFormat>

| Constructor | Summary |
| ----------- | ------- |
| [MarkdownFormat(EmphasisStyle, EmphasisStyle, BulletListStyle, OrderedListStyle, HeadingStyle, HeadingOptions, TableOptions, CodeFenceStyle, CodeBlockOptions, CharEntityFormat, HorizontalRuleFormat?)](-ctor/README.md) | |
| [MarkdownFormat(EmphasisStyle, EmphasisStyle, BulletListStyle, OrderedListStyle, HeadingStyle, HeadingOptions, TableOptions, CodeFenceStyle, CodeBlockOptions, CharEntityFormat, HorizontalRuleFormat?, AngleBracketEscapeStyle)](-ctor/README.md) | |

## Properties

| Property | Summary |
| -------- | ------- |
| [AngleBracketEscapeStyle](AngleBracketEscapeStyle/README.md) | |
| [BoldStyle](BoldStyle/README.md) | |
| [BulletListStyle](BulletListStyle/README.md) | |
| [CodeBlockOptions](CodeBlockOptions/README.md) | |
Expand Down
17 changes: 17 additions & 0 deletions docs/api/DotMarkdown/MarkdownWriter/Create/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
| ------ | ------- |
| [Create(Stream, Encoding, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_IO_Stream_System_Text_Encoding_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(Stream, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_IO_Stream_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(String, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_String_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(StringBuilder, IFormatProvider, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_Text_StringBuilder_System_IFormatProvider_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(StringBuilder, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_Text_StringBuilder_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(TextWriter, MarkdownWriterSettings)](#DotMarkdown_MarkdownWriter_Create_System_IO_TextWriter_DotMarkdown_MarkdownWriterSettings_) | |
Expand Down Expand Up @@ -50,6 +51,22 @@ public static DotMarkdown.MarkdownWriter Create(System.IO.Stream stream, DotMark

[MarkdownWriter](../README.md)

## Create\(String, MarkdownWriterSettings\) <a id="DotMarkdown_MarkdownWriter_Create_System_String_DotMarkdown_MarkdownWriterSettings_"></a>

```csharp
public static DotMarkdown.MarkdownWriter Create(string fileName, DotMarkdown.MarkdownWriterSettings settings = null)
```

### Parameters

**fileName** &ensp; [String](https://docs.microsoft.com/en-us/dotnet/api/system.string)

**settings** &ensp; [MarkdownWriterSettings](../../MarkdownWriterSettings/README.md)

### Returns

[MarkdownWriter](../README.md)

## Create\(StringBuilder, IFormatProvider, MarkdownWriterSettings\) <a id="DotMarkdown_MarkdownWriter_Create_System_Text_StringBuilder_System_IFormatProvider_DotMarkdown_MarkdownWriterSettings_"></a>

```csharp
Expand Down
1 change: 1 addition & 0 deletions docs/api/DotMarkdown/MarkdownWriter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public abstract class MarkdownWriter : IDisposable
| [Close()](Close/README.md) | |
| [Create(Stream, Encoding, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_IO_Stream_System_Text_Encoding_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(Stream, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_IO_Stream_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(String, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_String_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(StringBuilder, IFormatProvider, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_Text_StringBuilder_System_IFormatProvider_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(StringBuilder, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_Text_StringBuilder_DotMarkdown_MarkdownWriterSettings_) | |
| [Create(TextWriter, MarkdownWriterSettings)](Create/README.md#DotMarkdown_MarkdownWriter_Create_System_IO_TextWriter_DotMarkdown_MarkdownWriterSettings_) | |
Expand Down
1 change: 1 addition & 0 deletions docs/api/DotMarkdown/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

| Enum | Summary |
| ---- | ------- |
| [AngleBracketEscapeStyle](AngleBracketEscapeStyle/README.md) | |
| [BulletListStyle](BulletListStyle/README.md) | |
| [CodeBlockOptions](CodeBlockOptions/README.md) | |
| [CodeFenceStyle](CodeFenceStyle/README.md) | |
Expand Down
1 change: 1 addition & 0 deletions docs/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@

### Enums

* [AngleBracketEscapeStyle](DotMarkdown/AngleBracketEscapeStyle/README.md)
* [BulletListStyle](DotMarkdown/BulletListStyle/README.md)
* [CharEntityFormat](DotMarkdown/CharEntityFormat/README.md)
* [CodeBlockOptions](DotMarkdown/CodeBlockOptions/README.md)
Expand Down
Binary file added images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 12 additions & 9 deletions src/DotMarkdown/DotMarkdown.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'!='Release|AnyCPU'">
<TargetFramework>netstandard1.3</TargetFramework>
<!--
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
-->
</PropertyGroup>

<PropertyGroup>
Expand All @@ -14,12 +15,12 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>bin\$(Configuration)\DotMarkdown.xml</DocumentationFile>
<DocumentationFile>bin\$(Configuration)\netstandard1.3\DotMarkdown.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup>
<PackageId>DotMarkdown</PackageId>
<PackageVersion>0.1.0</PackageVersion>
<PackageVersion>0.1.1</PackageVersion>
<Authors>Josef Pihrt</Authors>
<Company></Company>
<Description>DotMarkdown is Markdown framework for .NET
Expand All @@ -28,15 +29,17 @@ Commonly Used Types:
DotMarkdown.MarkdownWriter
DotMarkdown.MarkdownFormat
DotMarkdown.Linq.MFactory</Description>
<Copyright>Copyright (c) 2017-2018 Josef Pihrt</Copyright>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageLicenseUrl>http://github.com/JosefPihrt/DotMarkdown/blob/master/LICENSE.txt</PackageLicenseUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>http://github.com/JosefPihrt/DotMarkdown</PackageProjectUrl>
<PackageIconUrl>http://pihrt.net/images/DotMarkdown.ico</PackageIconUrl>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageTags>markdown;md;linq</PackageTags>
<RepositoryUrl>http://github.com/JosefPihrt/DotMarkdown.git</RepositoryUrl>
<RepositoryUrl>https://github.com/JosefPihrt/DotMarkdown.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\images\icon.png" Pack="true" PackagePath="\" Visible="false" />
</ItemGroup>

</Project>
10 changes: 9 additions & 1 deletion tools/build.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
@echo off

dotnet restore --force "..\DotMarkdown.sln"
set _version=0.1.1

orang replace "..\src" -e csproj -c "(?<=<PackageVersion>)\d+\.\d+\.\d+(?=</PackageVersion>)" -r "%_version%" -t m r
echo.

orang delete "..\src" -a d -n "bin|obj" e --content-only -t n -y su s
echo.

dotnet restore "..\DotMarkdown.sln" --force /p:Configuration=Release

"C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild" "..\DotMarkdown.sln" ^
/t:Clean ^
Expand Down
4 changes: 2 additions & 2 deletions tools/generate_documentation.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off

set _roslynatorExe="..\..\roslynator\src\CommandLine\bin\Debug\net472\roslynator"
set _roslynatorExe="..\..\roslynator\src\CommandLine\bin\Debug\net48\roslynator"
set _msbuildPath="C:\Program Files\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
set _msbuildProperties="Configuration=Release"
set _rootDirectoryUrl="../../docs/api/"
Expand All @@ -17,7 +17,7 @@ set _rootDirectoryUrl="../../docs/api/"
%_roslynatorExe% list-symbols "..\DotMarkdown.sln" ^
--msbuild-path %_msbuildPath% ^
--properties %_msbuildProperties% ^
--projects DotMarkdown ^
--projects DotMarkdown(netstandard1.3) ^
--visibility public ^
--depth member ^
--ignored-parts containing-namespace assembly-attributes ^
Expand Down

0 comments on commit e4097f1

Please sign in to comment.