Build improvements (#591)

* HtmlGenerator: Load converters lazily

This is a workaround so that .NET 6 apps can use the .NET FW
build of monodoc.dll without worrying about TypeInitializationExceptions
for converters they don't use.

* Fix netstandard2.0 compatibility

* Replace SharpZipLib submodule with package reference

Remove mdoc/packages.config as well.

* Bump Lucene.Net.Light to latest version to support NetStandard

* monodoc: Change to SDK-style project

* monodoc: Move to netstandard2.0

* Replace all packages.config with PackageReference

Bump mdoc.Test.FSharp.fsproj to .NET 4.7.1 to fix issues using
System.ValueTuple.

* Adjust to mdoc.Test.FSharp.fsproj bump to v4.7.1

* mdoc.Test.FSharp.fsproj: Convert to SDK-style

Fixes errors building in VS2022.

* mdoc.Test.csproj: Update to SDK-style too

* mdoc.Test.csproj no longer needs a direct FSharp.Core reference

* mdoc.Test.FSharp.fsproj: Fix FSharp.Core reference

https://github.com/dotnet/fsharp/blob/main/docs/fsharp-core-notes.md#how-to-explicitly-reference-fsharpcore

* mdoc.Test.csproj: Restore manual WPF reference

* Use AppendTargetFrameworkToOutputPath to avoid touching Makefiles

* Update en.expected-fsharp/index.xml

21 files changed, 79 insertions, 801 deletions

diff --git a/.gitmodules b/.gitmodules
index c2dfb35e..dedc135d 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/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..ef5112cc
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <PropertyGroup>
+    <NuGetVersionFSharpCore>4.3.4</NuGetVersionFSharpCore>
+    <NuGetVersionMonoCecil>0.10.0-beta5</NuGetVersionMonoCecil>
+    <NuGetVersionNUnit>3.10.1</NuGetVersionNUnit>
+    <NuGetVersionNUnit3TestAdapter>3.13.0</NuGetVersionNUnit3TestAdapter>
+    <NuGetVersionQuickIONET>2.6.2.0</NuGetVersionQuickIONET>
+    <NuGetVersionSharpZipLib>1.3.3</NuGetVersionSharpZipLib>
+    <NuGetVersionSystemConfigurationConfigurationManager>6.0.0</NuGetVersionSystemConfigurationConfigurationManager>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/apidoctools.sln b/apidoctools.sln
index 9cfec7f9..e0834cc8 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}"

@@ -75,22 +73,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
-Subproject 85978b7eb94738f516824341213d5e94060f528
+Subproject 68fa3260b0bb497ed80b4b383e71862bf519c05
diff --git a/external/SharpZipLib b/external/SharpZipLib
deleted file mode 160000
-Subproject 9ad7f5845222c99ff009a1daddedc051d25a06b
diff --git a/mdoc/Test/en.expected-fsharp-wsl/index.xml b/mdoc/Test/en.expected-fsharp-wsl/index.xml
index 5c0bed2d..2b3e3567 100644
--- a/mdoc/Test/en.expected-fsharp-wsl/index.xml
+++ b/mdoc/Test/en.expected-fsharp-wsl/index.xml
@@ -45,7 +45,7 @@
           <AttributeName>System.Runtime.InteropServices.Guid("979f9f80-12fe-4236-9e93-6d554ab13701")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.7.1", FrameworkDisplayName=".NET Framework 4.7.1")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
diff --git a/mdoc/Test/en.expected-fsharp/index.xml b/mdoc/Test/en.expected-fsharp/index.xml
index 5c0bed2d..191567c7 100644
--- a/mdoc/Test/en.expected-fsharp/index.xml
+++ b/mdoc/Test/en.expected-fsharp/index.xml
@@ -6,7 +6,7 @@
           <AttributeName>Microsoft.FSharp.Core.FSharpInterfaceDataVersion(2, 0, 0)</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.None)</AttributeName>
+          <AttributeName>System.Diagnostics.Debuggable(System.Diagnostics.DebuggableAttribute+DebuggingModes.Default | System.Diagnostics.DebuggableAttribute+DebuggingModes.IgnoreSymbolStoreSequencePoints)</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyCompany("EPAM Systems")</AttributeName>
@@ -45,7 +45,7 @@
           <AttributeName>System.Runtime.InteropServices.Guid("979f9f80-12fe-4236-9e93-6d554ab13701")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.6.1", FrameworkDisplayName=".NET Framework 4.6.1")</AttributeName>
+          <AttributeName>System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.7.1", FrameworkDisplayName=".NET Framework 4.7.1")</AttributeName>
         </Attribute>
       </Attributes>
     </Assembly>
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 3ec0112b..5ab7aadd 100644
--- a/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj
+++ b/mdoc/mdoc.Test/mdoc.Test.FSharp/mdoc.Test.FSharp.fsproj
@@ -1,58 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>979f9f80-12fe-4236-9e93-6d554ab13701</ProjectGuid>
+    <TargetFramework>net471</TargetFramework>
     <OutputType>Library</OutputType>
-    <RootNamespace>mdoc.Test.FSharp</RootNamespace>
-    <AssemblyName>mdoc.Test.FSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Name>mdoc.Test.FSharp</Name>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <Tailcalls>false</Tailcalls>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <Tailcalls>true</Tailcalls>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Choose>
-    <When Condition="'$(VisualStudioVersion)' == '11.0'">
-      <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets') ">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') ">
-        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Import Project="$(FSharpTargetsPath)" />
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <None Include="Script.fsx" />
-    <Content Include="packages.config" />
     <Compile Include="AbstractClasses.fs" />
     <Compile Include="Accessibility.fs" />
     <Compile Include="AccessibilityTest.fs" />
@@ -94,22 +51,6 @@
     <Compile Include="Library1.fs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\..\..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
+    <PackageReference Update="FSharp.Core" Version="$(NuGetVersionFSharpCore)" />
   </ItemGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/mdoc/mdoc.Test/mdoc.Test.FSharp/packages.config b/mdoc/mdoc.Test/mdoc.Test.FSharp/packages.config
deleted file mode 100644
index 7b60841d..00000000
--- a/mdoc/mdoc.Test/mdoc.Test.FSharp/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FSharp.Core" version="4.3.4" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
-</packages>
\ No newline at end of file
diff --git a/mdoc/mdoc.Test/mdoc.Test.csproj b/mdoc/mdoc.Test/mdoc.Test.csproj
index 7b4768d5..ae540c68 100644
--- a/mdoc/mdoc.Test/mdoc.Test.csproj
+++ b/mdoc/mdoc.Test/mdoc.Test.csproj
@@ -1,68 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />

-  <Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />

+<Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProjectGuid>{5ADDEFB6-930C-46BC-8B2B-FDE5C7E3B5AD}</ProjectGuid>

+    <TargetFramework>net471</TargetFramework>

     <OutputType>Library</OutputType>

-    <RootNamespace>mdoc.Test</RootNamespace>

-    <AssemblyName>mdoc.Test</AssemblyName>

-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>

-    <TargetFrameworkProfile />

-    <NuGetPackageImportStamp>

-    </NuGetPackageImportStamp>

+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

     <OutputPath>bin\Debug</OutputPath>

     <DefineConstants>DEBUG;</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

     <LangVersion>latest</LangVersion>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <Optimize>true</Optimize>

     <OutputPath>bin\Release</OutputPath>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

     <LangVersion>latest</LangVersion>

   </PropertyGroup>

   <PropertyGroup>

     <RunPostBuildEvent>Always</RunPostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="FSharp.Core, Version=4.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>

-      <Private>True</Private>

-    </Reference>

     <Reference Include="mdoc.Test.Cplusplus, Version=1.0.6709.28740, Culture=neutral, processorArchitecture=x86">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\external\Test\mdoc.Test.Cplusplus.dll</HintPath>

     </Reference>

-    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>

-    </Reference>

     <Reference Include="PresentationFramework">

       <Private>True</Private>

       <HintPath>..\..\external\Windows\PresentationFramework.dll</HintPath>

     </Reference>

-    <Reference Include="System" />

-    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Mdb.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Pdb.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Rocks.dll</HintPath>

-    </Reference>

     <Reference Include="Windows">

       <HintPath>..\..\external\Windows\Windows.WinMD</HintPath>

     </Reference>

@@ -72,105 +35,24 @@
     <Reference Include="Windows.Foundation.UniversalApiContract">

       <HintPath>..\..\external\Windows\Windows.Foundation.UniversalApiContract.winmd</HintPath>

     </Reference>

-    <Reference Include="System.Xml" />

-    <Reference Include="System.Xml.Linq" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="AttributeValueFormatterTest.cs" />

-    <Compile Include="BasicFormatterTests.cs" />

-    <Compile Include="BasicTests.cs" />

-    <Compile Include="CppWinRtMembersTests.cs" />

-    <Compile Include="CppWinRtFormatterTests.cs" />

-    <Compile Include="Enumeration\AttachedEntityTests.cs" />

-    <Compile Include="DotnetCoreAssemblyResolver.cs" />

-    <Compile Include="FrameworkIndexHelperTests.cs" />

-    <Compile Include="DocUtilsFSharpTests.cs" />

-    <Compile Include="DocUtilsTests.cs" />

-    <Compile Include="FSharp\BasicFSharpFormatterTests.cs" />

-    <Compile Include="CppCxFormatterMembersTests.cs" />

-    <Compile Include="CppFormatterTests.cs" />

-    <Compile Include="CppCxFormatterTypesTests.cs" />

-    <Compile Include="CppFullFormatterTests.cs" />

-    <Compile Include="FormatterTests.cs" />

-    <Compile Include="FSharp\FSharpFormatterTests.cs" />

-    <Compile Include="FSharp\FSharpUsageFormatterTests.cs" />

-    <Compile Include="JsMemberFormatterTests.cs" />

-    <Compile Include="JsUsageFormatterTests.cs" />

-    <Compile Include="MDocFileSourceTests.cs" />

-    <Compile Include="MDocUpdaterTests.cs" />

-    <Compile Include="NullableReferenceTypesTests.cs" />

-    <Compile Include="SampleClasses\ApplePlatformEnum.cs" />

-    <Compile Include="SampleClasses\EiiImplementclass.cs" />

-    <Compile Include="SampleClasses\GuidClass.cs" />

-    <Compile Include="SampleClasses\Interface_A.cs" />

-    <Compile Include="SampleClasses\Interface_B.cs" />

-    <Compile Include="SampleClasses\InternalEIICalss.cs" />

-    <Compile Include="SampleClasses\SomeFlagsEnum.cs" />

-    <Compile Include="SampleClasses\SomeIteratorStateMachine.cs" />

-    <Compile Include="SampleClasses\NotApplyAttributeValidFlagsEnum.cs" />

-    <Compile Include="SampleClasses\NotApplyAttributeInvalidFlagsEnum.cs" />

-    <Compile Include="SampleClasses\NullablesAndTuples.cs" />

-    <Compile Include="SampleClasses\AttributeDataTypeAttribute.cs" />

-    <Compile Include="SampleClasses\SomeAttribute.cs" />

-    <Compile Include="SampleClasses\SomeNestedTypes.cs" />

-    <Compile Include="SampleClasses\StaticClass.cs" />

-    <Compile Include="SampleClasses\TestClassThree.cs" />

-    <Compile Include="SpanSpecial.cs" />

-    <Compile Include="TypeMapTests.cs" />

-    <Compile Include="SampleClasses\ReadonlyRefClass.cs" />

-    <Compile Include="SampleClasses\ReadOnlySpan.cs" />

-    <Compile Include="SampleClasses\SomeDelegate.cs" />

-    <Compile Include="SampleClasses\SomeInterface.cs" />

-    <Compile Include="SampleClasses\Span.cs" />

-    <Compile Include="SampleClasses\TestClass.cs" />

-    <Compile Include="SampleClasses\SomeGenericClass.cs" />

-    <Compile Include="SampleClasses\WebHostHiddenTestClass.cs" />

-    <Compile Include="SampleClasses\SomeClass.cs" />

-    <Compile Include="SampleClasses\SomeClassWithManyConstructors.cs" />

-    <Compile Include="SampleClasses\SomeEmptyEnum.cs" />

-    <Compile Include="SampleClasses\SomeEnum.cs" />

-    <Compile Include="SampleClasses\TestPrivateClass.cs" />

-    <Compile Include="SampleClasses\TestClassTwo.cs" />

-    <Compile Include="SampleClasses\SomeStruct.cs" />

-    <Compile Include="SampleClasses\WebHostHiddenAttribute.cs" />

-    <Compile Include="StatisticsTests.cs" />

-    <Compile Include="UWPDocUtilsTests.cs" />

-    <Compile Include="VBFormatterTests.cs" />

-    <Compile Include="FrameworkAlternateTests.cs" />

-    <Compile Include="XmlConsts.cs" />

-    <Compile Include="XmlUpdateTests.cs" />

-    <Compile Include="ValidationTests.cs" />

-    <Compile Include="Enumeration\EnumeratorTests.cs" />

-    <Compile Include="Enumeration\ExceptionTests.cs" />

-    <Compile Include="Enumeration\CecilBaseTest.cs" />

-    <Compile Include="Enumeration\InterfaceTests.cs" />

+    <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionMonoCecil)" />

+    <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="packages.config">

-      <SubType>Designer</SubType>

-    </None>

-    <None Include="cppcli\cppcli\cppcli.h">

+    <None Update="cppcli\cppcli\cppcli.h">

       <Link>SampleClasses\cppcli.h</Link>

     </None>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\monodoc\monodoc.csproj">

-      <Project>{6E644802-B579-4037-9809-9CF4C7172C9D}</Project>

-      <Name>monodoc</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\mdoc.csproj">

-      <Project>{7da7cd97-614f-4bcd-a2fa-b379590cea48}</Project>

-      <Name>mdoc</Name>

-    </ProjectReference>

-    <ProjectReference Include="mdoc.Test.FSharp\mdoc.Test.FSharp.fsproj">

-      <Project>{979f9f80-12fe-4236-9e93-6d554ab13701}</Project>

-      <Name>mdoc.Test.FSharp</Name>

-    </ProjectReference>

+    <ProjectReference Include="..\..\monodoc\monodoc.csproj" />

+    <ProjectReference Include="..\mdoc.csproj" />

+    <ProjectReference Include="mdoc.Test.FSharp\mdoc.Test.FSharp.fsproj" />

   </ItemGroup>

   <ItemGroup>

     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

   </ItemGroup>

-  <ItemGroup />

   <ItemGroup>

     <Content Include="cppcli\Debug\cppcli.dll">

       <Link>SampleClasses\cppcli.dll</Link>

@@ -181,13 +63,8 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

   </ItemGroup>

-  <ItemGroup />

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

-    <PropertyGroup>

-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

-    </PropertyGroup>

-    <Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />

-    <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />

-  </Target>

+  <ItemGroup>

+    <Compile Remove="mdoc.Test.NullableReferenceTypes\**\*" />

+    <Compile Remove="UWPTestComponentCSharp\**\*" />

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/mdoc/mdoc.Test/packages.config b/mdoc/mdoc.Test/packages.config
deleted file mode 100644
index e6fde10f..00000000
--- a/mdoc/mdoc.Test/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FSharp.Core" version="4.3.4" targetFramework="net461" />
-  <package id="Mono.Cecil" version="0.10.0-beta5" targetFramework="net45" />
-  <package id="NUnit" version="3.10.1" targetFramework="net471" />
-  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net471" />
-</packages>
\ No newline at end of file
diff --git a/mdoc/mdoc.csproj b/mdoc/mdoc.csproj
index 259f5feb..e87db9c6 100644
--- a/mdoc/mdoc.csproj
+++ b/mdoc/mdoc.csproj
@@ -34,21 +34,6 @@
     <Prefer32Bit>false</Prefer32Bit>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Mdb.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Pdb.dll</HintPath>

-    </Reference>

-    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">

-      <HintPath>..\packages\Mono.Cecil.0.10.0-beta5\lib\net40\Mono.Cecil.Rocks.dll</HintPath>

-    </Reference>

-    <Reference Include="SchwabenCode.QuickIO, Version=2.6.2.0, Culture=neutral, processorArchitecture=MSIL">

-      <HintPath>..\packages\QuickIO.NET.2.6.2.0\lib\net45\SchwabenCode.QuickIO.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Web" />

     <Reference Include="System.Xml.Linq" />

@@ -184,17 +169,17 @@
     <None Include="..\monodoc\Resources\mono-ecma-css.xsl">

       <Link>Resources\mono-ecma-css.xsl</Link>

     </None>

-    <None Include="packages.config" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\external\SharpZipLib\ICSharpCode.SharpZipLib.NET45\ICSharpCode.SharpZipLib.csproj">

-      <Project>{0e7413ff-eb9e-4714-acf2-be3a6a7b2ffd}</Project>

-      <Name>ICSharpCode.SharpZipLib</Name>

-    </ProjectReference>

+    <PackageReference Include="Mono.Cecil" Version="$(NuGetVersionMonoCecil)" />

+    <PackageReference Include="SharpZipLib" Version="$(NuGetVersionSharpZipLib)" />

+    <PackageReference Include="QuickIO.NET" Version="$(NuGetVersionQuickIONET)" />

+  </ItemGroup>

+  <ItemGroup>

     <ProjectReference Include="..\monodoc\monodoc.csproj">

       <Project>{6e644802-b579-4037-9809-9cf4c7172c9d}</Project>

       <Name>monodoc</Name>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup />

-</Project>
\ No newline at end of file
+</Project>

diff --git a/mdoc/packages.config b/mdoc/packages.config
deleted file mode 100644
index 48672eab..00000000
--- a/mdoc/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="Mono.Cecil" version="0.10.0-beta5" targetFramework="net471" />

-  <package id="QuickIO.NET" version="2.6.2.0" targetFramework="net471" />

-</packages>
\ No newline at end of file
diff --git a/monodoc/Monodoc/generators/HtmlGenerator.cs b/monodoc/Monodoc/generators/HtmlGenerator.cs
index 7b157413..666d2282 100644
--- a/monodoc/Monodoc/generators/HtmlGenerator.cs
+++ b/monodoc/Monodoc/generators/HtmlGenerator.cs
@@ -24,20 +24,20 @@ namespace Monodoc.Generators
 		static string css_code;
 
 		IDocCache defaultCache;
-		static Dictionary<DocumentType, IHtmlExporter> converters;
+		static Dictionary<DocumentType, Lazy<IHtmlExporter>> converters;
 
 		static HtmlGenerator ()
 		{
-			converters = new Dictionary<DocumentType, IHtmlExporter> {
-				{ DocumentType.EcmaXml, new Ecma2Html () },
-				{ DocumentType.Man, new Man2Html () },
-				{ DocumentType.TocXml, new Toc2Html () },
-				{ DocumentType.EcmaSpecXml, new Ecmaspec2Html () },
-				{ DocumentType.ErrorXml, new Error2Html () },
-				{ DocumentType.Html, new Idem () },
-				{ DocumentType.MonoBook, new MonoBook2Html () },
-				{ DocumentType.AddinXml, new Addin2Html () },
-				{ DocumentType.PlainText, new Idem () },
+			converters = new Dictionary<DocumentType, Lazy<IHtmlExporter>> {
+				{ DocumentType.EcmaXml, new Lazy<IHtmlExporter> (() => new Ecma2Html ()) },
+				{ DocumentType.Man, new Lazy<IHtmlExporter> (() => new Man2Html ()) },
+				{ DocumentType.TocXml, new Lazy<IHtmlExporter> (() => new Toc2Html ()) },
+				{ DocumentType.EcmaSpecXml, new Lazy<IHtmlExporter> (() => new Ecmaspec2Html ()) },
+				{ DocumentType.ErrorXml, new Lazy<IHtmlExporter> (() => new Error2Html ()) },
+				{ DocumentType.Html, new Lazy<IHtmlExporter> (() => new Idem ()) },
+				{ DocumentType.MonoBook, new Lazy<IHtmlExporter> (() => new MonoBook2Html ()) },
+				{ DocumentType.AddinXml, new Lazy<IHtmlExporter> (() => new Addin2Html ()) },
+				{ DocumentType.PlainText, new Lazy<IHtmlExporter> (() => new Idem ()) },
 			};
 		}
 
@@ -74,10 +74,10 @@ namespace Monodoc.Generators
 			if (cache != null && context != null && cache.IsCached (MakeCacheKey (hs, id, context)))
 				return cache.GetCachedString (MakeCacheKey (hs, id, context));
 
-			IHtmlExporter exporter;
-			if (!converters.TryGetValue (type, out exporter))
+			if (!converters.TryGetValue (type, out var exporterFactory))
 				return MakeHtmlError (string.Format ("Input type '{0}' not supported",
 				                                     type.ToString ()));
+			var exporter = exporterFactory.Value;
 			var result = hs.IsGeneratedContent (id) ? 
 				exporter.Export (hs.GetCachedText (id), context) :
 				exporter.Export (hs.GetCachedHelpStream (id), context);
@@ -122,7 +122,7 @@ namespace Monodoc.Generators
 				sb.Replace ("@@FONT_FAMILY@@", "Sans Serif");
 				sb.Replace ("@@FONT_SIZE@@", "100%");
 				css_code = sb.ToString () + converters.Values
-					.Select (c => c.CssCode)
+					.Select (c => c.Value.CssCode)
 					.Where (css => !string.IsNullOrEmpty (css))
 					.DefaultIfEmpty (string.Empty)
 					.Aggregate (string.Concat);
diff --git a/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs b/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs
index 3585b484..84204c46 100644
--- a/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs
+++ b/monodoc/Monodoc/generators/html/Ecmaspec2Html.cs
@@ -51,7 +51,7 @@ namespace Monodoc.Generators.Html
 				stream = assembly.GetManifestResourceStream ("ecmaspec-html-css.xsl");
 
 				XmlReader xml_reader = new XmlTextReader (stream);
-				ecma_transform.Load (xml_reader, null, null);
+				ecma_transform.Load (xml_reader, null);
 				args.AddExtensionObject ("monodoc:///extensions", new ExtObj ()); 
 			}
 		
diff --git a/monodoc/Monodoc/generators/html/Toc2Html.cs b/monodoc/Monodoc/generators/html/Toc2Html.cs
index cb34b988..04282246 100644
--- a/monodoc/Monodoc/generators/html/Toc2Html.cs
+++ b/monodoc/Monodoc/generators/html/Toc2Html.cs
@@ -18,7 +18,7 @@ namespace Monodoc.Generators.Html
 			var assembly = Assembly.GetAssembly (typeof (Toc2Html));
 			var stream = assembly.GetManifestResourceStream ("toc-html.xsl");
 			XmlReader xml_reader = new XmlTextReader (stream);
-			transform.Load (xml_reader, null, null);
+			transform.Load (xml_reader, null);
 		}
 
 		public string Export (Stream input, Dictionary<string, string> extraArgs)
diff --git a/monodoc/Test/Monodoc.Test.csproj b/monodoc/Test/Monodoc.Test.csproj
index 3e7b4a9c..37d9b576 100644
--- a/monodoc/Test/Monodoc.Test.csproj
+++ b/monodoc/Test/Monodoc.Test.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />

   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

@@ -31,13 +30,13 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">

-      <HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

+    <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />

+  </ItemGroup>

+  <ItemGroup>

     <Compile Include="Monodoc\EcmaDocTests.cs" />

     <Compile Include="Monodoc\HelpSourceTests.cs" />

     <Compile Include="Monodoc\NodeTest.cs" />

@@ -56,14 +55,5 @@
   <ItemGroup>

     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

   </ItemGroup>

-  <ItemGroup>

-    <None Include="packages.config" />

-  </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

-    <PropertyGroup>

-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

-    </PropertyGroup>

-    <Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />

-  </Target>

 </Project>
\ No newline at end of file
diff --git a/monodoc/Test/packages.config b/monodoc/Test/packages.config
deleted file mode 100644
index 91b19ccb..00000000
--- a/monodoc/Test/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<packages>

-  <package id="NUnit" version="3.10.1" targetFramework="net45" />

-</packages>
\ No newline at end of file
diff --git a/monodoc/monodoc.csproj b/monodoc/monodoc.csproj
index 875e1496..cf73bf1b 100644
--- a/monodoc/monodoc.csproj
+++ b/monodoc/monodoc.csproj
@@ -1,16 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project Sdk="Microsoft.NET.Sdk">

   <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProjectGuid>{6E644802-B579-4037-9809-9CF4C7172C9D}</ProjectGuid>

-    <OutputType>Library</OutputType>

-    <RootNamespace>monodoc</RootNamespace>

-    <AssemblyName>monodoc</AssemblyName>

-    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>

-    <ProductVersion>8.0.30703</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <TargetFrameworkProfile />

+    <TargetFrameworks>netstandard2.0</TargetFrameworks>

+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

@@ -33,489 +24,22 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Xml" />

-    <Reference Include="System.Xml.Linq" />

-    <Reference Include="System.Core" />

-    <Reference Include="System.Configuration" />

-  </ItemGroup>

-  <ItemGroup>

     <Folder Include="Assembly\" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Analyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\ASCIIFoldingFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\BaseCharFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CachingTokenFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CharArraySet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CharFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CharReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CharStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\CharTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\ISOLatin1AccentFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\KeywordAnalyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\KeywordTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\LengthFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\LetterTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\LowerCaseFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\LowerCaseTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\MappingCharFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\NormalizeCharMap.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\NumericTokenStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\PerFieldAnalyzerWrapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\PorterStemFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\PorterStemmer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\SimpleAnalyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Standard\StandardAnalyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Standard\StandardFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Standard\StandardTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Standard\StandardTokenizerImpl.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\StopAnalyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\StopFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\TeeSinkTokenFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Token.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\FlagsAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IFlagsAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IOffsetAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IPayloadAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\IPositionIncrementAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\ITermAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\ITypeAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\OffsetAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\PayloadAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\PositionIncrementAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\TermAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenattributes\TypeAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\TokenFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\Tokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\TokenStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\WhitespaceAnalyzer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\WhitespaceTokenizer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Analysis\WordlistLoader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\AbstractField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\CompressionTools.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\DateField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\DateTools.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\Document.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\Field.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\Fieldable.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\FieldSelector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\FieldSelectorResult.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\LoadFirstFieldSelector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\MapFieldSelector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\NumberTools.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\NumericField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Document\SetBasedFieldSelector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\AbstractAllTermDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\AllTermDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\BufferedDeletes.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ByteBlockPool.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ByteSliceReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ByteSliceWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\CharBlockPool.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\CheckIndex.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\CompoundFileReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\CompoundFileWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ConcurrentMergeScheduler.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\CorruptIndexException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DefaultSkipListReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DefaultSkipListWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DirectoryReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocConsumerPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumerPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumerPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumers.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumersPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldConsumersPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldProcessor.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldProcessorPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocFieldProcessorPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocInverter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocInverterPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocInverterPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocumentsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\DocumentsWriterThreadState.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldInfo.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldInfos.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldInvertState.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldReaderException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldSortedTermVectorMapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldsReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FieldsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FilterIndexReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsDocsConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsDocsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsFieldsConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsFieldsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsPositionsConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsPositionsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsTermsConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FormatPostingsTermsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FreqProxFieldMergeState.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FreqProxTermsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FreqProxTermsWriterPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\FreqProxTermsWriterPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexCommit.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexDeletionPolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexFileDeleter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexFileNameFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexFileNames.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IndexWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\IntBlockPool.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocConsumerPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocConsumerPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocEndConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocEndConsumerPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\InvertedDocEndConsumerPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\KeepOnlyLastCommitDeletionPolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\LogByteSizeMergePolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\LogDocMergePolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\LogMergePolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MergeDocIDRemapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MergePolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MergeScheduler.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MultiLevelSkipListReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MultiLevelSkipListWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MultipleTermPositions.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\MultiReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\NormsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\NormsWriterPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\NormsWriterPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ParallelReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\Payload.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\PositionBasedTermVectorMapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\RawPostingList.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ReadOnlyDirectoryReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ReadOnlySegmentReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\ReusableStringReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentInfo.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentInfos.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentMergeInfo.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentMergeQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentMerger.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentTermDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentTermPositions.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentTermPositionVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentTermVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SegmentWriteState.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SerialMergeScheduler.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SnapshotDeletionPolicy.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\SortedTermVectorMapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\StaleReaderException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\StoredFieldsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\StoredFieldsWriterPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\Term.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermBuffer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermFreqVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermInfo.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermInfosReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermInfosWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermPositions.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermPositionVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHash.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHashConsumer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHashConsumerPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHashPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermsHashPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorEntry.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorEntryFreqSortedComparator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorMapper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorOffsetInfo.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorsReader.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorsTermsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorsTermsWriterPerField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorsTermsWriterPerThread.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Index\TermVectorsWriter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\LucenePackage.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\LZOCompressor.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Messages\INLSException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Messages\Message.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Messages\MessageImpl.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Messages\NLS.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\CharStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\FastCharStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\MultiFieldQueryParser.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\ParseException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\QueryParser.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\QueryParserConstants.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\QueryParserTokenManager.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\Token.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\QueryParser\TokenMgrError.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\BooleanClause.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\BooleanQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\BooleanScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\BooleanScorer2.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\CachingSpanFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\CachingWrapperFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Collector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ComplexExplanation.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ConjunctionScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ConstantScoreQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DefaultSimilarity.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DisjunctionMaxQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DisjunctionMaxScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DisjunctionSumScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DocIdSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\DocIdSetIterator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ExactPhraseScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Explanation.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldCache.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldCacheImpl.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldCacheRangeFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldCacheTermsFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldComparator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldComparatorSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldDoc.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldDocSortedHitQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FieldValueHitQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Filter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FilteredDocIdSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FilteredDocIdSetIterator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FilteredQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FilteredTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FilterManager.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\ByteFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\CustomScoreProvider.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\CustomScoreQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\DocValues.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\FieldCacheSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\FieldScoreQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\FloatFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\IntFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\OrdFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\ReverseOrdFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\ShortFieldSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\ValueSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Function\ValueSourceQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FuzzyQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\FuzzyTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\HitQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\IndexSearcher.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\MatchAllDocsQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\MultiPhraseQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\MultiSearcher.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\MultiTermQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\MultiTermQueryWrapperFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\NumericRangeFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\NumericRangeQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ParallelMultiSearcher.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\AveragePayloadFunction.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\MaxPayloadFunction.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\MinPayloadFunction.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\PayloadFunction.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\PayloadNearQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\PayloadSpanUtil.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Payloads\PayloadTermQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PhrasePositions.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PhraseQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PhraseQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PhraseScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PositiveScoresOnlyCollector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PrefixFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PrefixQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\PrefixTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Query.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\QueryTermVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\QueryWrapperFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ReqExclScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ReqOptSumScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ScoreCachingWrappingScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\ScoreDoc.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Scorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Searchable.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Searcher.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Similarity.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SimilarityDelegator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SingleTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SloppyPhraseScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Sort.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SortField.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SpanFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SpanFilterResult.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\SpanQueryFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\FieldMaskingSpanQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\NearSpansOrdered.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\NearSpansUnordered.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanFirstQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanNearQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanNotQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanOrQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\Spans.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanTermQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\SpanWeight.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Spans\TermSpans.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TermQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TermRangeFilter.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TermRangeQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TermRangeTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TermScorer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TimeLimitingCollector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TopDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TopDocsCollector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TopFieldCollector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TopFieldDocs.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\TopScoreDocCollector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\Weight.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\WildcardQuery.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Search\WildcardTermEnum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\AlreadyClosedException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\BufferedIndexInput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\BufferedIndexOutput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\CheckSumIndexInput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\CheckSumIndexOutput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\Directory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\FileSwitchDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\FSDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\FSLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\IndexInput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\IndexOutput.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\Lock.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\LockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\LockObtainFailedException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\LockReleaseFailedException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\LockStressTest.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\LockVerifyServer.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\MMapDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\NativeFSLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\NIOFSDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\NoLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\NoSuchDirectoryException.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\RAMDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\RAMFile.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\RAMInputStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\RAMOutputStream.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\SimpleFSDirectory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\SimpleFSLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\SingleInstanceLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Store\VerifyingLockFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\AppSettings.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\AttributeImplItem.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\BitSetSupport.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\BuildType.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Character.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\CloseableThreadLocalProfiler.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\CollectionsHelper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compare.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\ConcurrentDictionary.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\Func.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\ISet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\SetFactory.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\SortedSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\ThreadLocal.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Compatibility\WrappedHashSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\CRC32.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Cryptography.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Deflater.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Double.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\EquatableList.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\FileSupport.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\GeneralKeyedCollection.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\HashMap.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\IChecksum.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Inflater.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\IThreadRunnable.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Number.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\OS.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\SharpZipLib.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\Single.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\TextSupport.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\ThreadClass.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\ThreadLock.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Support\WeakDictionary.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\ArrayUtil.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Attribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\AttributeSource.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\AverageGuessMemoryModel.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\BitUtil.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\BitVector.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Cache\Cache.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Cache\SimpleLRUCache.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Cache\SimpleMapCache.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\CloseableThreadLocal.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Constants.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\DocIdBitSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\FieldCacheSanityChecker.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\IAttribute.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\IdentityDictionary.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\IndexableBinaryStringTools.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\MapOfSets.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\MemoryModel.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\NumericUtils.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\OpenBitSet.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\OpenBitSetDISI.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\OpenBitSetIterator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\PriorityQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\RamUsageEstimator.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\ReaderUtil.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\ScorerDocQueue.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\SimpleStringInterner.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\SmallFloat.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\SortedVIntList.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\SorterTemplate.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\StringHelper.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\StringInterner.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\ToStringUtils.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\UnicodeUtil.cs" />

-    <Compile Include="..\external\Lucene.Net.Light\src\core\Util\Version.cs" />

-    <Compile Include="Mono.Documentation\ManifestResourceResolver.cs" />

-    <Compile Include="Mono.Documentation\XmlDocUtils.cs" />

-    <Compile Include="Mono.Utilities\LRUCache.cs" />

-    <Compile Include="Mono.Utilities\colorizer.cs" />

-    <Compile Include="Monodoc\HelpSource.cs" />

-    <Compile Include="Monodoc\HelpSource_Legacy.cs" />

-    <Compile Include="Monodoc\Node.cs" />

-    <Compile Include="Monodoc\Node_Legacy.cs" />

-    <Compile Include="Monodoc\Provider.cs" />

-    <Compile Include="Monodoc\RootTree.cs" />

-    <Compile Include="Monodoc\RootTree_Legacy.cs" />

-    <Compile Include="Monodoc\SearchableDocument.cs" />

-    <Compile Include="Monodoc\SearchableIndex.cs" />

-    <Compile Include="Monodoc\Tree.cs" />

-    <Compile Include="Monodoc\TypeUtils.cs" />

-    <Compile Include="Monodoc\cache.cs" />

-    <Compile Include="Monodoc\generator.cs" />

-    <Compile Include="Monodoc\index.cs" />

-    <Compile Include="Monodoc\settings.cs" />

-    <Compile Include="Monodoc\settings_Legacy.cs" />

-    <Compile Include="Monodoc\storage.cs" />

-    <Compile Include="Monodoc\caches\FileCache.cs" />

-    <Compile Include="Monodoc\caches\NullCache.cs" />

-    <Compile Include="Monodoc\generators\HtmlGenerator.cs" />

-    <Compile Include="Monodoc\generators\RawGenerator.cs" />

-    <Compile Include="Monodoc\generators\html\Addin2Html.cs" />

-    <Compile Include="Monodoc\generators\html\Ecma2Html.cs" />

-    <Compile Include="Monodoc\generators\html\Ecmaspec2Html.cs" />

-    <Compile Include="Monodoc\generators\html\Error2Html.cs" />

-    <Compile Include="Monodoc\generators\html\Idem.cs" />

-    <Compile Include="Monodoc\generators\html\Man2Html.cs" />

-    <Compile Include="Monodoc\generators\html\MonoBook2Html.cs" />

-    <Compile Include="Monodoc\generators\html\Toc2Html.cs" />

-    <Compile Include="Monodoc\providers\EcmaDoc.cs" />

-    <Compile Include="Monodoc\providers\addins-provider.cs" />

-    <Compile Include="Monodoc\providers\ecma-provider.cs" />

-    <Compile Include="Monodoc\providers\ecmaspec-provider.cs" />

-    <Compile Include="Monodoc\providers\ecmauncompiled-provider.cs" />

-    <Compile Include="Monodoc\providers\error-provider.cs" />

-    <Compile Include="Monodoc\providers\man-provider.cs" />

-    <Compile Include="Monodoc\providers\xhtml-provider.cs" />

-    <Compile Include="Monodoc\storage\NullStorage.cs" />

-    <Compile Include="Monodoc\storage\UncompiledDocStorage.cs" />

-    <Compile Include="Monodoc\storage\ZipStorage.cs" />

-    <Compile Include="Monodoc.Ecma\EcmaDesc.cs" />

-    <Compile Include="Monodoc.Ecma\EcmaUrlTokenizer.cs" />

-    <Compile Include="Monodoc.Ecma\prebuilt\EcmaUrlParser.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="..\external\Lucene.Net.Light\**\*.cs" />

+

+    <!-- TODO: Consider moving this generation stuff -->

+    <Compile Remove="Monodoc.Ecma\EcmaUrlParserDriver.cs" />

+    <Compile Remove="Monodoc.Ecma\jay\**\*.cs" />

+

+    <!-- TODO: Consider moving tests to an adjacent folder -->

+    <Compile Remove="Test\**\*.cs" />

+

+    <!-- TODO: Consider just deleting these unused files -->

+    <Compile Remove="Assembly\**\*.cs" />

+    <Compile Remove="Monodoc\providers\simple-provider.cs" />

+    <Compile Remove="Mono.Utilities\MemoryLRU.cs" />

   </ItemGroup>

   <ItemGroup>

     <EmbeddedResource Include="Resources/monodoc.xml">

@@ -705,13 +229,10 @@
     </Content>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\external\SharpZipLib\ICSharpCode.SharpZipLib.NET45\ICSharpCode.SharpZipLib.csproj">

-      <Project>{0e7413ff-eb9e-4714-acf2-be3a6a7b2ffd}</Project>

-      <Name>ICSharpCode.SharpZipLib</Name>

-    </ProjectReference>

+    <PackageReference Include="SharpZipLib" Version="$(NuGetVersionSharpZipLib)" />

+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(NuGetVersionSystemConfigurationConfigurationManager)" />

   </ItemGroup>

   <ItemGroup>

     <None Include="Monodoc.Ecma\EcmaUrlParser.jay" />

   </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

 </Project>
\ No newline at end of file
diff --git a/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj b/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj
index d8e6c822..650aefdc 100644
--- a/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj
+++ b/tools/DocStat/DocStat.Tests/DocStat.Tests.csproj
@@ -26,18 +26,17 @@
   </PropertyGroup>

   <ItemGroup>

     <Reference Include="System" />

-    <Reference Include="nunit.framework">

-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>

-    </Reference>

     <Reference Include="System.Xml" />

     <Reference Include="System.Xml.Linq" />

   </ItemGroup>

   <ItemGroup>

+    <PackageReference Include="NUnit" Version="$(NuGetVersionNUnit)" />

+  </ItemGroup>

+  <ItemGroup>

     <Compile Include="EcmaXmlHelperTests.cs" />

     <Compile Include="CommandUtilsTests.cs" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="packages.config" />

     <None Include="TestData\currentxml\t1.xml">

       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </None>

diff --git a/tools/DocStat/DocStat.Tests/packages.config b/tools/DocStat/DocStat.Tests/packages.config
deleted file mode 100644
index 01c187cc..00000000
--- a/tools/DocStat/DocStat.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net461" />
-</packages>
\ No newline at end of file