diff --git a/CommonMark.Console/CommonMark.Console.csproj b/CommonMark.Console/CommonMark.Console.csproj index 3dd2ca2..c5d2b4c 100644 --- a/CommonMark.Console/CommonMark.Console.csproj +++ b/CommonMark.Console/CommonMark.Console.csproj @@ -1,67 +1,42 @@  - - + + - Debug - AnyCPU - {83F44787-27A2-4C18-97E2-497437C8EF75} + net45 Exe - Properties - CommonMark.Console - CommonMark.Console - v4.5 - 512 - - - - AnyCPU + + + CommonMark.NET Console + CommonMark.NET + CommonMark.NET + https://github.com/Knagis/CommonMark.NET + Copyright © Kārlis Gaņģis 2014 + + 1.0.0.0 + 1.0.0.0 + + + + + <_Parameter1> + + + <_Parameter1> + + + + true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - AnyCPU + + pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false + - - - - - - - - - - - - - - - - - {40ab0d9c-9464-45b2-ac79-72a566fa1371} - CommonMark.NET45 - + - - + \ No newline at end of file diff --git a/CommonMark.Console/Properties/AssemblyInfo.cs b/CommonMark.Console/Properties/AssemblyInfo.cs index 8880d3a..c4670e1 100644 --- a/CommonMark.Console/Properties/AssemblyInfo.cs +++ b/CommonMark.Console/Properties/AssemblyInfo.cs @@ -1,36 +1,6 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommonMark.NET Console")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CommonMark.NET")] -[assembly: AssemblyCopyright("Copyright © Kārlis Gaņģis 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c23df822-e0ff-4545-af75-6db40fa843ce")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CommonMark.NET.nuspec b/CommonMark.NET.nuspec index fa7c188..c6869a8 100644 --- a/CommonMark.NET.nuspec +++ b/CommonMark.NET.nuspec @@ -17,14 +17,14 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/CommonMark.Tests/CommonMark.Tests.csproj b/CommonMark.Tests/CommonMark.Tests.csproj index f0d76f9..8118d56 100644 --- a/CommonMark.Tests/CommonMark.Tests.csproj +++ b/CommonMark.Tests/CommonMark.Tests.csproj @@ -1,121 +1,56 @@  - + + - Debug - AnyCPU - {B3158916-F54D-4F00-B553-E86D4370FF96} - Library - Properties - CommonMark.Tests - CommonMark.Tests - v4.5.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest + net451 - + + true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - + + pdbonly - true - bin\Release\ - TRACE - prompt - 4 + - true + https://github.com/Knagis/CommonMark.NET + Copyright © Kārlis Gaņģis 2014 + + 1.0.0.0 + 1.0.0.0 + + + + <_Parameter1> + + + <_Parameter1> + + + + true ..\CommonMark\Properties\public.snk + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Specs.tt - + + + - - TextTemplatingFileGenerator - Specs.cs - + + - + + - - {0fd4b1dd-45a8-4f02-beb0-5881cd512573} - CommonMark.Base - + - - - - - False - - - False - - - False - - - False - - - - - - - + \ No newline at end of file diff --git a/CommonMark.Tests/Properties/AssemblyInfo.cs b/CommonMark.Tests/Properties/AssemblyInfo.cs index 3fcdcba..c4670e1 100644 --- a/CommonMark.Tests/Properties/AssemblyInfo.cs +++ b/CommonMark.Tests/Properties/AssemblyInfo.cs @@ -1,36 +1,6 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommonMark.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CommonMark.Tests")] -[assembly: AssemblyCopyright("Copyright © Kārlis Gaņģis 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +using System.Runtime.InteropServices; // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("63cd64df-e46c-439d-942a-e0c461ff06c6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CommonMark.sln b/CommonMark.sln index 2828f01..ff3e7a3 100644 --- a/CommonMark.sln +++ b/CommonMark.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.136 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.Base", "CommonMark\CommonMark.Base.csproj", "{0FD4B1DD-45A8-4F02-BEB0-5881CD512573}" EndProject @@ -16,18 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{EC5FFA77 runtests.pl = runtests.pl EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.NET20", "CommonMark\CommonMark.NET20.csproj", "{075E7F00-F1C0-49AA-808D-8B15F1A82DDE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.NET35", "CommonMark\CommonMark.NET35.csproj", "{61829669-5091-4F2A-A0B1-7348D7CED840}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.NET40", "CommonMark\CommonMark.NET40.csproj", "{0176CB03-177C-464A-A155-089595E77520}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.NET45", "CommonMark\CommonMark.NET45.csproj", "{40AB0D9C-9464-45B2-AC79-72A566FA1371}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.Tests", "CommonMark.Tests\CommonMark.Tests.csproj", "{B3158916-F54D-4F00-B553-E86D4370FF96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonMark.Profile259", "CommonMark\CommonMark.Profile259.csproj", "{E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -42,32 +32,15 @@ Global {83F44787-27A2-4C18-97E2-497437C8EF75}.Debug|Any CPU.Build.0 = Debug|Any CPU {83F44787-27A2-4C18-97E2-497437C8EF75}.Release|Any CPU.ActiveCfg = Release|Any CPU {83F44787-27A2-4C18-97E2-497437C8EF75}.Release|Any CPU.Build.0 = Release|Any CPU - {075E7F00-F1C0-49AA-808D-8B15F1A82DDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {075E7F00-F1C0-49AA-808D-8B15F1A82DDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {075E7F00-F1C0-49AA-808D-8B15F1A82DDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {075E7F00-F1C0-49AA-808D-8B15F1A82DDE}.Release|Any CPU.Build.0 = Release|Any CPU - {61829669-5091-4F2A-A0B1-7348D7CED840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61829669-5091-4F2A-A0B1-7348D7CED840}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61829669-5091-4F2A-A0B1-7348D7CED840}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61829669-5091-4F2A-A0B1-7348D7CED840}.Release|Any CPU.Build.0 = Release|Any CPU - {0176CB03-177C-464A-A155-089595E77520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0176CB03-177C-464A-A155-089595E77520}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0176CB03-177C-464A-A155-089595E77520}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0176CB03-177C-464A-A155-089595E77520}.Release|Any CPU.Build.0 = Release|Any CPU - {40AB0D9C-9464-45B2-AC79-72A566FA1371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40AB0D9C-9464-45B2-AC79-72A566FA1371}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40AB0D9C-9464-45B2-AC79-72A566FA1371}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40AB0D9C-9464-45B2-AC79-72A566FA1371}.Release|Any CPU.Build.0 = Release|Any CPU {B3158916-F54D-4F00-B553-E86D4370FF96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B3158916-F54D-4F00-B553-E86D4370FF96}.Debug|Any CPU.Build.0 = Debug|Any CPU {B3158916-F54D-4F00-B553-E86D4370FF96}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3158916-F54D-4F00-B553-E86D4370FF96}.Release|Any CPU.Build.0 = Release|Any CPU - {E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {847183E9-A8F3-476E-AA8B-B9E412850550} + EndGlobalSection EndGlobal diff --git a/CommonMark/CommonMark.Base.csproj b/CommonMark/CommonMark.Base.csproj index c58644b..7039b40 100644 --- a/CommonMark/CommonMark.Base.csproj +++ b/CommonMark/CommonMark.Base.csproj @@ -1,98 +1,78 @@  - - + + - portable - Debug - AnyCPU - {0FD4B1DD-45A8-4F02-BEB0-5881CD512573} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties + <_Profile328>portable-net4+sl5+win+wpa+wp8 + <_Profile259>portable-net45+win+wpa+wp8 + net45;$(_Profile328);$(_Profile259);netstandard1.0;net40-client;net35-client;net20 + CommonMark CommonMark - 512 - v4.0 - Profile328 - 10.0 + true + AllRules.ruleset + + + + CommonMark.NET + CommonMark.NET + CommonMark.NET + https://github.com/Knagis/CommonMark.NET + Copyright © Kārlis Gaņģis 2014-2016 + + 0.1.0.0 + 0.1.0.0 + + + false + ..\CommonMark.NET.nuspec + configuration=$(Configuration) - + + + + <_Parameter1> + + + <_Parameter1> + + + + true full - false - bin\Debug\ - TRACE;DEBUG - prompt - 4 - - - false - + + pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\CommonMark.XML - false - AllRules.ruleset + true Properties\public.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + $(DefineConstants),OptimizeFor45 + + + + + $(DefineConstants),portable_259,OptimizeFor45 + + + + Properties\CommonMark.NET.nuspec - - + \ No newline at end of file diff --git a/CommonMark/CommonMark.NET20.csproj b/CommonMark/CommonMark.NET20.csproj deleted file mode 100644 index b689352..0000000 --- a/CommonMark/CommonMark.NET20.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - v2.0 - {075E7F00-F1C0-49AA-808D-8B15F1A82DDE} - v2.0 - OptimizeFor20 - - - - - - \ No newline at end of file diff --git a/CommonMark/CommonMark.NET35.csproj b/CommonMark/CommonMark.NET35.csproj deleted file mode 100644 index 50dd0a1..0000000 --- a/CommonMark/CommonMark.NET35.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - v3.5 - {61829669-5091-4F2A-A0B1-7348D7CED840} - v3.5 - Client - - - - - - \ No newline at end of file diff --git a/CommonMark/CommonMark.NET40.csproj b/CommonMark/CommonMark.NET40.csproj deleted file mode 100644 index d87466a..0000000 --- a/CommonMark/CommonMark.NET40.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - v4.0 - v4.0 - Client - {0176CB03-177C-464A-A155-089595E77520} - - - - - - \ No newline at end of file diff --git a/CommonMark/CommonMark.NET45.csproj b/CommonMark/CommonMark.NET45.csproj deleted file mode 100644 index 912a3e0..0000000 --- a/CommonMark/CommonMark.NET45.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - v4.5 - v4.5 - {40AB0D9C-9464-45B2-AC79-72A566FA1371} - OptimizeFor45 - - - - - - \ No newline at end of file diff --git a/CommonMark/CommonMark.Profile259.csproj b/CommonMark/CommonMark.Profile259.csproj deleted file mode 100644 index 3b97777..0000000 --- a/CommonMark/CommonMark.Profile259.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - portable_259 - v4.5 - Profile259 - {E42ABBF6-884C-4D2C-B21D-B96D8B42F8FE} - OptimizeFor45 - - - \ No newline at end of file diff --git a/CommonMark/CommonMark.Targets.csproj b/CommonMark/CommonMark.Targets.csproj deleted file mode 100644 index e071b0e..0000000 --- a/CommonMark/CommonMark.Targets.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - bin\$(BuildMode)\$(Configuration)\ - obj\$(BuildMode)\ - $(TargetFrameworkVersionEx) - $(TargetFrameworkProfileEx) - - $(OutputPath)\CommonMark.xml - $(DefineConstants);$(BuildMode.Replace('.', '_'));$(DefineConstantsEx) - - - - - \ No newline at end of file diff --git a/CommonMark/CommonMarkConverter.cs b/CommonMark/CommonMarkConverter.cs index 6487851..59e03cd 100644 --- a/CommonMark/CommonMarkConverter.cs +++ b/CommonMark/CommonMarkConverter.cs @@ -22,7 +22,7 @@ private static Assembly Assembly private static Assembly InitializeAssembly() { -#if NETCore || portable_259 +#if portable_259 || NETSTANDARD1_0 return typeof(CommonMarkConverter).GetTypeInfo().Assembly; #else return typeof(CommonMarkConverter).Assembly; @@ -46,9 +46,6 @@ public static Version Version private static Version InitializeVersion() { -#if NETCore - return new AssemblyName(Assembly.FullName).Version; -#else // 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)) @@ -65,7 +62,6 @@ private static Version InitializeVersion() } } return null; -#endif } /// diff --git a/CommonMark/CommonMarkException.cs b/CommonMark/CommonMarkException.cs index 8e87a94..7209a2a 100644 --- a/CommonMark/CommonMarkException.cs +++ b/CommonMark/CommonMarkException.cs @@ -8,7 +8,7 @@ namespace CommonMark /// /// An exception that is caught during CommonMark parsing or formatting. /// -#if v2_0 || v3_5 || v4_0 || v4_5 +#if NET20 || NET35_CLIENT || NET40_CLIENT || NET45 [Serializable] #endif public class CommonMarkException : Exception @@ -55,7 +55,7 @@ public CommonMarkException(string message, Block block, Exception innerException this.BlockElement = block; } -#if v2_0 || v3_5 || v4_0 || v4_5 +#if NET20 || NET35_CLIENT || NET40_CLIENT || NET45 /// Initializes a new instance of the class from the specified instances of the and classes. /// A instance that contains the information required to deserialize the new instance. /// A instance. diff --git a/CommonMark/Func.cs b/CommonMark/Func.cs index b000754..43ad60e 100644 --- a/CommonMark/Func.cs +++ b/CommonMark/Func.cs @@ -2,7 +2,7 @@ namespace CommonMark { -#if v2_0 +#if NET20 /// An alternative to System.Func which is not present in .NET 2.0. public delegate TResult Func(); diff --git a/CommonMark/Lazy.cs b/CommonMark/Lazy.cs index 665e29b..06e0964 100644 --- a/CommonMark/Lazy.cs +++ b/CommonMark/Lazy.cs @@ -2,7 +2,7 @@ namespace CommonMark { -#if v2_0 || v3_5 +#if NET20 || NET35_CLIENT enum LazyThreadSafetyMode { None, diff --git a/CommonMark/Parser/Subject.cs b/CommonMark/Parser/Subject.cs index 86dfbba..32567db 100644 --- a/CommonMark/Parser/Subject.cs +++ b/CommonMark/Parser/Subject.cs @@ -72,9 +72,7 @@ public Subject(string buffer, DocumentData documentData) /// public readonly DocumentData DocumentData; -#if !NETCore [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Used by [DebuggerDisplay]")] -#endif // ReSharper disable once UnusedMethodReturnValue.Local private string DebugToString() { diff --git a/CommonMark/Properties/AssemblyInfo.cs b/CommonMark/Properties/AssemblyInfo.cs index 50728b6..2b1d95a 100644 --- a/CommonMark/Properties/AssemblyInfo.cs +++ b/CommonMark/Properties/AssemblyInfo.cs @@ -1,22 +1,6 @@ using System; -using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("CommonMark.NET")] -[assembly: AssemblyDescription("https://github.com/Knagis/CommonMark.NET")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CommonMark.NET")] -[assembly: AssemblyCopyright("Copyright © Kārlis Gaņģis 2014-2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// NETCore project gets the assembly version from project.json file. -#if !NETCore -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] -#endif - [assembly: CLSCompliant(true)] -[assembly: InternalsVisibleTo("CommonMark.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d3a4c92a527690d5bb3b30c00821eb1346022f309ea9b069e4aae5187bb1336b2c16f4333ec41a71824aecbbb0205a76b4abe426be615d2bc254549a99f5caeda5a682773da4961419520dcafbd61e81b4e85b6a5d2a18b4ff52661cf88548a7559338daff82758d83bd00423fd5a8e4122ba0899e678045e4ff5c1d165475c4")] \ No newline at end of file +[assembly: InternalsVisibleTo("CommonMark.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d3a4c92a527690d5bb3b30c00821eb1346022f309ea9b069e4aae5187bb1336b2c16f4333ec41a71824aecbbb0205a76b4abe426be615d2bc254549a99f5caeda5a682773da4961419520dcafbd61e81b4e85b6a5d2a18b4ff52661cf88548a7559338daff82758d83bd00423fd5a8e4122ba0899e678045e4ff5c1d165475c4")] diff --git a/appveyor.yml b/appveyor.yml index cd94bd0..8a59fc1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,12 +1,11 @@ version: 1.0.{build} -os: Visual Studio 2015 +image: Visual Studio 2017 +init: +- git config --global core.autocrlf true configuration: - Release -environment: - DNX_FEED: https://www.nuget.org/api/v2 -install: -- cmd: >- - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% +before_build: +- nuget restore build: parallel: true verbosity: minimal \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..2120c2f --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "MSBuild.Sdk.Extras": "1.6.65" + } +}