Skip to content

Commit 468e10f

Browse files
lahmalahma
committed
Update directory layout and properties
1 parent 4b9740b commit 468e10f

File tree

24 files changed

+87
-163
lines changed

24 files changed

+87
-163
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,5 @@ ModelManifest.xml
242242
# FAKE - F# Make
243243
.fake/
244244
.vs
245+
.idea
246+

‎FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj

-19
This file was deleted.

‎FluentEmail.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7B3C8C77-C54A-4F9E-A241-676AC01E49BB}"
1515
ProjectSection(SolutionItems) = preProject
1616
README.markdown = README.markdown
17+
src\Directory.Build.props = src\Directory.Build.props
1718
EndProjectSection
1819
EndProject
1920
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Renderers", "Renderers", "{47CB89AC-9615-4FA8-90DE-2D849935C36D}"
@@ -48,9 +49,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.MailKit", "src\
4849
EndProject
4950
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.MailKit.Tests", "test\FluentEmail.MailKit.Tests\FluentEmail.MailKit.Tests.csproj", "{57718ED0-6B5D-419F-A5C5-1884BE3529A5}"
5051
EndProject
51-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.Graph", "FluentEmail.Graph\FluentEmail.Graph.csproj", "{0C7819AD-BC76-465D-9B2A-BE2DA75042F2}"
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.Graph", "src\Senders\FluentEmail.Graph\FluentEmail.Graph.csproj", "{0C7819AD-BC76-465D-9B2A-BE2DA75042F2}"
5253
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Graph.Tests", "FluentEmail.Graph.Tests\FluentEmail.Graph.Tests.csproj", "{A180EE2A-CD37-4762-8AC7-ADAC828FB4A0}"
54+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Graph.Tests", "test\FluentEmail.Graph.Tests\FluentEmail.Graph.Tests.csproj", "{A180EE2A-CD37-4762-8AC7-ADAC828FB4A0}"
5455
EndProject
5556
Global
5657
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/Directory.Build.props

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
5+
<Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
6+
<PackageTags>email;smtp;fluent;fluentemail</PackageTags>
7+
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
8+
<PackageIcon>fluentemail_logo_64x64.png</PackageIcon>
9+
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
10+
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
11+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12+
13+
<Version>2.8.0</Version>
14+
15+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
17+
<DebugSymbols>true</DebugSymbols>
18+
<IncludeSymbols>true</IncludeSymbols>
19+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
20+
<IsPackable>true</IsPackable>
21+
22+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
23+
<WarningsAsErrors>true</WarningsAsErrors>
24+
25+
<CLSCompliant>true</CLSCompliant>
26+
<ComVisible>false</ComVisible>
27+
28+
<AssetsDirectory>../../../assets</AssetsDirectory>
29+
30+
</PropertyGroup>
31+
32+
<ItemGroup>
33+
<None Include="$(AssetsDirectory)/fluentemail_logo_64x64.png" Pack="true" Visible="false" PackagePath=""/>
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all"/>
38+
</ItemGroup>
39+
40+
</Project>

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@
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 Fluent Email package here.</Description>
55
<AssemblyTitle>Fluent Email</AssemblyTitle>
6-
<Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.Core</AssemblyName>
8-
<PackageId>FluentEmail.Core</PackageId>
9-
<PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
146
<TargetFramework>netstandard2.0</TargetFramework>
15-
<Version>2.8.0</Version>
7+
<AssetsDirectory>../../assets</AssetsDirectory>
168
</PropertyGroup>
179

1810
<!--<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

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

+4-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@
33
<PropertyGroup>
44
<Description>Generate emails using Razor templates. Anything you can do in ASP.NET is possible here. Uses the RazorLight project under the hood.</Description>
55
<AssemblyTitle>Fluent Email - Razor</AssemblyTitle>
6-
<Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.Razor</AssemblyName>
8-
<PackageId>FluentEmail.Razor</PackageId>
9-
<PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
6+
<PackageTags>$(PackageTags);razor</PackageTags>
137
<TargetFramework>netstandard2.0</TargetFramework>
14-
<Version>2.8.0</Version>
15-
<AssemblyVersion>2.7.0.0</AssemblyVersion>
16-
<FileVersion>2.7.0.0</FileVersion>
8+
<AssetsDirectory>../../../assets</AssetsDirectory>
9+
<NoWarn>NU5104</NoWarn>
1710
</PropertyGroup>
1811

1912
<ItemGroup>
@@ -24,5 +17,5 @@
2417
<ItemGroup>
2518
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
2619
</ItemGroup>
27-
20+
2821
</Project>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NoWarn>NU5104</NoWarn>
56
</PropertyGroup>
67

78
<ItemGroup>
@@ -11,7 +12,7 @@
1112
</ItemGroup>
1213

1314
<ItemGroup>
14-
<ProjectReference Include="..\src\FluentEmail.Core\FluentEmail.Core.csproj" />
15+
<ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
1516
</ItemGroup>
1617

1718
</Project>

‎FluentEmail.Graph/FluentEmail.Graph.vbproj renamed to ‎src/Senders/FluentEmail.Graph/FluentEmail.Graph.vbproj

File renamed without changes.

‎FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs renamed to ‎src/Senders/FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs

File renamed without changes.

‎FluentEmail.Graph/GraphSender.cs renamed to ‎src/Senders/FluentEmail.Graph/GraphSender.cs

File renamed without changes.

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,9 @@
44
<Description>Send emails via MailKit. The SmtpClient has been deprecated and Microsoft recommends using MailKit instead.</Description>
55
<AssemblyTitle>Fluent Email - MailKit</AssemblyTitle>
66
<Authors>Luke Lowrey;Ben Cull;Matt Rutledge;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.MailKit</AssemblyName>
8-
<PackageId>FluentEmail.MailKit</PackageId>
9-
<PackageTags>email;razor;smtp;mailkit;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
7+
<PackageTags>$(PackageTags);mailkit</PackageTags>
148
<TargetFramework>netstandard2.0</TargetFramework>
159
<RootNamespace>FluentEmail.MailKitSmtp</RootNamespace>
16-
<Version>2.8.0</Version>
1710
</PropertyGroup>
1811

1912
<ItemGroup>

‎src/Senders/FluentEmail.Mailgun/FluentEmail.Mailgun.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,8 @@
33
<PropertyGroup>
44
<Description>Send emails via MailGun using their REST API</Description>
55
<AssemblyTitle>Fluent Email - MailGun</AssemblyTitle>
6-
<Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.Mailgun</AssemblyName>
8-
<PackageId>FluentEmail.Mailgun</PackageId>
9-
<PackageTags>email;razor;mailgun;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
6+
<PackageTags>$(PackageTags);mailgun</PackageTags>
147
<TargetFramework>netstandard2.0</TargetFramework>
15-
<Version>2.8.0</Version>
168
</PropertyGroup>
179

1810
<ItemGroup>

‎src/Senders/FluentEmail.Mailtrap/FluentEmail.Mailtrap.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,8 @@
44
<Description>Send emails to Mailtrap. Uses FluentEmail.Smtp for delivery.</Description>
55
<AssemblyTitle>Fluent Email - MailTrap</AssemblyTitle>
66
<Authors>Luke Lowrey;Ben Cull;Anthony Zigenbine;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.Mailtrap</AssemblyName>
8-
<PackageId>FluentEmail.Mailtrap</PackageId>
9-
<PackageTags>email;razor;smtp;fluent;fluentemail;mailtrap</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
7+
<PackageTags>$(PackageTags);mailtrap</PackageTags>
148
<TargetFramework>netstandard2.0</TargetFramework>
15-
<Version>2.8.0</Version>
169
</PropertyGroup>
1710

1811
<ItemGroup>

‎src/Senders/FluentEmail.SendGrid/FluentEmail.SendGrid.csproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55
<AssemblyTitle>Fluent Email - SendGrid</AssemblyTitle>
66
<Authors>Luke Lowrey;Ben Cull;Ricardo Santos;Github Contributors</Authors>
77
<AssemblyName>FluentEmail.SendGrid</AssemblyName>
8-
<PackageId>FluentEmail.SendGrid</PackageId>
9-
<PackageTags>email;razor;sendgrid;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
8+
<PackageTags>$(PackageTags);sendgrid</PackageTags>
149
<TargetFramework>netstandard2.0</TargetFramework>
15-
<Version>2.8.0</Version>
1610
</PropertyGroup>
1711

1812
<ItemGroup>

‎src/Senders/FluentEmail.Smtp/FluentEmail.Smtp.csproj

+1-8
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,8 @@
44
<Description>Now we're talking. Send emails via SMTP.</Description>
55
<AssemblyTitle>Fluent Email - SMTP</AssemblyTitle>
66
<Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
7-
<AssemblyName>FluentEmail.Smtp</AssemblyName>
8-
<PackageId>FluentEmail.Smtp</PackageId>
9-
<PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
10-
<PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
11-
<PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
12-
<RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
13-
7+
<PackageTags>$(PackageTags);smtp</PackageTags>
148
<TargetFramework>netstandard2.0</TargetFramework>
15-
<Version>2.8.0</Version>
169
</PropertyGroup>
1710

1811
<ItemGroup>

‎test/Directory.Build.props

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
<IsTestProject>true</IsTestProject>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
10+
<PackageReference Include="NUnit" Version="3.12.0" />
11+
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
16+
</ItemGroup>
17+
18+
</Project>

‎test/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Senders\FluentEmail.Graph\FluentEmail.Graph.csproj" />
9+
</ItemGroup>
10+
11+
</Project>

‎FluentEmail.Graph.Tests/GraphSenderTests.cs renamed to ‎test/FluentEmail.Graph.Tests/GraphSenderTests.cs

File renamed without changes.

‎test/FluentEmail.MailKit.Tests/FluentEmail.MailKit.Tests.csproj

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,12 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<IsTestProject>true</IsTestProject>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<ProjectReference Include="..\..\src\Senders\FluentEmail.MailKit\FluentEmail.MailKit.csproj" />
109
</ItemGroup>
11-
<ItemGroup>
12-
<PackageReference Include="NUnit" Version="3.12.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
18-
</ItemGroup>
10+
1911
<ItemGroup>
2012
<None Remove="logotest.png" />
2113
</ItemGroup>

‎test/FluentEmail.Mailgun.Tests/FluentEmail.Mailgun.Tests.csproj

-16
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<AssemblyName>FluentEmail.Mailgun.Tests</AssemblyName>
6-
<PackageId>FluentEmail.Mailgun.Tests</PackageId>
7-
<IsTestProject>true</IsTestProject>
85
</PropertyGroup>
96

107
<ItemGroup>
@@ -15,21 +12,8 @@
1512
<EmbeddedResource Include="logotest.png" />
1613
</ItemGroup>
1714

18-
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
20-
<PackageReference Include="NUnit" Version="3.12.0" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
</ItemGroup>
26-
2715
<ItemGroup>
2816
<ProjectReference Include="..\..\src\Senders\FluentEmail.Mailgun\FluentEmail.Mailgun.csproj" />
2917
</ItemGroup>
3018

31-
<ItemGroup>
32-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
33-
</ItemGroup>
34-
3519
</Project>

‎test/FluentEmail.Mailtrap.Tests/FluentEmail.Mailtrap.Tests.csproj

-13
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<IsTestProject>true</IsTestProject>
8-
<IsPackable>false</IsPackable>
95
</PropertyGroup>
106

117
<ItemGroup>
@@ -16,15 +12,6 @@
1612
<EmbeddedResource Include="logotest.png" />
1713
</ItemGroup>
1814

19-
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
21-
<PackageReference Include="NUnit" Version="3.12.0" />
22-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
23-
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25-
</PackageReference>
26-
</ItemGroup>
27-
2815
<ItemGroup>
2916
<ProjectReference Include="..\..\src\Senders\FluentEmail.Mailtrap\FluentEmail.Mailtrap.csproj" />
3017
</ItemGroup>

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

-11
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
6-
<AssemblyName>FluentEmail.Razor.Tests</AssemblyName>
7-
<PackageId>FluentEmail.Razor.Tests</PackageId>
8-
<IsTestProject>true</IsTestProject>
96
</PropertyGroup>
107

118
<ItemGroup>
@@ -26,14 +23,6 @@
2623
<ProjectReference Include="..\..\src\Renderers\FluentEmail.Razor\FluentEmail.Razor.csproj" />
2724
</ItemGroup>
2825

29-
<ItemGroup>
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
31-
<PackageReference Include="NUnit" Version="3.12.0" />
32-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
33-
<PrivateAssets>all</PrivateAssets>
34-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35-
</PackageReference>
36-
</ItemGroup>
3726

3827
<ItemGroup>
3928
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

0 commit comments

Comments
 (0)