Skip to content

Commit 2aa56c7

Browse files
somdoronsomdoron
authored
Merge pull request #1145 from chrbauer/update/net10
Upgrade net8.0 -> net10.0
2 parents b368be3 + 8109871 commit 2aa56c7

9 files changed

Lines changed: 38 additions & 42 deletions

File tree

‎.github/workflows/CI.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
name: CI
22
on: [push, pull_request]
3-
43
jobs:
54
ununtu:
65
runs-on: ubuntu-latest
76
env:
87
DOTNET_NOLOGO: true
98
steps:
10-
- uses: actions/checkout@v4.2.2
11-
- uses: actions/setup-dotnet@v4.1.0
9+
- uses: actions/checkout@v6
10+
- uses: actions/setup-dotnet@v5
1211
with:
13-
dotnet-version: 9.0.x
12+
dotnet-version: 10.0.x
1413
- run: dotnet restore src/NetMQ.sln
1514
- name: build
1615
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
17-
- name: test net9.0
18-
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net9.0 src/NetMQ.Tests/NetMQ.Tests.csproj
16+
- name: test net10.0
17+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src/NetMQ.Tests/NetMQ.Tests.csproj
1918
windows:
2019
runs-on: windows-latest
2120
env:
2221
DOTNET_NOLOGO: true
2322
steps:
24-
- uses: actions/checkout@v4.2.2
25-
- uses: actions/setup-dotnet@v4.1.0
23+
- uses: actions/checkout@v6
24+
- uses: actions/setup-dotnet@v5
2625
with:
27-
dotnet-version: 9.0.x
26+
dotnet-version: 10.0.x
2827
- name: Install codecov
2928
run: |
3029
choco install opencover.portable
3130
choco install codecov
3231
- run: dotnet restore src/NetMQ.sln
3332
- name: build
3433
run: dotnet build src/NetMQ.sln /p:Configuration=Release /verbosity:minimal
35-
- name: test net9.0
36-
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net9.0 src\NetMQ.Tests\NetMQ.Tests.csproj
34+
- name: test net10.0
35+
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src\NetMQ.Tests\NetMQ.Tests.csproj
3736
- name: test net472
3837
run: dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net472 src\NetMQ.Tests\NetMQ.Tests.csproj
3938
- name: coverage
4039
run: |
41-
OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net6.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
40+
OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net10.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
4241
codecov -f "NetMQ_coverage.xml"

‎appveyor.yml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
version: 4.0.0.{build}
22
skip_tags: true
3-
image: Visual Studio 2019
3+
image: Visual Studio 2026
44
configuration: Release
5-
65
before_build:
76
- choco install opencover.portable
87
- choco install codecov
9-
108
build_script:
119
- dotnet restore src/NetMQ.sln
1210
- dotnet build src/NetMQ.sln /p:Configuration=Release /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION% /p:ContinuousIntegrationBuild=true /verbosity:minimal
1311
- dotnet pack src/NetMQ/NetMQ.csproj -c Release --no-build /p:PackageVersion=%APPVEYOR_BUILD_VERSION%-pre /p:Version=%APPVEYOR_BUILD_VERSION%
14-
1512
test_script:
16-
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f netcoreapp2.1 src\NetMQ.Tests\NetMQ.Tests.csproj
17-
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net47 src\NetMQ.Tests\NetMQ.Tests.csproj
18-
- OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f netcoreapp2.1 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
13+
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net10.0 src\NetMQ.Tests\NetMQ.Tests.csproj
14+
- dotnet test -v n -p:ParallelizeTestCollections=false --configuration Release --no-build -f net472 src\NetMQ.Tests\NetMQ.Tests.csproj
15+
- OpenCover.Console.exe -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"test --no-build --configuration Release -f net10.0 --logger:trx;LogFileName=results.trx /p:DebugType=full src\NetMQ.Tests\NetMQ.Tests.csproj" -filter:"+[NetMQ*]* -[NetMQ.Tests*]*" -output:".\NetMQ_coverage.xml" -oldStyle
1916
- codecov -f "NetMQ_coverage.xml"
20-
2117
artifacts:
2218
- path: '**\*.nupkg'

‎src/NetMQ.Tests/NetMQ.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
88
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
99
<IsTestProject>true</IsTestProject>
10-
<TargetFrameworks>net9.0;net472</TargetFrameworks>
10+
<TargetFrameworks>net10.0;net472</TargetFrameworks>
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
@@ -39,11 +39,11 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
43-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
42+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
43+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
4444
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
45-
<PackageReference Include="xunit" Version="2.9.3" />
46-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
45+
<PackageReference Include="xunit" Version="2.9.2" />
46+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
4747
<PrivateAssets>all</PrivateAssets>
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4949
</PackageReference>
@@ -54,8 +54,8 @@
5454
</ItemGroup>
5555

5656
<ItemGroup>
57-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
58-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
57+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
58+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
5959
</ItemGroup>
6060

6161
</Project>

‎src/NetMQ/NetMQ.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>A 100% native C# port of the lightweight high performance messaging library ZeroMQ</Description>
55
<Version>4.0.0.0</Version>
6-
<TargetFrameworks>net8.0;net472;netstandard2.1</TargetFrameworks>
6+
<TargetFrameworks>net10.0;net472;netstandard2.1</TargetFrameworks>
77
<DebugType>portable</DebugType>
88
<AssemblyOriginatorKeyFile>./NetMQ.snk</AssemblyOriginatorKeyFile>
99
<SignAssembly>true</SignAssembly>
@@ -39,21 +39,22 @@
3939
</ItemGroup>
4040

4141
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
42-
<PackageReference Include="System.ServiceModel.Primitives" Version="8.1.2" />
42+
<PackageReference Include="System.ServiceModel.Primitives" Version="10.0.652802" />
43+
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.6" />
4344
</ItemGroup>
4445

4546
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
4647
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
4748
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
48-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
49+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.6" />
4950
<Reference Include="System.ServiceModel" />
5051
<Reference Include="System" />
5152
<Reference Include="Microsoft.CSharp" />
5253

5354
</ItemGroup>
5455

5556
<ItemGroup>
56-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
57-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
57+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
58+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
5859
</ItemGroup>
5960
</Project>

‎src/Performance/NetMQ.SimpleTests/NetMQ.SimpleTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
13+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Performance/local_lat/local_lat.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
13+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Performance/local_thr/local_thr.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
13+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Performance/remote_lat/remote_lat.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
13+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/Performance/remote_thr/remote_thr.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
14-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
13+
<PackageReference Update="JetBrains.Annotations" Version="2025.2.4" />
14+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.202" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)