Skip to content

Commit dbb57b4

Browse files
author
John Campion Jr
committed
feat: added .net9.0 compatibility
disabled .net10.0 until release
1 parent fed435e commit dbb57b4

6 files changed

Lines changed: 73 additions & 47 deletions

File tree

‎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-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
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/Senders/FluentEmail.MailPace/StreamExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static string ConvertToBase64(this Stream stream)
1616

1717
stream.Seek(0, SeekOrigin.Begin);
1818
// ReSharper disable once MustUseReturnValue
19-
stream.Read(bytes, 0, (int)stream.Length);
19+
stream.ReadExactly(bytes, 0, (int)stream.Length);
2020

2121
return Convert.ToBase64String(bytes);
2222
}

‎test/FluentEmail.Bootstrap.Tests/FluentEmail.Bootstrap.Tests.csproj‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,21 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
14-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
1513
<PackageReference Include="Verify.XunitV3" Version="31.0.4" />
1614
</ItemGroup>
17-
15+
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
17+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
18+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
19+
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
21+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.10" />
22+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.10" />
23+
</ItemGroup>
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
25+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-rc.2.25502.107" />
26+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0-rc.2.25502.107" />
27+
</ItemGroup>
28+
29+
1830
</Project>

‎test/FluentEmail.Liquid.Tests/FluentEmail.Liquid.Tests.csproj‎

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

3-
<PropertyGroup>
4-
<PreserveCompilationContext>true</PreserveCompilationContext>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<PreserveCompilationContext>true</PreserveCompilationContext>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<Content Include="EmailTemplates\_layout.liquid" CopyToOutputDirectory="PreserveNewest" />
9-
<EmbeddedResource Include="EmailTemplates\_embedded.liquid" />
10-
</ItemGroup>
7+
<ItemGroup>
8+
<Content Include="EmailTemplates\_layout.liquid" CopyToOutputDirectory="PreserveNewest" />
9+
<EmbeddedResource Include="EmailTemplates\_embedded.liquid" />
10+
</ItemGroup>
1111

12-
<ItemGroup>
13-
<ProjectReference Include="..\..\src\Renderers\FluentEmail.Liquid\FluentEmail.Liquid.csproj" />
14-
</ItemGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\..\src\Renderers\FluentEmail.Liquid\FluentEmail.Liquid.csproj" />
14+
</ItemGroup>
1515

16-
<ItemGroup>
17-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
18-
</ItemGroup>
16+
<ItemGroup>
17+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
18+
</ItemGroup>
1919

20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
22-
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
23-
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
21+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
22+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
23+
</ItemGroup>
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
25+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.10" />
26+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.10" />
27+
</ItemGroup>
28+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
29+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-rc.2.25502.107" />
30+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.0-rc.2.25502.107" />
31+
</ItemGroup>
2432

2533
</Project>

‎test/FluentEmail.Razor.Tests/FluentEmail.Razor.Tests.csproj‎

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

3-
<PropertyGroup>
4-
<PreserveCompilationContext>true</PreserveCompilationContext>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<PreserveCompilationContext>true</PreserveCompilationContext>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<None Remove="Shared\_Layout.cshtml" />
9-
<None Remove="_EmbeddedLayout.cshtml" />
10-
</ItemGroup>
7+
<ItemGroup>
8+
<None Remove="Shared\_Layout.cshtml" />
9+
<None Remove="_EmbeddedLayout.cshtml" />
10+
</ItemGroup>
1111

12-
<ItemGroup>
13-
<Content Include="Shared\_Layout.cshtml">
14-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
15-
</Content>
16-
<EmbeddedResource Include="_EmbeddedLayout.cshtml">
17-
</EmbeddedResource>
18-
</ItemGroup>
12+
<ItemGroup>
13+
<Content Include="Shared\_Layout.cshtml">
14+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
15+
</Content>
16+
<EmbeddedResource Include="_EmbeddedLayout.cshtml">
17+
</EmbeddedResource>
18+
</ItemGroup>
1919

20-
<ItemGroup>
21-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.3" />
22-
</ItemGroup>
20+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
21+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
22+
</ItemGroup>
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
24+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
25+
</ItemGroup>
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
27+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.2.25502.107" />
28+
</ItemGroup>
2329

24-
<ItemGroup>
25-
<ProjectReference Include="..\..\src\FluentEmail.Core\FluentEmail.Core.csproj" />
26-
<ProjectReference Include="..\..\src\Renderers\FluentEmail.Razor\FluentEmail.Razor.csproj" />
27-
</ItemGroup>
30+
<ItemGroup>
31+
<ProjectReference Include="..\..\src\FluentEmail.Core\FluentEmail.Core.csproj" />
32+
<ProjectReference Include="..\..\src\Renderers\FluentEmail.Razor\FluentEmail.Razor.csproj" />
33+
</ItemGroup>
2834

29-
<ItemGroup>
30-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
31-
</ItemGroup>
35+
<ItemGroup>
36+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
37+
</ItemGroup>
3238

3339
</Project>

‎test/FluentEmail.ThirdParty.Tests/FluentEmail.ThirdParty.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</None>
2121
<EmbeddedResource Include="test-embedded.txt" />
2222
<PackageReference Include="dotenv.net" Version="4.0.0" />
23-
<None Update=".env">
23+
<None Update=".en-johnv">
2424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2525
</None>
2626
<None Update=".env.sample">

0 commit comments

Comments
 (0)