Skip to content

Commit 8aa8da7

Browse files
TRybina132TRybina132
authored
Merge pull request #11 from managedcode/update_to_dotnet8
Update to .net8
2 parents e26d807 + c6db0d6 commit 8aa8da7

7 files changed

Lines changed: 59 additions & 24 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,46 @@ jobs:
2626
# run build and test
2727
- name: Restore dependencies
2828
run: dotnet restore
29+
2930
- name: Build
3031
run: dotnet build --no-restore
32+
3133
- name: Test and Collect Code Coverage
3234
run: dotnet test -p:CollectCoverage=true -p:CoverletOutput=coverage/
33-
35+
36+
- name: Copy coverage files
37+
run: |
38+
mkdir '${{ github.workspace }}/coverage'
39+
find . -name "*.opencover.xml" -exec sh -c 'cp "$0" "coverage/coverage-$(basename $0)"' {} \;
40+
41+
- name: List coverage files
42+
run: ls '${{ github.workspace }}/coverage/'
43+
44+
- name: SonarCloud Scan
45+
uses: sonarsource/sonarcloud-github-action@master
46+
with:
47+
args: >
48+
-Dsonar.organization=managedcode
49+
-Dsonar.projectKey=managedcode_Communication
50+
-Dsonar.token=${{ secrets.SONAR_TOKEN }}
51+
-Dsonar.cs.opencover.reportsPaths=${{ github.workspace }}/coverage/
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
55+
56+
- name: NDepend
57+
uses: ndepend/ndepend-action@v1
58+
with:
59+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
license: ${{ secrets.NDEPENDLICENSE }}
61+
coveragefolder: ${{ github.workspace }}/coverage/
62+
baseline: main_recent
63+
retention-days: 15
64+
65+
- name: Upload coverage reports to Codecov
66+
uses: codecov/codecov-action@v3
67+
env:
68+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3469

3570
# - name: coveralls
3671
# uses: coverallsapp/github-action@master

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<RepositoryUrl>https://github.com/managedcode/Communication</RepositoryUrl>
1818
<PackageProjectUrl>https://github.com/managedcode/Communication</PackageProjectUrl>
1919
<Product>Managed Code - Communication</Product>
20-
<Version>2.0.26</Version>
21-
<PackageVersion>2.0.26</PackageVersion>
20+
<Version>8.0.0</Version>
21+
<PackageVersion>8.0.0</PackageVersion>
2222

2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎ManagedCode.Communication.Benchmark/ManagedCode.Communication.Benchmark.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
<IsPackable>false</IsPackable>
8+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎ManagedCode.Communication.Extensions/ManagedCode.Communication.Extensions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<LangVersion>11</LangVersion>
55
<Nullable>enable</Nullable>
66
<IsPackable>true</IsPackable>
7-
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
7+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
88
<RootNamespace>ManagedCode.Communication.Extensions</RootNamespace>
99
<OutputType>Library</OutputType>
1010
</PropertyGroup>

‎ManagedCode.Communication.Orleans/ManagedCode.Communication.Orleans.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<LangVersion>11</LangVersion>
55
<Nullable>enable</Nullable>
66
<IsPackable>true</IsPackable>
7-
<TargetFramework>net7.0</TargetFramework>
87
<RootNamespace>ManagedCode.Communication</RootNamespace>
8+
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
99
</PropertyGroup>
1010

1111
<!--NuGet-->
@@ -17,9 +17,9 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.1" />
21-
<PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.1" />
22-
<PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="7.2.1" />
20+
<PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.3" />
21+
<PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.3" />
22+
<PackageReference Include="Microsoft.Orleans.Serialization.Abstractions" Version="7.2.3" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎ManagedCode.Communication.Tests/ManagedCode.Communication.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
54
<EnableNETAnalyzers>true</EnableNETAnalyzers>
65
<IsPackable>false</IsPackable>
76
<LangVersion>11</LangVersion>
87
<Nullable>enable</Nullable>
98
<OutputType>Library</OutputType>
109
<GenerateProgramFile>false</GenerateProgramFile>
10+
<TargetFramework>net8.0</TargetFramework>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
@@ -26,17 +26,17 @@
2626
</None>
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="7.2.1" />
30-
<PackageReference Include="FluentAssertions" Version="6.11.0" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
32-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
29+
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="7.2.3" />
30+
<PackageReference Include="FluentAssertions" Version="6.12.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
3333
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
34-
<PackageReference Include="System.Text.Json" Version="7.0.3" />
35-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
36-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
37-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.9" />
38-
<PackageReference Include="xunit" Version="2.5.0" />
39-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
34+
<PackageReference Include="System.Text.Json" Version="8.0.0" />
35+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
37+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
38+
<PackageReference Include="xunit" Version="2.6.2" />
39+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
<PrivateAssets>all</PrivateAssets>
4242
</PackageReference>

‎ManagedCode.Communication/ManagedCode.Communication.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<LangVersion>11</LangVersion>
55
<Nullable>enable</Nullable>
66
<IsPackable>true</IsPackable>
7-
<TargetFrameworks>net6.0;net7.0;</TargetFrameworks>
7+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<!--NuGet-->
@@ -15,8 +15,8 @@
1515
<PackageTags>managedcode, Communication, Result</PackageTags>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
18+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<InternalsVisibleTo Include="ManagedCode.Communication.Orleans" />

0 commit comments

Comments
 (0)