Skip to content

Commit e1034c4

Browse files
JohnCampionJrJohnCampionJr
committed
feat!: changed to .net 8.0, 9.0, 10.0
1 parent fe6f017 commit e1034c4

34 files changed

+275
-120
lines changed

‎FluentEmail.sln‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.4.33205.214
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11121.172 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6DC215BD-05EF-49A6-ADBE-8AE399952EEC}"
77
ProjectSection(SolutionItems) = preProject
@@ -63,6 +63,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Bootstrap", "sr
6363
EndProject
6464
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Bootstrap.Tests", "test\FluentEmail.Bootstrap.Tests\FluentEmail.Bootstrap.Tests.csproj", "{0FC3B43F-E1AA-471C-B3FD-5996140947D4}"
6565
EndProject
66+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{04BD5622-3AF0-4184-89E2-B5B100C566F3}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.ThirdParty.Tests", "test\FluentEmail.ThirdParty.Tests\FluentEmail.ThirdParty.Tests.csproj", "{E7F70653-8ED5-EA4E-7069-17670B57A2DB}"
69+
EndProject
6670
Global
6771
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6872
Debug|Any CPU = Debug|Any CPU
@@ -137,6 +141,10 @@ Global
137141
{0FC3B43F-E1AA-471C-B3FD-5996140947D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
138142
{0FC3B43F-E1AA-471C-B3FD-5996140947D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
139143
{0FC3B43F-E1AA-471C-B3FD-5996140947D4}.Release|Any CPU.Build.0 = Release|Any CPU
144+
{E7F70653-8ED5-EA4E-7069-17670B57A2DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145+
{E7F70653-8ED5-EA4E-7069-17670B57A2DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
146+
{E7F70653-8ED5-EA4E-7069-17670B57A2DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
147+
{E7F70653-8ED5-EA4E-7069-17670B57A2DB}.Release|Any CPU.Build.0 = Release|Any CPU
140148
EndGlobalSection
141149
GlobalSection(SolutionProperties) = preSolution
142150
HideSolutionNode = FALSE
@@ -163,6 +171,8 @@ Global
163171
{B7A5D5CF-9804-41CA-BF0A-16D5252CE7A9} = {926C0980-31D9-4449-903F-3C756044C28A}
164172
{D0F9A44C-25A6-47D9-ADCC-20DCF860B705} = {12F031E5-8DDC-40A0-9862-8764A6E190C0}
165173
{0FC3B43F-E1AA-471C-B3FD-5996140947D4} = {47CB89AC-9615-4FA8-90DE-2D849935C36D}
174+
{04BD5622-3AF0-4184-89E2-B5B100C566F3} = {6DC215BD-05EF-49A6-ADBE-8AE399952EEC}
175+
{E7F70653-8ED5-EA4E-7069-17670B57A2DB} = {04BD5622-3AF0-4184-89E2-B5B100C566F3}
166176
EndGlobalSection
167177
GlobalSection(ExtensibilityGlobals) = postSolution
168178
SolutionGuid = {23736554-5288-4B30-9710-B4D9880BCF0B}

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
4+
<TargetFramework>net8.0</TargetFramework>
55
<Authors>Luke Lowrey;Ben Cull;Github Contributors;John Campion</Authors>
66
<PackageTags>email;smtp;fluent;fluentemail</PackageTags>
77
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>

‎src/FluentEmail.Core/FluentEmail.Core.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<Description>Send emails very easily. Use razor templates, smtp, embedded files, all without hassle. This is a Base Package and includes just the domain model, very basic defaults, and is also included with every other jcamp.FluentEmail.* package here.</Description>
55
<AssemblyTitle>Fluent Email</AssemblyTitle>
6-
<TargetFramework>net6.0</TargetFramework>
76
<AssetsDirectory>../../assets</AssetsDirectory>
87
<PackageId>jcamp.$(AssemblyName)</PackageId>
98
<Product>jcamp.$(AssemblyName)</Product>
@@ -15,12 +14,17 @@
1514
</Target>-->
1615

1716
<ItemGroup>
18-
<None Include="../../README.md" Pack="true" Visible="false" PackagePath="\"/>
17+
<None Include="../../README.md" Pack="true" Visible="false" PackagePath="\" />
1918
</ItemGroup>
2019

2120

2221
<ItemGroup>
23-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
23+
</ItemGroup>
24+
25+
26+
<ItemGroup>
27+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2428
</ItemGroup>
2529

2630
</Project>

‎src/Renderers/FluentEmail.Bootstrap/FluentEmail.Bootstrap.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AssemblyTitle>Fluent Email - Bootstrap</AssemblyTitle>
66
<Authors>John Campion</Authors>
77
<PackageTags>$(PackageTags);bootstrap</PackageTags>
8-
<TargetFramework>net6.0</TargetFramework>
98
<AssetsDirectory>../../../assets</AssetsDirectory>
109
<NoWarn>NU5104</NoWarn>
1110
<Nullable>enable</Nullable>
@@ -17,11 +16,15 @@
1716
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
1817
</ItemGroup>
1918
<ItemGroup>
20-
<None Include="README.md" Pack="true" PackagePath="\"/>
19+
<None Include="README.md" Pack="true" PackagePath="\" />
2120
</ItemGroup>
2221

2322
<ItemGroup>
2423
<PackageReference Include="UnDotNet.BootstrapEmail" Version="1.*" />
2524
</ItemGroup>
2625

26+
<ItemGroup>
27+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
28+
</ItemGroup>
29+
2730
</Project>

‎src/Renderers/FluentEmail.Liquid/FluentEmail.Liquid.csproj‎

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

3-
<PropertyGroup>
4-
<Description>Generate emails using Liquid templates. Uses the Fluid project under the hood.</Description>
5-
<AssemblyTitle>Fluent Email - Liquid</AssemblyTitle>
6-
<Authors>Marko Lahma;$(Authors)</Authors>
7-
<PackageTags>$(PackageTags);liquid</PackageTags>
8-
<TargetFramework>net6.0</TargetFramework>
9-
<AssetsDirectory>../../../assets</AssetsDirectory>
10-
<NoWarn>NU5104</NoWarn>
11-
<Nullable>enable</Nullable>
12-
<PackageId>jcamp.$(AssemblyName)</PackageId>
13-
<Product>jcamp.$(AssemblyName)</Product>
14-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>Generate emails using Liquid templates. Uses the Fluid project under the hood.</Description>
5+
<AssemblyTitle>Fluent Email - Liquid</AssemblyTitle>
6+
<Authors>Marko Lahma;$(Authors)</Authors>
7+
<PackageTags>$(PackageTags);liquid</PackageTags>
8+
<AssetsDirectory>../../../assets</AssetsDirectory>
9+
<NoWarn>NU5104</NoWarn>
10+
<Nullable>enable</Nullable>
11+
<PackageId>jcamp.$(AssemblyName)</PackageId>
12+
<Product>jcamp.$(AssemblyName)</Product>
13+
</PropertyGroup>
1514

16-
<ItemGroup>
17-
<PackageReference Include="Fluid.Core" Version="2.5.0" />
18-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.13" />
19-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
20-
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Fluid.Core" Version="2.30.0" />
17+
</ItemGroup>
18+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
19+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
20+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
21+
</ItemGroup>
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
23+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.10" />
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.10" />
25+
</ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
27+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
29+
</ItemGroup>
2130

22-
<ItemGroup>
23-
<None Include="README.md" Pack="true" PackagePath="\"/>
24-
</ItemGroup>
31+
<ItemGroup>
32+
<None Include="README.md" Pack="true" PackagePath="\" />
33+
</ItemGroup>
2534

26-
<ItemGroup>
27-
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
28-
</ItemGroup>
35+
<ItemGroup>
36+
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
41+
</ItemGroup>
2942

3043
</Project>

‎src/Renderers/FluentEmail.Razor/FluentEmail.Razor.csproj‎

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

3-
<PropertyGroup>
4-
<Description>Generate emails using Razor templates. Anything you can do in ASP.NET is possible here. Uses the RazorLight project under the hood.</Description>
5-
<AssemblyTitle>Fluent Email - Razor</AssemblyTitle>
6-
<PackageTags>$(PackageTags);razor</PackageTags>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<AssetsDirectory>../../../assets</AssetsDirectory>
9-
<NoWarn>NU5104</NoWarn>
10-
<PackageId>jcamp.$(AssemblyName)</PackageId>
11-
<Product>jcamp.$(AssemblyName)</Product>
12-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>Generate emails using Razor templates. Anything you can do in ASP.NET is possible here. Uses the RazorLight project under the hood.</Description>
5+
<AssemblyTitle>Fluent Email - Razor</AssemblyTitle>
6+
<PackageTags>$(PackageTags);razor</PackageTags>
7+
<AssetsDirectory>../../../assets</AssetsDirectory>
8+
<NoWarn>NU5104</NoWarn>
9+
<PackageId>jcamp.$(AssemblyName)</PackageId>
10+
<Product>jcamp.$(AssemblyName)</Product>
11+
</PropertyGroup>
1312

14-
<ItemGroup>
15-
<PackageReference Include="RazorLight" Version="2.3.1" />
16-
</ItemGroup>
13+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
14+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
15+
</ItemGroup>
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
17+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
18+
</ItemGroup>
19+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
20+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
21+
</ItemGroup>
1722

18-
<ItemGroup>
19-
<None Include="README.md" Pack="true" PackagePath="\"/>
20-
</ItemGroup>
23+
<ItemGroup>
24+
<PackageReference Include="RazorLight" Version="2.3.1" />
25+
</ItemGroup>
2126

22-
<ItemGroup>
23-
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
24-
</ItemGroup>
27+
<ItemGroup>
28+
<None Include="README.md" Pack="true" PackagePath="\" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
37+
</ItemGroup>
2538

2639
</Project>

‎src/Senders/FluentEmail.Azure.Email/FluentEmail.Azure.Email.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<Description>Send emails via Azure Email Communication Services API</Description>
55
<AssemblyTitle>Fluent Email - Azure Email</AssemblyTitle>
66
<PackageTags>$(PackageTags);azureemail</PackageTags>
7-
<TargetFramework>net6.0</TargetFramework>
87
<Version>$(Version)</Version>
98
<PackageId>jcamp.$(AssemblyName)</PackageId>
109
<Product>jcamp.$(AssemblyName)</Product>
@@ -15,11 +14,15 @@
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<None Include="README.md" Pack="true" PackagePath="\"/>
17+
<None Include="README.md" Pack="true" PackagePath="\" />
1918
</ItemGroup>
2019

2120
<ItemGroup>
22-
<PackageReference Include="Azure.Communication.Email" Version="1.0.1" />
21+
<PackageReference Include="Azure.Communication.Email" Version="1.1.0" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2326
</ItemGroup>
2427

2528
</Project>

‎src/Senders/FluentEmail.Graph/FluentEmail.Graph.csproj‎

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

3-
<PropertyGroup>
4-
<Description>Send emails via Microsoft Graph API</Description>
5-
<AssemblyTitle>Fluent Email - Graph</AssemblyTitle>
6-
<PackageTags>$(PackageTags);graph</PackageTags>
7-
<TargetFramework>net6.0</TargetFramework>
8-
<NoWarn>NU5104</NoWarn>
9-
<PackageId>jcamp.$(AssemblyName)</PackageId>
10-
<Product>jcamp.$(AssemblyName)</Product>
11-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Description>Send emails via Microsoft Graph API</Description>
5+
<AssemblyTitle>Fluent Email - Graph</AssemblyTitle>
6+
<PackageTags>$(PackageTags);graph</PackageTags>
7+
<NoWarn>NU5104</NoWarn>
8+
<PackageId>jcamp.$(AssemblyName)</PackageId>
9+
<Product>jcamp.$(AssemblyName)</Product>
10+
</PropertyGroup>
1211

13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.Graph" Version="4.52.0" />
15-
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
16-
<PackageReference Include="Microsoft.Identity.Client" Version="4.64.0" />
17-
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Graph" Version="4.54.0" />
14+
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
15+
<PackageReference Include="Microsoft.Identity.Client" Version="4.78.0" />
16+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
17+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
18+
</ItemGroup>
1819

19-
<ItemGroup>
20-
<None Include="README.md" Pack="true" PackagePath="\"/>
21-
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
21+
<PackageReference Include="System.Text.Json" Version="8.0.6" />
22+
</ItemGroup>
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
24+
<PackageReference Include="System.Text.Json" Version="9.0.10" />
25+
</ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
27+
<PackageReference Include="System.Text.Json" Version="10.0.0" />
28+
</ItemGroup>
2229

23-
<ItemGroup>
24-
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
25-
</ItemGroup>
30+
<ItemGroup>
31+
<None Include="README.md" Pack="true" PackagePath="\" />
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
40+
</ItemGroup>
2641

2742
</Project>

‎src/Senders/FluentEmail.MailKit/FluentEmail.MailKit.csproj‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<AssemblyTitle>Fluent Email - MailKit</AssemblyTitle>
66
<Authors>Luke Lowrey;Ben Cull;Matt Rutledge;Github Contributors</Authors>
77
<PackageTags>$(PackageTags);mailkit</PackageTags>
8-
<TargetFramework>net6.0</TargetFramework>
98
<RootNamespace>FluentEmail.MailKitSmtp</RootNamespace>
109
<PackageId>jcamp.$(AssemblyName)</PackageId>
1110
<Product>jcamp.$(AssemblyName)</Product>
@@ -16,12 +15,27 @@
1615
</ItemGroup>
1716

1817
<ItemGroup>
19-
<None Include="README.md" Pack="true" PackagePath="\"/>
18+
<None Include="README.md" Pack="true" PackagePath="\" />
2019
</ItemGroup>
2120

2221
<ItemGroup>
23-
<PackageReference Include="MailKit" Version="4.7.1.1" />
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
22+
<PackageReference Include="MailKit" Version="4.14.1" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
26+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
28+
</ItemGroup>
29+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
30+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.10" />
31+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.10" />
32+
</ItemGroup>
33+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
34+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2640
</ItemGroup>
2741
</Project>

‎src/Senders/FluentEmail.MailPace/FluentEmail.MailPace.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
<Description>Send emails via MailPace using their REST API</Description>
55
<AssemblyTitle>Fluent Email - MailPace</AssemblyTitle>
66
<PackageTags>$(PackageTags);mailpace</PackageTags>
7-
<TargetFramework>net6.0</TargetFramework>
87
<PackageId>jcamp.$(AssemblyName)</PackageId>
98
<Product>jcamp.$(AssemblyName)</Product>
109
</PropertyGroup>
1110

1211
<ItemGroup>
13-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
1413
</ItemGroup>
1514

1615
<ItemGroup>
17-
<None Include="README.md" Pack="true" PackagePath="\"/>
16+
<None Include="README.md" Pack="true" PackagePath="\" />
1817
</ItemGroup>
1918

2019
<ItemGroup>
2120
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
2221
</ItemGroup>
2322

23+
<ItemGroup>
24+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
25+
</ItemGroup>
26+
2427
</Project>

0 commit comments

Comments
 (0)