diff --git a/CommonMark.Console/App.nuget.config b/CommonMark.Console/App.nuget.config deleted file mode 100644 index 3ed0222..0000000 --- a/CommonMark.Console/App.nuget.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CommonMark.Console/CommonMark.Console.csproj b/CommonMark.Console/CommonMark.Console.csproj index c5d2b4c..ce31f4f 100644 --- a/CommonMark.Console/CommonMark.Console.csproj +++ b/CommonMark.Console/CommonMark.Console.csproj @@ -4,6 +4,8 @@ net45 Exe + + cmark @@ -13,8 +15,22 @@ https://github.com/Knagis/CommonMark.NET Copyright © Kārlis Gaņģis 2014 - 1.0.0.0 - 1.0.0.0 + CommonMark.NET.Console + CommonMark.NET.Console + Kārlis Gaņģis + https://raw.githubusercontent.com/Knagis/CommonMark.NET/master/LICENSE.md + https://github.com/Knagis/CommonMark.NET/ + https://raw.githubusercontent.com/dcurtis/markdown-mark/master/png/32x20.png + false + .NET library for converting Markdown documents to HTML according to the CommonMark specification. Optimized for maximum performance and targets every .NET version since 2.0, including PCL, Mono and .NET Core. + Fixed lists with tab characters and double trailing newlines. + CommonMark Markdown + + true + true + true + true + true @@ -35,8 +51,30 @@ pdbonly + + + + + + + + + + + + + + + + + + + <_TargetPathsToSymbolsWithTfm Include="$(OutputPath)CommonMark.pdb" TargetFramework="$(TargetFramework)" /> + + + \ No newline at end of file diff --git a/CommonMark.NET.nuspec b/CommonMark.NET.nuspec deleted file mode 100644 index c6869a8..0000000 --- a/CommonMark.NET.nuspec +++ /dev/null @@ -1,30 +0,0 @@ - - - - CommonMark.NET - 0.15.1 - CommonMark.NET - Kārlis Gaņģis - https://raw.githubusercontent.com/Knagis/CommonMark.NET/master/LICENSE.md - https://github.com/Knagis/CommonMark.NET/ - https://raw.githubusercontent.com/dcurtis/markdown-mark/master/png/32x20.png - false - Fastest .NET library for converting Markdown documents to HTML. - .NET library for converting Markdown documents to HTML according to the CommonMark specification. Optimized for maximum performance and targets every .NET version since 2.0, including PCL, Mono and .NET Core. - Fixed lists with tab characters and double trailing newlines. - Copyright © Kārlis Gaņģis 2014-2017 - CommonMark Markdown - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CommonMark.sln b/CommonMark.sln index ff3e7a3..404ef6b 100644 --- a/CommonMark.sln +++ b/CommonMark.sln @@ -10,7 +10,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{EC5FFA77-658F-4D2F-A5CE-5F1BD44F3FC0}" ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml - CommonMark.NET.nuspec = CommonMark.NET.nuspec LICENSE.md = LICENSE.md README.md = README.md runtests.pl = runtests.pl diff --git a/CommonMark/CommonMark.Base.csproj b/CommonMark/CommonMark.Base.csproj index 7039b40..3cd402f 100644 --- a/CommonMark/CommonMark.Base.csproj +++ b/CommonMark/CommonMark.Base.csproj @@ -19,13 +19,20 @@ https://github.com/Knagis/CommonMark.NET Copyright © Kārlis Gaņģis 2014-2016 - 0.1.0.0 - 0.1.0.0 + CommonMark.NET + CommonMark.NET + Kārlis Gaņģis + https://raw.githubusercontent.com/Knagis/CommonMark.NET/master/LICENSE.md + https://github.com/Knagis/CommonMark.NET/ + https://raw.githubusercontent.com/dcurtis/markdown-mark/master/png/32x20.png + false + .NET library for converting Markdown documents to HTML according to the CommonMark specification. Optimized for maximum performance and targets every .NET version since 2.0, including PCL, Mono and .NET Core. + Fixed lists with tab characters and double trailing newlines. + CommonMark Markdown - - false - ..\CommonMark.NET.nuspec - configuration=$(Configuration) + true + true + true @@ -70,9 +77,11 @@ - - Properties\CommonMark.NET.nuspec - + + + + + \ No newline at end of file diff --git a/CommonMark/CommonMarkConverter.cs b/CommonMark/CommonMarkConverter.cs index 59e03cd..cda18f1 100644 --- a/CommonMark/CommonMarkConverter.cs +++ b/CommonMark/CommonMarkConverter.cs @@ -3,7 +3,6 @@ using System; using System.IO; using System.Reflection; -using System.Text; using System.Threading; namespace CommonMark @@ -46,22 +45,7 @@ public static Version Version private static Version InitializeVersion() { - // System.Xml is not available so resort to string parsing. - using (var stream = Assembly.GetManifestResourceStream("CommonMark.Properties.CommonMark.NET.nuspec")) - using (var reader = new System.IO.StreamReader(stream, Encoding.UTF8)) - { - string line; - while ((line = reader.ReadLine()) != null) - { - var i = line.IndexOf("", StringComparison.Ordinal); - if (i == -1) - continue; - - i += 9; - return new Version(line.Substring(i, line.IndexOf("", StringComparison.Ordinal) - i)); - } - } - return null; + return new Version(ThisAssembly.AssemblyFileVersion); } /// diff --git a/appveyor.yml b/appveyor.yml index 8a59fc1..26a9793 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,4 +8,7 @@ before_build: - nuget restore build: parallel: true - verbosity: minimal \ No newline at end of file + verbosity: minimal +artifacts: +- path: 'CommonMark\bin\*\*.nupkg' +- path: 'CommonMark.Console\bin\*\*.nupkg' diff --git a/version.json b/version.json new file mode 100644 index 0000000..3ab71f1 --- /dev/null +++ b/version.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.15.1.0", + "assemblyVersion": { + "precision": "minor" + }, + "publicReleaseRefSpec": [ + "^refs/heads/master$" + ], + "nugetPackageVersion": { + "semVer": 1 + }, + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +}