Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;netstandard2.0</TargetFrameworks>
<Authors>Luke Lowrey;Ben Cull;Github Contributors;John Campion</Authors>
<PackageTags>email;smtp;fluent;fluentemail</PackageTags>
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
Expand Down Expand Up @@ -39,6 +39,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all"/>
<PackageReference Include="PolySharp" Version="1.16.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/FluentEmail.Core/FluentEmail.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@


<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.10" />
</ItemGroup>


<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<Description>Process the FluentEmail templates through UnDotNet.BootstrapEmail. Allows for simpler templates.</Description>
<AssemblyTitle>Fluent Email - Bootstrap</AssemblyTitle>
<Authors>John Campion</Authors>
Expand All @@ -24,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>

</Project>
25 changes: 6 additions & 19 deletions src/Renderers/FluentEmail.Liquid/FluentEmail.Liquid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fluid.Core" Version="2.30.0" />
<PackageReference Include="Fluid.Core" Version="2.31.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.10" />
<PackageReference Include="System.Text.Json" Version="10.0.10" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.21" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.10" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>

</Project>
14 changes: 3 additions & 11 deletions src/Renderers/FluentEmail.Razor/FluentEmail.Razor.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<Description>Generate emails using Razor templates. Anything you can do in ASP.NET is possible here. Uses the RazorLight project under the hood.</Description>
<AssemblyTitle>Fluent Email - Razor</AssemblyTitle>
<PackageTags>$(PackageTags);razor</PackageTags>
Expand All @@ -10,18 +11,9 @@
<Product>jcamp.$(AssemblyName)</Product>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="jcamp.RazorLight" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
Expand All @@ -33,7 +25,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@

<ItemGroup>
<PackageReference Include="Azure.Communication.Email" Version="1.1.0" />
<PackageReference Include="System.Text.Json" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>

</Project>
49 changes: 49 additions & 0 deletions src/Senders/FluentEmail.Graph/ClientAuthHandler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
using Azure.Core;
using Microsoft.Graph.Auth;
using Microsoft.Identity.Client;
using Microsoft.Kiota.Abstractions;
using Microsoft.Kiota.Abstractions.Authentication;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
using System.Threading.Tasks;

namespace FluentEmail.Graph
{
internal class ClientAuthHandler : TokenCredential
{
private readonly IConfidentialClientApplication _clientApp;

public ClientAuthHandler(string appId, string tenantId, string graphSecret)
{
var builder = ConfidentialClientApplicationBuilder
.Create(appId)
.WithTenantId(tenantId)
.WithClientSecret(graphSecret);

_clientApp = builder.Build();
}

public override async ValueTask<AccessToken> GetTokenAsync(TokenRequestContext requestContext, CancellationToken cancellationToken)
{
var result = await _clientApp
.AcquireTokenForClient(requestContext.Scopes)
.ExecuteAsync(cancellationToken)
.ConfigureAwait(false);

return new AccessToken(result.AccessToken, result.ExpiresOn);
}

public override AccessToken GetToken(TokenRequestContext requestContext, CancellationToken cancellationToken)
{
var result = _clientApp
.AcquireTokenForClient(requestContext.Scopes)
.ExecuteAsync(cancellationToken)
.GetAwaiter()
.GetResult();

return new AccessToken(result.AccessToken, result.ExpiresOn);
}
}
}
19 changes: 5 additions & 14 deletions src/Senders/FluentEmail.Graph/FluentEmail.Graph.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Graph" Version="4.54.0" />
<PackageReference Include="Microsoft.Graph" Version="6.2.0" />
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.5" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.78.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.87.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.Text.Json" Version="8.0.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="System.Text.Json" Version="9.0.10" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="System.Text.Json" Version="10.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.22.0" />
<PackageReference Include="System.Text.Json" Version="10.0.10" />
</ItemGroup>

<ItemGroup>
Expand All @@ -36,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.301" />
</ItemGroup>

</Project>
Loading