Merge pull request #643 from mono/develop

Merge to main

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "external/Lucene.Net.Light"]
-	path = external/Lucene.Net.Light
-	url = https://github.com/mono/Lucene.Net.Light.git

Directory.Build.props

@@ -7,5 +7,6 @@
     <NuGetVersionQuickIONET>2.6.2.0</NuGetVersionQuickIONET>
     <NuGetVersionSharpZipLib>1.3.3</NuGetVersionSharpZipLib>
     <NuGetVersionSystemConfigurationConfigurationManager>6.0.0</NuGetVersionSystemConfigurationConfigurationManager>
+    <NuGetVersionLuceneDotNet>3.0.3</NuGetVersionLuceneDotNet>
   </PropertyGroup>
 </Project>

external/Lucene.Net.Light

@@ -1 +0,0 @@
-Subproject commit 68fa3260b0bb497ed80b4b383e71862bf519c053

monodoc/monodoc.csproj

@@ -27,8 +27,6 @@
     <Folder Include="Assembly\" />
   </ItemGroup>
   <ItemGroup>
-    <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" />
@@ -231,6 +229,7 @@
   <ItemGroup>
     <PackageReference Include="SharpZipLib" Version="$(NuGetVersionSharpZipLib)" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(NuGetVersionSystemConfigurationConfigurationManager)" />
+    <PackageReference Include="Lucene.Net" Version="$(NuGetVersionLuceneDotNet)" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Monodoc.Ecma\EcmaUrlParser.jay" />