Skip to content

Commit 5ea7c5e

Browse files
authored
Merge pull request #25 from kirkone/feature/dotnetupgrade
Update dotnet sdk
2 parents c6e4333 + 7041731 commit 5ea7c5e

4 files changed

Lines changed: 11 additions & 10 deletions

File tree

build/KK.AspNetCore.EasyAuthAuthentication.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ queue:
55

66
variables:
77
BuildConfiguration: "Release"
8+
DotNetVersion: "2.2.300"
89

910
name: $(Year:yy)$(DayOfYear)$(Rev:rr)
1011

@@ -17,10 +18,10 @@ steps:
1718
workingDirectory: "src/KK.AspNetCore.EasyAuthAuthentication"
1819

1920
- task: DotNetCoreInstaller@0
20-
displayName: Use .NET Core sdk 2.1.503
21+
displayName: Use .NET Core $(DotNetVersion)
2122
inputs:
2223
packageType: "sdk"
23-
version: 2.1.503
24+
version: $(DotNetVersion)
2425

2526
- task: DotNetCoreCLI@2
2627
displayName: Restore

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.503"
3+
"version": "2.2.300"
44
}
55
}

src/KK.AspNetCore.EasyAuthAuthentication.Sample/KK.AspNetCore.EasyAuthAuthentication.Sample.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.2</TargetFramework>
55
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
66
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
77
<IsPackable>false</IsPackable>
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" />
16+
<PackageReference Include="Microsoft.AspNetCore.App"/>
17+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

src/KK.AspNetCore.EasyAuthAuthentication/KK.AspNetCore.EasyAuthAuthentication.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
18-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
19-
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
17+
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" />
19+
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
2020
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
2121
</ItemGroup>
2222

@@ -26,6 +26,6 @@
2626
<CodeAnalysisRuleSet>..\..\StyleCop.ruleset</CodeAnalysisRuleSet>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" privateassets="all" />
29+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" privateassets="all" />
3030
</ItemGroup>
3131
</Project>

0 commit comments

Comments
 (0)