Skip to content

Commit 1c75770

Browse files
authored
Merge pull request #69 from NosCoreIO/UpgradeToDotnet5
upgrade to dotnet 5
2 parents 0c732c4 + f75d404 commit 1c75770

6 files changed

Lines changed: 16 additions & 20 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,5 +497,6 @@ fabric.properties
497497
# should be stored in the .pubxml.user file.
498498
/build/netstandard2.*
499499
/build/netcoreapp3.*
500+
/build/net*.*
500501

501502
/documentation/*.received.md

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ addons:
66
snaps:
77
- name: dotnet-sdk
88
confinement: classic
9-
channel: 3.1/stable
9+
channel: 5.0/stable
1010
install:
1111
- 'export PATH="$PATH:/home/travis/.dotnet/tools"'
1212
- 'export PATH="$PATH:$HOME/.local/bin"'

src/NosCore.PathFinder.Gui/NosCore.PathFinder.Gui.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<TieredCompilation>true</TieredCompilation>
77
<LangVersion>latest</LangVersion>
88
<Nullable>enable</Nullable>
@@ -14,12 +14,12 @@
1414

1515
<ItemGroup>
1616
<FrameworkReference Include="Microsoft.AspNetCore.App" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.9" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
1818
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.0.1" />
1919
<PackageReference Include="NosCore.Dao" Version="1.5.0" />
20-
<PackageReference Include="NosCore.Shared" Version="1.9.1" />
20+
<PackageReference Include="NosCore.Shared" Version="1.10.0" />
2121
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
22-
<PackageReference Include="OpenTK.NetStandard" Version="1.0.5.22" />
22+
<PackageReference Include="OpenTK.NetStandard" Version="1.0.5.32" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

src/NosCore.PathFinder/NosCore.PathFinder.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<ApplicationIcon>favicon.ico</ApplicationIcon>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -12,7 +12,7 @@
1212
<RepositoryUrl>https://github.com/NosCoreIO/NosCore.PathFinder.git</RepositoryUrl>
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageTags>nostale, noscore, nostale private server source, nostale emulator</PackageTags>
15-
<Version>0.0.7</Version>
15+
<Version>0.0.8</Version>
1616
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1717
<Description>NosCore's PathFinder</Description>
1818
<PackageLicenseExpression></PackageLicenseExpression>
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Mapster" Version="6.5.0" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
30+
<PackageReference Include="Mapster" Version="6.5.1" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
3333
<PackageReference Include="Serilog" Version="2.10.0" />
34-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
34+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

test/NosCore.PathFinder.Benchmark/NosCore.PathFinder.Benchmark/NosCore.PathFinder.Benchmark.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<TargetFramework>net5.0</TargetFramework>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
8-
<OutputType>Exe</OutputType>
9-
<TargetFramework>netcoreapp3.1</TargetFramework>
105
<Nullable>enable</Nullable>
116
</PropertyGroup>
127

test/NosCore.PathFinder.Tests/NosCore.PathFinder.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="ApprovalTests" Version="5.4.3" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.9" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
13-
<PackageReference Include="Moq" Version="4.14.7" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
13+
<PackageReference Include="Moq" Version="4.15.1" />
1414
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
1515
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1616
</ItemGroup>

0 commit comments

Comments
 (0)