Skip to content

Commit c577a0c

Browse files
Albert KapitanovAlbert Kapitanov
Albert Kapitanov
authored and
Albert Kapitanov
committed
Completed migration to NET5
1 parent 8994119 commit c577a0c

File tree

15 files changed

+61
-49
lines changed

15 files changed

+61
-49
lines changed

‎.vscode/launch.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build",
9-
"program": "${workspaceRoot}\\samples\\ITGlobal.MarkDocs.Example\\bin\\Debug\\netcoreapp1.1\\MarkDocs.Example.dll",
9+
"program": "${workspaceRoot}\\samples\\ITGlobal.MarkDocs.Example\\bin\\Debug\\net5.0\\MarkDocs.Example.dll",
1010
"args": [],
1111
"cwd": "${workspaceRoot}",
1212
"externalConsole": false,

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:2.2 as BUILDER
1+
FROM mcr.microsoft.com/dotnet/sdk:5.0-focal as BUILDER
22
WORKDIR /app
33
COPY . /app
44
RUN dotnet publish -o /out -c Release -r linux-musl-x64 /app/src/markdocs/markdocs.csproj /p:PackAsTool=false /p:DisableSourceLink=true
55

6-
FROM mcr.microsoft.com/dotnet/core/runtime-deps:2.2-alpine
6+
FROM mcr.microsoft.com/dotnet/core/runtime-deps:5.0-alpine
77
RUN apk update && apk add git nodejs npm
88
WORKDIR /app
99
COPY --from=BUILDER /out /app

‎samples/ITGlobal.MarkDocs.Blog.Example/ITGlobal.MarkDocs.Blog.Example.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
3+
<TargetFramework>net5.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>MarkDocs.Blog.Example</AssemblyName>
@@ -18,7 +18,6 @@
1818
<ProjectReference Include="..\..\src\ITGlobal.MarkDocs.Blog\ITGlobal.MarkDocs.Blog.csproj" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.App" />
2221
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
2322
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
2423
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />

‎samples/ITGlobal.MarkDocs.Example/ITGlobal.MarkDocs.Example.csproj

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<Import Project="../../src/common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<PreserveCompilationContext>true</PreserveCompilationContext>
77
<AssemblyName>MarkDocs.Example</AssemblyName>
@@ -19,9 +19,14 @@
1919
<ProjectReference Include="..\..\src\ITGlobal.MarkDocs\ITGlobal.MarkDocs.csproj" />
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.App" />
2322
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
2423
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
2524
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
2625
</ItemGroup>
26+
<ItemGroup>
27+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
30+
</PackageReference>
31+
</ItemGroup>
2732
</Project>

‎src/ITGlobal.MarkDocs.Blog/ITGlobal.MarkDocs.Blog.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.Blog</AssemblyName>

‎src/ITGlobal.MarkDocs.Core/ITGlobal.MarkDocs.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AssemblyTitle>MarkDocs.Core</AssemblyTitle>
66
<AssemblyName>ITGlobal.MarkDocs.Core</AssemblyName>
77
<PackageId>ITGlobal.MarkDocs.Core</PackageId>

‎src/ITGlobal.MarkDocs.DirectorySource/ITGlobal.MarkDocs.DirectorySource.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.DirectorySource</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.DirectorySource</AssemblyName>

‎src/ITGlobal.MarkDocs.DiskCache/ITGlobal.MarkDocs.DiskCache.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.DiskCache</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.DiskCache</AssemblyName>

‎src/ITGlobal.MarkDocs.Git/ITGlobal.MarkDocs.Git.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.Git</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.Git</AssemblyName>

‎src/ITGlobal.MarkDocs.Markdown/ITGlobal.MarkDocs.Markdown.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.Markdown</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.Markdown</AssemblyName>
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReference Include="AngleSharp.Css" Version="0.14.2" />
21-
<PackageReference Include="SharpYaml.NetStandard" Version="1.5.4" />
21+
<PackageReference Include="SharpYaml" Version="1.6.6" />
2222
<PackageReference Include="Markdig" Version="0.24.0" />
2323
<PackageReference Include="AngleSharp" Version="0.14.0" />
2424
</ItemGroup>

‎src/ITGlobal.MarkDocs.Search/ITGlobal.MarkDocs.Search.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.Search</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.Search</AssemblyName>
@@ -15,19 +15,19 @@
1515
</ItemGroup>
1616
<ItemGroup>
1717
<PackageReference Include="AngleSharp" Version="0.14.0" />
18-
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00006" />
19-
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00006" />
20-
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00006" />
21-
<PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00006" />
22-
<PackageReference Include="Lucene.Net.Sandbox" Version="4.8.0-beta00006" />
23-
<PackageReference Include="Lucene.Net.Suggest" Version="4.8.0-beta00006" />
24-
<PackageReference Include="Lucene.Net.Classification" Version="4.8.0-beta00006" />
25-
<PackageReference Include="Lucene.Net.Codecs" Version="4.8.0-beta00006" />
26-
<PackageReference Include="Lucene.Net.Facet" Version="4.8.0-beta00006" />
27-
<PackageReference Include="Lucene.Net.Grouping" Version="4.8.0-beta00006" />
28-
<PackageReference Include="Lucene.Net.Highlighter" Version="4.8.0-beta00006" />
29-
<PackageReference Include="Lucene.Net.Misc" Version="4.8.0-beta00006" />
30-
<PackageReference Include="Lucene.Net.Join" Version="4.8.0-beta00006" />
18+
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00013" />
19+
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00013" />
20+
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00013" />
21+
<PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00013" />
22+
<PackageReference Include="Lucene.Net.Sandbox" Version="4.8.0-beta00013" />
23+
<PackageReference Include="Lucene.Net.Suggest" Version="4.8.0-beta00013" />
24+
<PackageReference Include="Lucene.Net.Classification" Version="4.8.0-beta00013" />
25+
<PackageReference Include="Lucene.Net.Codecs" Version="4.8.0-beta00013" />
26+
<PackageReference Include="Lucene.Net.Facet" Version="4.8.0-beta00013" />
27+
<PackageReference Include="Lucene.Net.Grouping" Version="4.8.0-beta00013" />
28+
<PackageReference Include="Lucene.Net.Highlighter" Version="4.8.0-beta00013" />
29+
<PackageReference Include="Lucene.Net.Misc" Version="4.8.0-beta00013" />
30+
<PackageReference Include="Lucene.Net.Join" Version="4.8.0-beta00013" />
3131
</ItemGroup>
3232
<PropertyGroup>
3333
<PublishRepositoryUrl>true</PublishRepositoryUrl>

‎src/ITGlobal.MarkDocs.Tags/ITGlobal.MarkDocs.Tags.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs.Tags</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs.Tags</AssemblyName>

‎src/ITGlobal.MarkDocs/ITGlobal.MarkDocs.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="../common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyTitle>MarkDocs</AssemblyTitle>
77
<AssemblyName>ITGlobal.MarkDocs</AssemblyName>

‎src/markdocs/Serve/Startup.cs

+17-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Microsoft.AspNetCore.HttpOverrides;
1111
using Microsoft.AspNetCore.Mvc;
1212
using Microsoft.AspNetCore.Mvc.Razor;
13-
using Microsoft.AspNetCore.SignalR;
1413
using Microsoft.Extensions.DependencyInjection;
1514
using Serilog;
1615

@@ -26,19 +25,20 @@ public class Startup : StartupBase
2625
[UsedImplicitly]
2726
public override void ConfigureServices(IServiceCollection services)
2827
{
29-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
28+
var mvc = services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
3029
services.AddMarkDocs(Config.Configure);
3130
services.AddResponseCaching();
3231
services.AddResponseCompression();
3332

33+
#if DEBUG
34+
mvc.AddRazorRuntimeCompilation();
35+
#endif
36+
3437
services.Configure<RazorViewEngineOptions>(o =>
3538
{
3639
o.ViewLocationFormats.Clear();
3740
o.ViewLocationFormats.Add("/Serve/Views/{1}/{0}" + RazorViewEngine.ViewExtension);
3841
o.ViewLocationFormats.Add("/Serve/Views/Shared/{0}" + RazorViewEngine.ViewExtension);
39-
#if DEBUG
40-
o.AllowRecompilingViewsOnFileChange = true;
41-
#endif
4242
});
4343

4444

@@ -70,11 +70,19 @@ public override void Configure(IApplicationBuilder app)
7070
app.UseResponseCaching();
7171
app.UseResponseCompression();
7272
app.UseStaticFiles();
73-
if (Config.EnableDeveloperMode)
73+
app.UseEndpoints(routes =>
7474
{
75-
app.UseConnections(_ => { _.MapConnectionHandler<DevConnectionHandler>("/__dev"); });
76-
}
77-
app.UseMvc();
75+
routes.MapControllerRoute(
76+
name: "default",
77+
pattern: "{controller=Home}/{action=Index}/{id?}");
78+
79+
if (Config.EnableDeveloperMode)
80+
{
81+
routes.MapConnectionHandler<DevConnectionHandler>("/__dev");
82+
}
83+
84+
routes.MapFallbackToController("App", "App");
85+
});
7886

7987
// Trigger documentation initialization
8088
lifetime.ApplicationStarted
@@ -96,9 +104,4 @@ public override void Configure(IApplicationBuilder app)
96104
}));
97105
}
98106
}
99-
100-
public sealed class DevHub : Hub
101-
{
102-
103-
}
104107
}

‎src/markdocs/markdocs.csproj

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<Import Project="../../src/common.props" />
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<AssemblyName>markdocs</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -18,17 +18,22 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.AspNet.SignalR" Version="2.4.1" />
21-
<PackageReference Include="Microsoft.AspNetCore.App" />
22-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.4" />
2322
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
2423
<PackageReference Include="Serilog.Sinks.Literate" Version="3.0.0" />
2524
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
2625
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
27-
<PackageReference Include="ITGlobal.CLI" Version="3.0.25" />
26+
<PackageReference Include="ITGlobal.CLI" Version="3.1.23" />
2827
</ItemGroup>
2928
<ItemGroup>
3029
<Content Update="wwwroot\**\*">
3130
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3231
</Content>
3332
</ItemGroup>
33+
<ItemGroup>
34+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0">
35+
<PrivateAssets>all</PrivateAssets>
36+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
37+
</PackageReference>
38+
</ItemGroup>
3439
</Project>

0 commit comments

Comments
 (0)