Skip to content

Commit e56ab61

Browse files
sondrebsondreb
authored
Upgrade to .NET 5 (#252)
* Upgrade to .NET 5 - Upgrades to .NET 5 and upgrades most of dependencies to latest versions. * Update the release number * Remove dependencies no longer in use * Fix running of tests on the main build.yml * xunit runner above 2.4.1 require seperate dependency on the Test SDK. - Add the Test SDK dependency on the Test.Common project.
1 parent 6cb50b5 commit e56ab61

43 files changed

Lines changed: 140 additions & 184 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
shell: bash
4040

4141
- name: Unit Test
42-
run: dotnet test -v=normal --no-build --filter 'FullyQualifiedName!~IntegrationTests&Unstable!=True' --configuration ${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_PATH}}
42+
run: dotnet test -v=normal --filter "FullyQualifiedName!~IntegrationTests&Unstable!=True" -c ${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_PATH}}
4343

4444
- name: Nuget Pack
4545
run: dotnet pack --configuration ${{env.BUILD_CONFIGURATION}} --output "${{github.workspace}}/package/" ${{env.SOLUTION_PATH}}

‎.github/workflows/publish-release.yml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,6 @@ jobs:
2424
- name: Setup NuGet
2525
uses: NuGet/setup-nuget@v1.0.5
2626

27-
# - name: Set GITHUB_OWNER
28-
# run: echo "::set-env name=GITHUB_OWNER::$(echo ${{github.repository}} | cut -d "/" -f 1)"
29-
30-
# - name: Override bash shell PATH (workaround issue - tinyurl.com/w3dbtou)
31-
# run: echo "::add-path::C:\Program Files\Git\bin"
32-
33-
# - name: Update Directory.Build.props for Push
34-
# run: |
35-
# find . -name 'Directory.Build.props' -print0 | while read -d $'\0' file
36-
# do
37-
# sed -i 's,</IsPackable>,</IsPackable>\n\t<RepositoryType>git</RepositoryType>\n\t<RepositoryUrl>git://github.com/${{github.repository}}</RepositoryUrl>,g' $file
38-
# done
39-
# shell: bash
40-
4127
- name: Nuget Pack
4228
run: dotnet pack --configuration ${{env.BUILD_CONFIGURATION}} --output "${{github.workspace}}\package\" ${{env.SOLUTION_PATH}}
4329

‎.github/workflows/pull-request.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ jobs:
2323
steps:
2424

2525
- uses: actions/checkout@v1
26-
27-
# - name: Setup .NET Core
28-
# uses: actions/setup-dotnet@v1
29-
# with:
30-
# dotnet-version: '3.1.300'
31-
26+
3227
- name: Restore
3328
run: dotnet restore ${{env.SOLUTION_PATH}}
3429

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ jobs:
2626

2727
- uses: actions/checkout@v1
2828

29-
- name: Setup .NET Core
30-
uses: actions/setup-dotnet@v1
31-
with:
32-
dotnet-version: '3.1.202'
33-
3429
- name: Restore
3530
run: dotnet restore ${{env.SOLUTION_PATH}}
3631

‎src/Blockcore/Base/TimeSyncBehavior.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ private Task OnMessageReceivedAsync(INetworkPeer peer, IncomingMessage message)
441441
VersionPayload version = peer.PeerVersion;
442442
if (version != null)
443443
{
444-
TimeSpan timeOffset = version.Timestamp - this.dateTimeProvider.GetTimeOffset();
445-
if (timeOffset != null) this.state.AddTimeData(address, timeOffset, peer.Inbound);
444+
TimeSpan? timeOffset = version.Timestamp - this.dateTimeProvider.GetTimeOffset();
445+
if (timeOffset != null) this.state.AddTimeData(address, timeOffset.Value, peer.Inbound);
446446
}
447447
else this.logger.LogDebug("Node '{0}' does not have an initialized time offset.", peer.RemoteSocketEndpoint);
448448
}

‎src/Blockcore/Blockcore.csproj‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,23 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="ConcurrentHashSet" Version="1.1.0" />
26-
<PackageReference Include="DBreeze" Version="1.95.0" />
27-
<PackageReference Include="LiteDB" Version="5.0.8" />
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
29-
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.4" />
30-
<PackageReference Include="NLog" Version="4.7.0" />
31-
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.3" />
26+
<PackageReference Include="DBreeze" Version="1.97.0" />
27+
<PackageReference Include="LiteDB" Version="5.0.9" />
28+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.2.0" />
29+
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
30+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
31+
<PackageReference Include="NLog" Version="4.7.6" />
32+
<PackageReference Include="NLog.Extensions.Logging" Version="1.6.5" />
3233
<PackageReference Include="Polly" Version="7.2.1" />
3334
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113">
3435
<PrivateAssets>all</PrivateAssets>
3536
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3637
</PackageReference>
37-
<PackageReference Include="System.Reactive" Version="4.4.1" />
38-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
39-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
40-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
41-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.2.0" />
42-
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
43-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
44-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
45-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
46-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
47-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.4" />
48-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
38+
<PackageReference Include="System.Reactive" Version="5.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
4943
<PackageReference Include="NStratis.HashLib" Version="1.0.0.1" />
5044
</ItemGroup>
5145

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<Version>1.0.17</Version>
4-
<RuntimeFrameworkVersion>3.1.4</RuntimeFrameworkVersion>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<RuntimeFrameworkVersion>5.0.1</RuntimeFrameworkVersion>
5+
<TargetFramework>net5.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<Authors>Blockcore</Authors>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>

‎src/Features/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<IsPackable>true</IsPackable>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="DBreeze" Version="1.95.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.4" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
13+
<PackageReference Include="DBreeze" Version="1.97.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Features/Blockcore.Features.Consensus/Blockcore.Features.Consensus.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="LevelDB.Standard" Version="2.1.6.1" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.4" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
2121
<PackageReference Include="Microsoft.FASTER" Version="2020.2.1.1" />
2222
</ItemGroup>
2323

‎src/Features/Blockcore.Features.LightWallet/Blockcore.Features.LightWallet.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
<DocumentationFile></DocumentationFile>
1919
</PropertyGroup>
2020

21-
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
25-
</PackageReference>
26-
</ItemGroup>
27-
2821
<ItemGroup>
2922
<ProjectReference Include="..\..\External\NBitcoin\NBitcoin.csproj" />
3023
<ProjectReference Include="..\Blockcore.Features.Notifications\Blockcore.Features.Notifications.csproj" />

0 commit comments

Comments
 (0)