rob/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to .NET Core 3.1

Browse source
This commit is contained in:
Robert Marshall 2020-01-04 10:43:26 +00:00
parent e5c9f5bd9f
commit edb1f99387
5 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Infrastructure/.drone.yml
View file

@ -12,7 +12,7 @@ volumes:
steps: steps:
- name: build and publish - name: build and publish
image: mcr.microsoft.com/dotnet/core/sdk:2.2 image: mcr.microsoft.com/dotnet/core/sdk:3.1
volumes: volumes:
- name: output - name: output
path: /output path: /output

21
Website.Tests/Website.Tests.csproj
View file

@ -1,23 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.6.0"> <PackageReference Include="coverlet.msbuild" Version="2.8.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="fluentassertions" Version="5.6.0" /> <PackageReference Include="fluentassertions" Version="5.10.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="mysqlconnector" Version="0.52.0" /> <PackageReference Include="mysqlconnector" Version="0.61.0" />
<PackageReference Include="nsubstitute" Version="4.0.0" /> <PackageReference Include="nsubstitute" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.4.0" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
Website/Startup.cs
View file

@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Website.Data; using Website.Data;
namespace Website namespace Website
@ -34,7 +34,7 @@ namespace Website
services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(); services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie();
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2); services.AddMvc(options => options.EnableEndpointRouting = false);
} }
private void RegisterRepositories(IServiceCollection services) => private void RegisterRepositories(IServiceCollection services) =>
@ -44,7 +44,7 @@ namespace Website
.AddSingleton(new GitServerApi(new HttpClient(), Configuration["gitDomain"], Configuration["gitToken"])); .AddSingleton(new GitServerApi(new HttpClient(), Configuration["gitDomain"], Configuration["gitToken"]));
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env) public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{ {
if (env.IsDevelopment() ) if (env.IsDevelopment() )
{ {

16
Website/Website.csproj
View file

@ -1,21 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BuildBundlerMinifier" Version="2.9.406" /> <PackageReference Include="BuildBundlerMinifier" Version="3.2.435" />
<PackageReference Include="dapper" Version="1.60.9" /> <PackageReference Include="dapper" Version="2.0.30" />
<PackageReference Include="dapper.contrib" Version="1.60.1" /> <PackageReference Include="dapper.contrib" Version="2.0.30" />
<PackageReference Include="markdig" Version="0.16.0" /> <PackageReference Include="markdig" Version="0.18.0" />
<PackageReference Include="Markdig.SyntaxHighlighting" Version="1.1.7" /> <PackageReference Include="Markdig.SyntaxHighlighting" Version="1.1.7" />
<PackageReference Include="Microsoft.AspNetCore.App" /> <PackageReference Include="mysqlconnector" Version="0.61.0" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="mysqlconnector" Version="0.52.0" />
</ItemGroup> </ItemGroup>
<Target Name="BuildCss" BeforeTargets="Build"> <Target Name="BuildCss" BeforeTargets="Build">

4
build/_build.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<IsPackable>False</IsPackable> <IsPackable>False</IsPackable>
@ -10,7 +10,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Nuke.Common" Version="0.18.0" /> <PackageReference Include="Nuke.Common" Version="0.23.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>