Update directory layout and properties

lukencode · Oct 8, 2020 · 468e10f · 468e10f
1 parent 4b9740b
commit 468e10f
Show file tree

Hide file tree

Showing 24 changed files with 87 additions and 163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -242,3 +242,5 @@ ModelManifest.xml
 # FAKE - F# Make
 .fake/
 .vs
+.idea
+
diff --git a/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj b/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj
diff --git a/FluentEmail.sln b/FluentEmail.sln
@@ -14,6 +14,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7B3C8C77-C54A-4F9E-A241-676AC01E49BB}"
 	ProjectSection(SolutionItems) = preProject
 		README.markdown = README.markdown
+		src\Directory.Build.props = src\Directory.Build.props
 	EndProjectSection
 EndProject
 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\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.MailKit.Tests", "test\FluentEmail.MailKit.Tests\FluentEmail.MailKit.Tests.csproj", "{57718ED0-6B5D-419F-A5C5-1884BE3529A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.Graph", "FluentEmail.Graph\FluentEmail.Graph.csproj", "{0C7819AD-BC76-465D-9B2A-BE2DA75042F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentEmail.Graph", "src\Senders\FluentEmail.Graph\FluentEmail.Graph.csproj", "{0C7819AD-BC76-465D-9B2A-BE2DA75042F2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Graph.Tests", "FluentEmail.Graph.Tests\FluentEmail.Graph.Tests.csproj", "{A180EE2A-CD37-4762-8AC7-ADAC828FB4A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEmail.Graph.Tests", "test\FluentEmail.Graph.Tests\FluentEmail.Graph.Tests.csproj", "{A180EE2A-CD37-4762-8AC7-ADAC828FB4A0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,40 @@
+<Project>
+
+  <PropertyGroup>
+
+    <Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
+    <PackageTags>email;smtp;fluent;fluentemail</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
+    <PackageIcon>fluentemail_logo_64x64.png</PackageIcon>
+    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+
+    <Version>2.8.0</Version>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <DebugSymbols>true</DebugSymbols>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <IsPackable>true</IsPackable>
+
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsAsErrors>true</WarningsAsErrors>
+
+    <CLSCompliant>true</CLSCompliant>
+    <ComVisible>false</ComVisible>
+
+    <AssetsDirectory>../../../assets</AssetsDirectory>
+
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(AssetsDirectory)/fluentemail_logo_64x64.png" Pack="true" Visible="false" PackagePath=""/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all"/>
+  </ItemGroup>
+
+</Project>
diff --git a/src/FluentEmail.Core/FluentEmail.Core.csproj b/src/FluentEmail.Core/FluentEmail.Core.csproj
@@ -3,16 +3,8 @@
   <PropertyGroup>
     <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>
     <AssemblyTitle>Fluent Email</AssemblyTitle>
-    <Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.Core</AssemblyName>
-    <PackageId>FluentEmail.Core</PackageId>
-    <PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
+    <AssetsDirectory>../../assets</AssetsDirectory>
   </PropertyGroup>
 
   <!--<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">

diff --git a/src/Renderers/FluentEmail.Razor/FluentEmail.Razor.csproj b/src/Renderers/FluentEmail.Razor/FluentEmail.Razor.csproj
@@ -3,17 +3,10 @@
   <PropertyGroup>
     <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>
-    <Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.Razor</AssemblyName>
-    <PackageId>FluentEmail.Razor</PackageId>
-    <PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
+    <PackageTags>$(PackageTags);razor</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
-    <AssemblyVersion>2.7.0.0</AssemblyVersion>
-    <FileVersion>2.7.0.0</FileVersion>
+    <AssetsDirectory>../../../assets</AssetsDirectory>
+    <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,5 +17,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/FluentEmail.Graph/FluentEmail.Graph.csproj → ...luentEmail.Graph/FluentEmail.Graph.csproj b/FluentEmail.Graph/FluentEmail.Graph.csproj → ...luentEmail.Graph/FluentEmail.Graph.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\FluentEmail.Core\FluentEmail.Core.csproj" />
+    <ProjectReference Include="..\..\FluentEmail.Core\FluentEmail.Core.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/FluentEmail.Graph/FluentEmail.Graph.vbproj → ...luentEmail.Graph/FluentEmail.Graph.vbproj b/FluentEmail.Graph/FluentEmail.Graph.vbproj → ...luentEmail.Graph/FluentEmail.Graph.vbproj
diff --git a/...raph/FluentEmailGraphBuilderExtensions.cs → ...raph/FluentEmailGraphBuilderExtensions.cs b/...raph/FluentEmailGraphBuilderExtensions.cs → ...raph/FluentEmailGraphBuilderExtensions.cs
diff --git a/FluentEmail.Graph/GraphSender.cs → src/Senders/FluentEmail.Graph/GraphSender.cs b/FluentEmail.Graph/GraphSender.cs → src/Senders/FluentEmail.Graph/GraphSender.cs
diff --git a/src/Senders/FluentEmail.MailKit/FluentEmail.MailKit.csproj b/src/Senders/FluentEmail.MailKit/FluentEmail.MailKit.csproj
@@ -4,16 +4,9 @@
     <Description>Send emails via MailKit. The SmtpClient has been deprecated and Microsoft recommends using MailKit instead.</Description>
     <AssemblyTitle>Fluent Email - MailKit</AssemblyTitle>
     <Authors>Luke Lowrey;Ben Cull;Matt Rutledge;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.MailKit</AssemblyName>
-    <PackageId>FluentEmail.MailKit</PackageId>
-    <PackageTags>email;razor;smtp;mailkit;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
+    <PackageTags>$(PackageTags);mailkit</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>FluentEmail.MailKitSmtp</RootNamespace>
-    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Senders/FluentEmail.Mailgun/FluentEmail.Mailgun.csproj b/src/Senders/FluentEmail.Mailgun/FluentEmail.Mailgun.csproj
@@ -3,16 +3,8 @@
   <PropertyGroup>
     <Description>Send emails via MailGun using their REST API</Description>
     <AssemblyTitle>Fluent Email - MailGun</AssemblyTitle>
-    <Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.Mailgun</AssemblyName>
-    <PackageId>FluentEmail.Mailgun</PackageId>
-    <PackageTags>email;razor;mailgun;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
+    <PackageTags>$(PackageTags);mailgun</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Senders/FluentEmail.Mailtrap/FluentEmail.Mailtrap.csproj b/src/Senders/FluentEmail.Mailtrap/FluentEmail.Mailtrap.csproj
@@ -4,15 +4,8 @@
     <Description>Send emails to Mailtrap. Uses FluentEmail.Smtp for delivery.</Description>
     <AssemblyTitle>Fluent Email - MailTrap</AssemblyTitle>
     <Authors>Luke Lowrey;Ben Cull;Anthony Zigenbine;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.Mailtrap</AssemblyName>
-    <PackageId>FluentEmail.Mailtrap</PackageId>
-    <PackageTags>email;razor;smtp;fluent;fluentemail;mailtrap</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
+    <PackageTags>$(PackageTags);mailtrap</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Senders/FluentEmail.SendGrid/FluentEmail.SendGrid.csproj b/src/Senders/FluentEmail.SendGrid/FluentEmail.SendGrid.csproj
@@ -5,14 +5,8 @@
     <AssemblyTitle>Fluent Email - SendGrid</AssemblyTitle>
     <Authors>Luke Lowrey;Ben Cull;Ricardo Santos;Github Contributors</Authors>
     <AssemblyName>FluentEmail.SendGrid</AssemblyName>
-    <PackageId>FluentEmail.SendGrid</PackageId>
-    <PackageTags>email;razor;sendgrid;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
+    <PackageTags>$(PackageTags);sendgrid</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Senders/FluentEmail.Smtp/FluentEmail.Smtp.csproj b/src/Senders/FluentEmail.Smtp/FluentEmail.Smtp.csproj
@@ -4,15 +4,8 @@
     <Description>Now we're talking. Send emails via SMTP.</Description>
     <AssemblyTitle>Fluent Email - SMTP</AssemblyTitle>
     <Authors>Luke Lowrey;Ben Cull;Github Contributors</Authors>
-    <AssemblyName>FluentEmail.Smtp</AssemblyName>
-    <PackageId>FluentEmail.Smtp</PackageId>
-    <PackageTags>email;razor;smtp;fluent;fluentemail</PackageTags>
-    <PackageIconUrl>https://raw.githubusercontent.com/lukencode/FluentEmail/master/assets/fluentemail_logo_64x64.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/lukencode/FluentEmail</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/lukencode/FluentEmail</RepositoryUrl>
-
+    <PackageTags>$(PackageTags);smtp</PackageTags>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -0,0 +1,18 @@
+<Project>
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj b/test/FluentEmail.Graph.Tests/FluentEmail.Graph.Tests.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Senders\FluentEmail.Graph\FluentEmail.Graph.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/FluentEmail.Graph.Tests/GraphSenderTests.cs → ...uentEmail.Graph.Tests/GraphSenderTests.cs b/FluentEmail.Graph.Tests/GraphSenderTests.cs → ...uentEmail.Graph.Tests/GraphSenderTests.cs
diff --git a/test/FluentEmail.MailKit.Tests/FluentEmail.MailKit.Tests.csproj b/test/FluentEmail.MailKit.Tests/FluentEmail.MailKit.Tests.csproj
@@ -2,20 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Senders\FluentEmail.MailKit\FluentEmail.MailKit.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-  </ItemGroup>
+
   <ItemGroup>
     <None Remove="logotest.png" />
   </ItemGroup>

diff --git a/test/FluentEmail.Mailgun.Tests/FluentEmail.Mailgun.Tests.csproj b/test/FluentEmail.Mailgun.Tests/FluentEmail.Mailgun.Tests.csproj
@@ -2,9 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyName>FluentEmail.Mailgun.Tests</AssemblyName>
-    <PackageId>FluentEmail.Mailgun.Tests</PackageId>
-    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,21 +12,8 @@
     <EmbeddedResource Include="logotest.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Senders\FluentEmail.Mailgun\FluentEmail.Mailgun.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/FluentEmail.Mailtrap.Tests/FluentEmail.Mailtrap.Tests.csproj b/test/FluentEmail.Mailtrap.Tests/FluentEmail.Mailtrap.Tests.csproj
@@ -2,10 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsTestProject>true</IsTestProject>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,15 +12,6 @@
     <EmbeddedResource Include="logotest.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Senders\FluentEmail.Mailtrap\FluentEmail.Mailtrap.csproj" />
   </ItemGroup>

diff --git a/test/FluentEmail.Razor.Tests/FluentEmail.Razor.Tests.csproj b/test/FluentEmail.Razor.Tests/FluentEmail.Razor.Tests.csproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <AssemblyName>FluentEmail.Razor.Tests</AssemblyName>
-    <PackageId>FluentEmail.Razor.Tests</PackageId>
-    <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,14 +23,6 @@
     <ProjectReference Include="..\..\src\Renderers\FluentEmail.Razor\FluentEmail.Razor.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -242,3 +242,5 @@ ModelManifest.xml @@
     # FAKE - F# Make
     .fake/
     .vs
+    .idea