diff --git a/.gitignore b/.gitignore index e02791bfa..7b1767188 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ TestResult.xml *.user bin obj +.DS_Store .vs *.metagen *.pdb diff --git a/.gitmodules b/.gitmodules index c2dfb35ef..dedc135d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "external/SharpZipLib"] - path = external/SharpZipLib - url = https://github.com/icsharpcode/SharpZipLib.git [submodule "external/Lucene.Net.Light"] path = external/Lucene.Net.Light url = https://github.com/mono/Lucene.Net.Light.git diff --git a/Makefile b/Makefile index 99039fee6..641e3f52c 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,11 @@ all: build build: $(MDOC) $(MDOC): - $(MSBUILD) apidoctools.sln /p:Configuration=$(CONFIGURATION); + $(MSBUILD) apidoctools.sln /r /p:Configuration=$(CONFIGURATION); prepare: git submodule update --init --recursive - nuget restore apidoctools.sln - nuget install NUnit.Console -version 3.6.0 -NoCache -o packages + nuget install NUnit.Console -version 3.8.0 -NoCache -o packages clean: #$(MSBUILD) apidoctools.sln /t:clean @@ -26,6 +25,7 @@ check-mdoc: nuget: nuget pack mdoc/mdoc.nuspec -outputdirectory bin/Nuget + $(MSBUILD) monodoc/monodoc.csproj /p:Configuration=$(CONFIGURATION) /t:Pack check-monodoc: cd monodoc; $(MAKE) check -B diff --git a/Package.props b/Package.props new file mode 100644 index 000000000..b89c05b69 --- /dev/null +++ b/Package.props @@ -0,0 +1,11 @@ + + + © Microsoft Corporation. All rights reserved. + 5.6.4-alpha1 + Microsoft + https://github.com/mono/api-doc-tools + https://github.com/mono/api-doc-tools/blob/master/LICENSE.md + True + documentation ecmaxml dotnet .net C# F# VB.NET + + diff --git a/apidoctools.sln b/apidoctools.sln index 45054cc30..4cb1bb7f0 100644 --- a/apidoctools.sln +++ b/apidoctools.sln @@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monodoc", "monodoc\monodoc. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monodoc.Test", "monodoc\Test\Monodoc.Test.csproj", "{1EE70E2C-A289-4C36-AD0A-3D0C6CE56615}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZipLib", "external\SharpZipLib\ICSharpCode.SharpZipLib.NET45\ICSharpCode.SharpZipLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mdoc.Test", "mdoc\mdoc.Test\mdoc.Test.csproj", "{5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}" EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "mdoc.Test.FSharp", "mdoc\mdoc.Test\mdoc.Test.FSharp\mdoc.Test.FSharp.fsproj", "{979F9F80-12FE-4236-9E93-6D554AB13701}" @@ -85,22 +83,6 @@ Global {1EE70E2C-A289-4C36-AD0A-3D0C6CE56615}.Release|x64.Build.0 = Release|Any CPU {1EE70E2C-A289-4C36-AD0A-3D0C6CE56615}.Release|x86.ActiveCfg = Release|Any CPU {1EE70E2C-A289-4C36-AD0A-3D0C6CE56615}.Release|x86.Build.0 = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|ARM.Build.0 = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x64.ActiveCfg = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x64.Build.0 = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x86.ActiveCfg = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x86.Build.0 = Debug|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|Any CPU.Build.0 = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|ARM.ActiveCfg = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|ARM.Build.0 = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x64.ActiveCfg = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x64.Build.0 = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x86.ActiveCfg = Release|Any CPU - {0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x86.Build.0 = Release|Any CPU {5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}.Debug|Any CPU.Build.0 = Debug|Any CPU {5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/external/Lucene.Net.Light b/external/Lucene.Net.Light index 85978b7eb..b6349c8a4 160000 --- a/external/Lucene.Net.Light +++ b/external/Lucene.Net.Light @@ -1 +1 @@ -Subproject commit 85978b7eb94738f516824341213d5e94060f5284 +Subproject commit b6349c8a452b213eb897adfd06dc77628a25ce01 diff --git a/external/SharpZipLib b/external/SharpZipLib deleted file mode 160000 index 9ad7f5845..000000000 --- a/external/SharpZipLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9ad7f5845222c99ff009a1daddedc051d25a06b9 diff --git a/mdoc/Makefile b/mdoc/Makefile index 4a30e5e98..bbe212166 100644 --- a/mdoc/Makefile +++ b/mdoc/Makefile @@ -56,7 +56,7 @@ cleanup: -rm -Rf Test/en.actual Test/html.actual nunit: - mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll + mono ../packages/NUnit.ConsoleRunner.3.8.0/tools/nunit3-console.exe mdoc.Test/bin/$(CONFIGURATION)/mdoc.Test.dll Test/DocTest-addNonGeneric.dll: $(CSCOMPILE) $(TEST_CSCFLAGS) -unsafe -debug -optimize -target:library -out:$@ Test/DocTest-addNonGeneric.cs diff --git a/mdoc/mdoc.Test/CppCxFormatterMembersTests.cs b/mdoc/mdoc.Test/CppCxFormatterMembersTests.cs index 8b1e73e12..0ec684bf1 100644 --- a/mdoc/mdoc.Test/CppCxFormatterMembersTests.cs +++ b/mdoc/mdoc.Test/CppCxFormatterMembersTests.cs @@ -126,7 +126,7 @@ public void NoSupport_DefaultParameters() TestMethodSignature(CSharpTestLib, "Mono.DocTest.Widget", "Default", null); } - [TestFixtureTearDown] + [OneTimeTearDown] public void TearDown() { moduleCash.Clear(); diff --git a/mdoc/mdoc.Test/CppCxFormatterTypesTests.cs b/mdoc/mdoc.Test/CppCxFormatterTypesTests.cs index be2bd1867..f90669567 100644 --- a/mdoc/mdoc.Test/CppCxFormatterTypesTests.cs +++ b/mdoc/mdoc.Test/CppCxFormatterTypesTests.cs @@ -187,7 +187,7 @@ public void NoSupport_Exception_ArgumentNullExceptionField() #endregion - [TestFixtureTearDown] + [OneTimeTearDown] public void TearDown() { moduleCash.Clear(); diff --git a/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj b/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj index 3ec0112bb..45cf8585f 100644 --- a/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj +++ b/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj @@ -94,16 +94,12 @@ - - ..\..\..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll - - - ..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - + + + + + {7DA7CD97-614F-4BCD-A2FA-B379590CEA48} mdoc diff --git a/mdoc/mdoc.Test/packages.config b/mdoc/mdoc.Test/packages.config deleted file mode 100644 index 10cd8c656..000000000 --- a/mdoc/mdoc.Test/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj index 718bbc074..afd31e51d 100644 --- a/mdoc/mdoc.csproj +++ b/mdoc/mdoc.csproj @@ -9,7 +9,7 @@ Exe mdoc mdoc - v4.5 + v4.7.1 True @@ -34,18 +34,8 @@ false - - ..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.dll - - - ..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Mdb.dll - - - ..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Pdb.dll - - - ..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Rocks.dll - + + @@ -168,17 +158,9 @@ Resources\mono-ecma-css.xsl - - - {0e7413ff-eb9e-4714-acf2-be3a6a7b2ffd} - ICSharpCode.SharpZipLib - - - {6e644802-b579-4037-9809-9cf4c7172c9d} - monodoc - + \ No newline at end of file diff --git a/mdoc/packages.config b/mdoc/packages.config deleted file mode 100644 index 5770ac17a..000000000 --- a/mdoc/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/mono.snk b/mono.snk new file mode 100644 index 000000000..380116c18 Binary files /dev/null and b/mono.snk differ diff --git a/monodoc/Assembly/AssemblyInfo.cs b/monodoc/Assembly/AssemblyInfo.cs deleted file mode 100644 index 61c5fdcb7..000000000 --- a/monodoc/Assembly/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("1.0.0.0")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("../../class/mono.snk")] diff --git a/monodoc/Makefile b/monodoc/Makefile index 4aeb820d3..3526d6ee2 100644 --- a/monodoc/Makefile +++ b/monodoc/Makefile @@ -1,5 +1,5 @@ CONFIGURATION = Release check: - mono ../packages/NUnit.ConsoleRunner.3.6.0/tools/nunit3-console.exe Test/bin/$(CONFIGURATION)/Monodoc.Test.dll + mono ../packages/NUnit.ConsoleRunner.3.8.0/tools/nunit3-console.exe Test/bin/$(CONFIGURATION)/net471/Monodoc.Test.dll @echo "monodoc Tests Complete!" diff --git a/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs b/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs index 3585b4842..66a3e4d0e 100644 --- a/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs +++ b/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs @@ -10,7 +10,7 @@ namespace Monodoc.Generators.Html public class Ecmaspec2Html : IHtmlExporter { static string css_ecmaspec; - static XslTransform ecma_transform; + static XslCompiledTransform ecma_transform; static XsltArgumentList args = new XsltArgumentList(); public string CssCode { @@ -45,7 +45,7 @@ public string Export (string input, Dictionary extraArgs) static string Htmlize (XPathDocument ecma_xml) { if (ecma_transform == null){ - ecma_transform = new XslTransform (); + ecma_transform = new XslCompiledTransform (); System.Reflection.Assembly assembly = System.Reflection.Assembly.GetAssembly (typeof (Ecmaspec2Html)); Stream stream; stream = assembly.GetManifestResourceStream ("ecmaspec-html-css.xsl"); @@ -58,7 +58,7 @@ static string Htmlize (XPathDocument ecma_xml) if (ecma_xml == null) return ""; StringWriter output = new StringWriter (); - ecma_transform.Transform (ecma_xml, args, output, null); + ecma_transform.Transform (ecma_xml, args, output); return output.ToString (); } diff --git a/monodoc/Monodoc/generators/html/Toc2Html.cs b/monodoc/Monodoc/generators/html/Toc2Html.cs index cb34b9885..acd0cede2 100644 --- a/monodoc/Monodoc/generators/html/Toc2Html.cs +++ b/monodoc/Monodoc/generators/html/Toc2Html.cs @@ -10,11 +10,11 @@ namespace Monodoc.Generators.Html { public class Toc2Html : IHtmlExporter { - XslTransform transform; + XslCompiledTransform transform; public Toc2Html () { - transform = new XslTransform (); + transform = new XslCompiledTransform (); var assembly = Assembly.GetAssembly (typeof (Toc2Html)); var stream = assembly.GetManifestResourceStream ("toc-html.xsl"); XmlReader xml_reader = new XmlTextReader (stream); @@ -24,14 +24,14 @@ public Toc2Html () public string Export (Stream input, Dictionary extraArgs) { var output = new StringWriter (); - transform.Transform (new XPathDocument (input), null, output, null); + transform.Transform (new XPathDocument (input), null, output); return output.ToString (); } public string Export (string input, Dictionary extraArgs) { var output = new StringWriter (); - transform.Transform (new XPathDocument (new StringReader (input)), null, output, null); + transform.Transform (new XPathDocument (new StringReader (input)), null, output); return output.ToString (); } diff --git a/monodoc/Properties/AssemblyInfo.cs b/monodoc/Properties/AssemblyInfo.cs deleted file mode 100644 index ddca343cd..000000000 --- a/monodoc/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("1.0.0.0")] -[assembly:AssemblyDelaySign(false)] - diff --git a/monodoc/Test/Monodoc.Test.csproj b/monodoc/Test/Monodoc.Test.csproj index d8bfd1d8f..6a4a880b7 100644 --- a/monodoc/Test/Monodoc.Test.csproj +++ b/monodoc/Test/Monodoc.Test.csproj @@ -1,59 +1,11 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {1EE70E2C-A289-4C36-AD0A-3D0C6CE56615} - Library - Monodoc.Test - Monodoc.Test - v4.5 + net471 - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - - - true - bin\Release - prompt - 4 - - - - ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - {6e644802-b579-4037-9809-9cf4c7172c9d} - monodoc - - - + + + + - \ No newline at end of file diff --git a/monodoc/Test/packages.config b/monodoc/Test/packages.config deleted file mode 100644 index 549b53889..000000000 --- a/monodoc/Test/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/monodoc/monodoc.csproj b/monodoc/monodoc.csproj index b01532b1b..02c79b366 100644 --- a/monodoc/monodoc.csproj +++ b/monodoc/monodoc.csproj @@ -1,713 +1,27 @@ - - + - Debug - AnyCPU - {6E644802-B579-4037-9809-9CF4C7172C9D} - Library - monodoc - monodoc - v4.5 - 8.0.30703 - 2.0 - - - true - full - false - ..\bin\Debug - DEBUG;LEGACY_MODE - prompt - 4 - false - true - - - true - ..\bin\Release + netstandard2.0 LEGACY_MODE - prompt - 4 - false true + 1.0.0.0 + ../mono.snk + true + $(DefaultItemExcludes);Test\**\* + Mono documentation toolchain library + monodoc $(PackageTags) + ..\bin\Nuget + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - monodoc.xml - - - base.css - - - ecmaspec-html-css.xsl - - - ecmaspec-html.xsl - - - ecmaspec.css - - - helper.js - - - home.html - - - Lminus.gif - - - Lplus.gif - - - creativecommons.png - - - mdoc-html-format.xsl - - - mdoc-html-utils.xsl - - - mdoc-sections-css.xsl - - - mdoc-sections.xsl - - - mono-ecma-css.xsl - - - mono-ecma-impl.xsl - - - mono-ecma.css - - - mono-ecma.xsl - - - toc-html.xsl - - - bc_bg.png - - - bc_separator.png - - - error.png - - - hatch.png - - - headerbg.png - - - help.png - - - house.png - - - members.png - - - namespace.png - - - privclass.png - - - privdelegate.png - - - privenumeration.png - - - privevent.png - - - privextension.png - - - privfield.png - - - privinterface.png - - - privmethod.png - - - privproperty.png - - - privstructure.png - - - protclass.png - - - protdelegate.png - - - protenumeration.png - - - protevent.png - - - protextension.png - - - protfield.png - - - protinterface.png - - - protmethod.png - - - protproperty.png - - - protstructure.png - - - pubclass.png - - - pubdelegate.png - - - pubenumeration.png - - - pubevent.png - - - pubextension.png - - - pubfield.png - - - pubinterface.png - - - pubmethod.png - - - pubproperty.png - - - pubstructure.png - - - reference.png - - - treebg.png - - - - - PreserveNewest - + + - - {0e7413ff-eb9e-4714-acf2-be3a6a7b2ffd} - ICSharpCode.SharpZipLib - + + + + + + - \ No newline at end of file