Skip to content

Commit 8a4b53a

Browse files
loic-sharmaloic-sharma
authored
Migrate to ASP.NET Core 2.2 and .NET Core SDK v2.2.100 (loic-sharma#149)
1 parent 5886d6d commit 8a4b53a

File tree

11 files changed

+82
-44
lines changed

11 files changed

+82
-44
lines changed

‎.azure/pipelines/ci-official.yml

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818
pool:
1919
vmImage: vs2017-win2016
2020
steps:
21+
- task: DotNetCoreInstaller@0
22+
displayName: 'Use .NET Core SDK 2.2.100'
23+
inputs:
24+
version: 2.2.100
25+
2126
- task: DotNetCoreCLI@2
2227
displayName: Install versioning tool
2328
inputs:

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM microsoft/dotnet:2.1-aspnetcore-runtime AS base
1+
FROM microsoft/dotnet:2.2-aspnetcore-runtime AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM microsoft/dotnet:2.1-sdk AS build
5+
FROM microsoft/dotnet:2.2-sdk AS build
66
WORKDIR /src
77
COPY /src .
88
RUN dotnet restore BaGet

‎src/BaGet.Azure/BaGet.Azure.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Azure.Search" Version="5.0.1" />
1111
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="9.4.1" />
12-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
12+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎src/BaGet.Core/BaGet.Core.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.1" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
1212
<PackageReference Include="NuGet.Packaging" Version="4.8.0" />
1313
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
1414
</ItemGroup>

‎src/BaGet.Tools.AzureSearchImporter/BaGet.Tools.AzureSearchImporter.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp2.2</TargetFramework>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
@@ -16,10 +16,10 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
2323
<PackageReference Include="morelinq" Version="3.0.0" />
2424
</ItemGroup>
2525

‎src/BaGet.UI/package-lock.json

+26-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/BaGet/BaGet.csproj

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55

66
<SpaRoot>..\BaGet.UI\</SpaRoot>
77
<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.App" />
12+
</ItemGroup>
13+
1014
<ItemGroup>
1115
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
12-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
13-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
14-
<PackageReference Include="Microsoft.Data.SQLite" Version="2.1.0" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
17+
<PackageReference Include="Microsoft.Data.SQLite" Version="2.2.0" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.2.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
1821
<PackageReference Include="NuGet.Client" Version="4.2.0" />
1922
</ItemGroup>
2023

‎src/BaGet/Extensions/ServiceCollectionExtensions.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using Microsoft.AspNetCore.Builder;
1919
using Microsoft.AspNetCore.Cors.Infrastructure;
2020
using Microsoft.AspNetCore.HttpOverrides;
21+
using Microsoft.AspNetCore.Mvc;
2122
using Microsoft.EntityFrameworkCore;
2223
using Microsoft.Extensions.Configuration;
2324
using Microsoft.Extensions.DependencyInjection;
@@ -113,7 +114,10 @@ public static IServiceCollection ConfigureAzure(
113114

114115
public static IServiceCollection ConfigureHttpServices(this IServiceCollection services)
115116
{
116-
services.AddMvc();
117+
services
118+
.AddMvc()
119+
.SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
120+
117121
services.AddCors();
118122
services.AddSingleton<IConfigureOptions<CorsOptions>, ConfigureCorsOptions>();
119123

‎tests/BaGet.Core.Tests/BaGet.Core.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<LangVersion>7.1</LangVersion>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1212
<PackageReference Include="Moq" Version="4.10.0" />
13-
<PackageReference Include="xunit" Version="2.3.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
13+
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
17+
</PackageReference>
1518
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1619
</ItemGroup>
1720

‎tests/BaGet.Protocol.Tests/BaGet.Protocol.Tests.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<LangVersion>7.1</LangVersion>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
1212
<PackageReference Include="Moq" Version="4.10.0" />
13-
<PackageReference Include="xunit" Version="2.3.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
13+
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
17+
</PackageReference>
1518
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1619
</ItemGroup>
1720

‎tests/BaGet.Tests/BaGet.Tests.csproj

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<LangVersion>7.1</LangVersion>
66

77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.App" />
12+
</ItemGroup>
13+
1014
<ItemGroup>
1115
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1216
<PackageReference Include="NuGet.Protocol" Version="4.7.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
14-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
16-
<PackageReference Include="xunit" Version="2.3.1" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
17+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
19+
<PackageReference Include="xunit" Version="2.4.1" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23+
</PackageReference>
1824
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
1925
</ItemGroup>
2026

0 commit comments

Comments
 (0)