Skip to content

Commit 5134458

Browse files
committed
Add .NET 10.0 support and update dependencies
- Updated documentation to specify support for .NET 6.0 and .NET 10.0. - Added .NET 10.0 as a target framework in both main and test projects. - Bumped package version to 5.14.0. - Upgraded NuGet dependencies: AngleSharp, MailKit, Microsoft.SourceLink.GitHub, and System.Configuration.ConfigurationManager. - No code changes were made. - Update appveyor.yml
1 parent f879acc commit 5134458

7 files changed

Lines changed: 86 additions & 16 deletions

File tree

PkgReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
### Supported Frameworks
3535
* .Net Framework 4.6.2 and later
3636
* .Net Standard 2.1
37-
* NET 6.0 and later
37+
* NET 6.0 and NET 10.0
3838

3939
[![Paypal-Donations](https://img.shields.io/badge/Donate-PayPal-important.svg?style=flat-square)](https://www.paypal.com/donate?hosted_button_id=KSC3LRAR26AHN)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
### Supported Frameworks
4343
* .Net Framework 4.6.2 and later
4444
* .Net Standard 2.1
45-
* NET 6.0 and later
45+
* NET 6.0 and NET 10.0
4646

4747
[![Paypal-Donations](https://img.shields.io/badge/Donate-PayPal-important.svg?style=flat-square)](https://www.paypal.com/donate?hosted_button_id=KSC3LRAR26AHN)
4848

Src/Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Copyright>Copyright 2011-$(CurrentYear) axuno, MailMergeLib Project maintainers and contributers</Copyright>
99
<RepositoryUrl>https://github.com/axuno/MailMergeLib.git</RepositoryUrl>
1010
<PublishRepositoryUrl>true</PublishRepositoryUrl>
11-
<Version>5.13.0</Version>
12-
<FileVersion>5.13.0</FileVersion>
11+
<Version>5.14.0</Version>
12+
<FileVersion>5.14.0</FileVersion>
1313
<AssemblyVersion>5.0.0.0</AssemblyVersion> <!--only update AssemblyVersion with major releases -->
1414
<LangVersion>latest</LangVersion>
1515
<EnableNETAnalyzers>true</EnableNETAnalyzers>

Src/MailMergeLib.Tests/MailMergeLib.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Description>Test project for MailMergeLib</Description>
55
<AssemblyTitle>MailMergeLib.UnitTest</AssemblyTitle>
6-
<TargetFrameworks>net462;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net10.0</TargetFrameworks>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
<AssemblyName>MailMergeLib.Tests</AssemblyName>
99
<AssemblyOriginatorKeyFile>../MailMergeLib/MailMergeLib.snk</AssemblyOriginatorKeyFile>

Src/MailMergeLib/MailMergeLib.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Description>MailMergeLib is a mail message client library which provides comfortable mail merge capabilities for text, inline images and attachments, as well as good throughput and fault tolerance for sending mail messages.</Description>
55
<AssemblyTitle>MailMergeLib</AssemblyTitle>
66
<AssemblyName>MailMergeLib</AssemblyName>
7-
<TargetFrameworks>netstandard2.1;net462;net6.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.1;net462;net6.0;net10.0</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<RootNamespace>MailMergeLib</RootNamespace>
1010
<AssemblyOriginatorKeyFile>MailMergeLib.snk</AssemblyOriginatorKeyFile>
@@ -55,20 +55,20 @@ https://github.com/axuno/MailMergeLib/releases</PackageReleaseNotes>
5555
</ItemGroup>
5656

5757
<ItemGroup>
58-
<PackageReference Include="AngleSharp" Version="1.3.0" />
59-
<PackageReference Include="MailKit" Version="4.14.0" />
58+
<PackageReference Include="AngleSharp" Version="1.4.0" />
59+
<PackageReference Include="MailKit" Version="4.15.1" />
6060
<PackageReference Include="MimeKit" Version="4.15.1" />
6161
<PackageReference Include="SmartFormat.NET" Version="3.6.1" />
6262
<PackageReference Include="YAXLib" Version="4.3.0" />
63-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
63+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103">
6464
<PrivateAssets>all</PrivateAssets>
6565
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6666
</PackageReference>
6767
</ItemGroup>
6868

6969
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
7070
<Reference Include="System.Configuration" />
71-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.9" />
71+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.3" />
7272
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
7373
</ItemGroup>
7474

Src/appveyor.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
version: 5.0.0.{build} # Only change for mayor versions (e.g. 6.0.0)
2+
environment:
3+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
4+
matrix:
5+
- job_name: windows
6+
appveyor_build_worker_image: Visual Studio 2022 # 2026 is not available yet
7+
- job_name: linux
8+
appveyor_build_worker_image: Ubuntu
9+
matrix:
10+
fast_finish: true
11+
only_commits:
12+
files:
13+
- appveyor.yml
14+
- Src/**/*
15+
16+
for:
17+
-
18+
matrix:
19+
only:
20+
- job_name: windows
21+
init:
22+
# default is: core.autocrlf input
23+
- git config --global core.autocrlf true
24+
install:
25+
- ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "dotnet-install.ps1"
26+
- ps: .\dotnet-install.ps1 -Channel 10.0 -InstallDir "$env:ProgramFiles\dotnet"
27+
build_script:
28+
- ps: cd $env:APPVEYOR_BUILD_FOLDER\Src
29+
- ps: dotnet --version
30+
- ps: dotnet restore --verbosity quiet
31+
- ps: dotnet add .\MailMergeLib.Tests\MailMergeLib.Tests.csproj package AltCover
32+
- ps: |
33+
$version = "5.14.0"
34+
$versionFile = $version + "." + ${env:APPVEYOR_BUILD_NUMBER}
35+
36+
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
37+
$version = $version + "-PR" + $env:APPVEYOR_PULL_REQUEST_NUMBER
38+
}
39+
dotnet build MailMergeLib.sln /verbosity:minimal /t:rebuild /p:configuration=release /p:IncludeSymbols=true /p:ContinuousIntegrationBuild=true /p:Version=$version /p:FileVersion=$versionFile
40+
dotnet pack MailMergeLib.sln --verbosity minimal --no-build --configuration release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:PackageOutputPath=$env:APPVEYOR_BUILD_FOLDER/artifacts /p:ContinuousIntegrationBuild=true
41+
test_script:
42+
- cmd: nuget install Appveyor.TestLogger
43+
- cmd: dotnet test --framework net10.0 --test-adapter-path:. --logger:Appveyor MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="..\MailMergeLib\MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
44+
- cmd: nuget install codecov -excludeversion
45+
- cmd: .\Codecov\Tools\win7-x86\codecov.exe -f ".\MailMergeLib.Tests\coverage.net10.0.xml" -n net10.0win
46+
artifacts:
47+
- path: 'artifacts\*.nupkg'
48+
type: NuGetPackage
49+
- path: 'artifacts\*.snupkg'
50+
type: NuGetPackage
51+
deploy:
52+
- provider: NuGet
53+
api_key: $(NUGET_API_KEY)
54+
on:
55+
branch: main
56+
-
57+
matrix:
58+
only:
59+
- job_name: linux
60+
build_script:
61+
- cd $APPVEYOR_BUILD_FOLDER/Src
62+
- curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 10.0
63+
- export PATH="$HOME/.dotnet:$PATH"
64+
- dotnet --version
65+
- dotnet restore --verbosity quiet
66+
- dotnet add ./MailMergeLib.Tests/MailMergeLib.Tests.csproj package AltCover
67+
- dotnet build MailMergeLib.sln /verbosity:minimal /t:rebuild /p:configuration=release /nowarn:CS1591,CS0618
68+
test_script:
69+
- dotnet test --framework net10.0 MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="../MailMergeLib/MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
70+
- bash <(curl -s https://codecov.io/bash) -f ./MailMergeLib.Tests/coverage.net10.0.xml -n net10.0linux

appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ environment:
33
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
44
matrix:
55
- job_name: windows
6-
appveyor_build_worker_image: Visual Studio 2022
6+
appveyor_build_worker_image: Visual Studio 2026
77
- job_name: linux
88
appveyor_build_worker_image: Ubuntu
99
matrix:
@@ -27,7 +27,7 @@ for:
2727
- ps: dotnet restore --verbosity quiet
2828
- ps: dotnet add .\MailMergeLib.Tests\MailMergeLib.Tests.csproj package AltCover
2929
- ps: |
30-
$version = "5.13.0"
30+
$version = "5.14.0"
3131
$versionFile = $version + "." + ${env:APPVEYOR_BUILD_NUMBER}
3232
3333
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
@@ -37,9 +37,9 @@ for:
3737
dotnet pack MailMergeLib.sln --verbosity minimal --no-build --configuration release /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:PackageOutputPath=$env:APPVEYOR_BUILD_FOLDER/artifacts /p:ContinuousIntegrationBuild=true
3838
test_script:
3939
- cmd: nuget install Appveyor.TestLogger
40-
- cmd: dotnet test --framework net8.0 --test-adapter-path:. --logger:Appveyor MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="..\MailMergeLib\MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
40+
- cmd: dotnet test --framework net10.0 --test-adapter-path:. --logger:Appveyor MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="..\MailMergeLib\MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
4141
- cmd: nuget install codecov -excludeversion
42-
- cmd: .\Codecov\Tools\win7-x86\codecov.exe -f ".\MailMergeLib.Tests\coverage.net8.0.xml" -n net8.0win
42+
- cmd: .\Codecov\Tools\win7-x86\codecov.exe -f ".\MailMergeLib.Tests\coverage.net10.0.xml" -n net10.0win
4343
artifacts:
4444
- path: 'artifacts\*.nupkg'
4545
type: NuGetPackage
@@ -63,5 +63,5 @@ for:
6363
- dotnet add ./MailMergeLib.Tests/MailMergeLib.Tests.csproj package AltCover
6464
- dotnet build MailMergeLib.sln /verbosity:minimal /t:rebuild /p:configuration=release /nowarn:CS1591,CS0618
6565
test_script:
66-
- dotnet test --framework net8.0 MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="../MailMergeLib/MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
67-
- bash <(curl -s https://codecov.io/bash) -f ./MailMergeLib.Tests/coverage.net8.0.xml -n net8.0linux
66+
- dotnet test --framework net10.0 MailMergeLib.sln /p:configuration=release /p:AltCover=true /p:AltCoverXmlReport="coverage.xml" /p:AltCover=true /p:AltCoverStrongNameKey="../MailMergeLib/MailMergeLib.snk" /p:AltCoverAssemblyExcludeFilter="MailMergeLib.Tests|NUnit3.TestAdapter" /p:AltCoverLineCover="true"
67+
- bash <(curl -s https://codecov.io/bash) -f ./MailMergeLib.Tests/coverage.net10.0.xml -n net10.0linux

0 commit comments

Comments
 (0)