migration to .net 5

Author: qiuhaotc

.github/workflows/dotnetcore.yml

@@ -1,4 +1,4 @@
-name: .NET Core
+name: .NET 5
 
 on:
   push:
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 5.0.x
     - name: Install dependencies
       run: |
        cd src

src/CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj

@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lucene.Net" Version="4.8.0-beta00007" />
-    <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00007" />
-    <PackageReference Include="Lucene.Net.ICU" Version="4.8.0-beta00007" />
-    <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00007" />
+    <PackageReference Include="Lucene.Net" Version="4.8.0-beta00013" />
+    <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00013" />
+    <PackageReference Include="Lucene.Net.ICU" Version="4.8.0-beta00013" />
+    <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00013" />
   </ItemGroup>
 
   <ItemGroup>

src/CodeIndex.IndexBuilder/CodeTokenUtils/CodeTokenizer.cs

@@ -10,7 +10,7 @@ namespace CodeIndex.IndexBuilder
     /// <summary>
     /// Reference the SmartCn Tokenizer
     /// </summary>
-    internal class CodeTokenizer : SegmentingTokenizerBase
+    internal sealed class CodeTokenizer : SegmentingTokenizerBase
     {
         static readonly BreakIterator sentenceProto = BreakIterator.GetSentenceInstance(CultureInfo.InvariantCulture);
         readonly WordSegmenter wordSegmenter = new WordSegmenter();

src/CodeIndex.Server/CodeIndex.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <UserSecretsId>869cc96a-d1b8-4328-9b99-bc356c26a33a</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
@@ -14,9 +14,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview1.20073.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/CodeIndex.Server/Dockerfile

@@ -1,6 +1,6 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
 WORKDIR /app
 ENV ASPNETCORE_ENVIRONMENT Development
 ENV CodeIndex__LuceneIndex /luceneindex
@@ -16,9 +16,14 @@ ENV CodeIndex__IncludedExtensions=".CS|.XML|.XAML|.JS|.TXT"
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build
+FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
 WORKDIR /src
 COPY ["CodeIndex.Server/CodeIndex.Server.csproj", "CodeIndex.Server/"]
+COPY ["CodeIndex.Common/CodeIndex.Common.csproj", "CodeIndex.Common/"]
+COPY ["CodeIndex.Search/CodeIndex.Search.csproj", "CodeIndex.Search/"]
+COPY ["CodeIndex.IndexBuilder/CodeIndex.IndexBuilder.csproj", "CodeIndex.IndexBuilder/"]
+COPY ["CodeIndex.Files/CodeIndex.Files.csproj", "CodeIndex.Files/"]
+COPY ["CodeIndex.MaintainIndex/CodeIndex.MaintainIndex.csproj", "CodeIndex.MaintainIndex/"]
 RUN dotnet restore "CodeIndex.Server/CodeIndex.Server.csproj"
 COPY . .
 WORKDIR "/src/CodeIndex.Server"

src/CodeIndex.Test/CodeIndex.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

src/CodeIndex.Test/Search/CodeIndexSearcherTest.cs

@@ -91,8 +91,7 @@ public void TestGenerateHtmlPreviewText()
             {
                 result = CodeIndexSearcher.GenerateHtmlPreviewText(generator.GetQueryFromStr("ABC"), content, 10, LucenePool.GetAnalyzer());
                 Assert.AreEqual(@"My <label class='highlight'>ABC</label>
-Is A <label class='highlight'>ABC</label>...
-It&#39;s <label class='highlight'>Abc</label>", result);
+Is A <label class='highlight'>ABC</label>...s <label class='highlight'>abc</label> in", result);
             }
         }
 

src/CodeIndex.sln

@@ -30,6 +30,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D0B5A7C3-31A4-463A-B27E-2D246D5BF8DD}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		..\.github\workflows\dotnetcore.yml = ..\.github\workflows\dotnetcore.yml
 	EndProjectSection
 EndProject
 Global