Refactored and added test project

framework/Volo.Abp.sln

@@ -281,6 +281,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectExtending.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TextTemplating", "src\Volo.Abp.TextTemplating\Volo.Abp.TextTemplating.csproj", "{9E53F91F-EACD-4191-A487-E727741F1311}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.TextTemplating.Tests", "test\Volo.Abp.TextTemplating.Tests\Volo.Abp.TextTemplating.Tests.csproj", "{251C7FD3-D313-4BCE-8068-352EC7EEA275}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -835,6 +837,10 @@ Global
 		{9E53F91F-EACD-4191-A487-E727741F1311}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E53F91F-EACD-4191-A487-E727741F1311}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E53F91F-EACD-4191-A487-E727741F1311}.Release|Any CPU.Build.0 = Release|Any CPU
+		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{251C7FD3-D313-4BCE-8068-352EC7EEA275}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -977,6 +983,7 @@ Global
 		{D1815C77-16D6-4F99-8814-69065CD89FB3} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{17F8CA89-D9A2-4863-A5BD-B8E4D2901FD5} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{9E53F91F-EACD-4191-A487-E727741F1311} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{251C7FD3-D313-4BCE-8068-352EC7EEA275} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/MultipleVirtualFilesEmailTemplateContributor.cs

@@ -46,7 +46,7 @@ namespace Volo.Abp.Emailing.Templates.VirtualFiles
                 {
                     return dictionaries;
                 }
-
+                
                 _templateDictionary = new Dictionary<string, string>();
                 foreach (var file in _virtualFileProvider.GetDirectoryContents(_virtualPath))
                 {

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/EmailTemplateDefinition.cs

@@ -1,36 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-namespace Volo.Abp.Emailing.Templates
-{
-    public class EmailTemplateDefinition
-    {
-        public const string DefaultLayoutPlaceHolder = "_";
-
-        public string Name { get; }
-
-        public bool IsLayout { get; }
-
-        public string Layout { get; set; }
-
-        public Type LocalizationResource { get; set; }
-
-        public EmailTemplateContributorList Contributors { get; }
-
-        public string DefaultCultureName { get; }
-
-        public bool SingleTemplateFile { get; }
-
-        public EmailTemplateDefinition([NotNull] string name, Type localizationResource = null, bool isLayout = false,
-            string layout = DefaultLayoutPlaceHolder, string defaultCultureName = null, bool singleTemplateFile = false)
-        {
-            Name = Check.NotNullOrWhiteSpace(name, nameof(name));
-            LocalizationResource = localizationResource;
-            Contributors = new EmailTemplateContributorList();
-            IsLayout = isLayout;
-            Layout = layout;
-            DefaultCultureName = defaultCultureName;
-            SingleTemplateFile = singleTemplateFile;
-        }
-    }
-}

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/EmailTemplateInitializationContext.cs

@@ -1,18 +0,0 @@
-using System;
-
-namespace Volo.Abp.Emailing.Templates
-{
-    public class EmailTemplateInitializationContext
-    {
-        public EmailTemplateDefinition EmailTemplateDefinition { get; }
-
-        public IServiceProvider ServiceProvider { get; }
-
-        public EmailTemplateInitializationContext(EmailTemplateDefinition emailTemplateDefinition,
-            IServiceProvider serviceProvider)
-        {
-            EmailTemplateDefinition = emailTemplateDefinition;
-            ServiceProvider = serviceProvider;
-        }
-    }
-}

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/IEmailTemplateContributor.cs

@@ -1,9 +0,0 @@
-namespace Volo.Abp.Emailing.Templates
-{
-    public interface IEmailTemplateContributor
-    {
-        void Initialize(EmailTemplateInitializationContext context);
-
-        string GetOrNull(string cultureName);
-    }
-}

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContributor.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.TextTemplating
+{
+    public interface ITemplateContributor
+    {
+        void Initialize(TemplateContributorInitializationContext context);
+
+        string GetOrNull(string cultureName);
+    }
+}

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorInitializationContext.cs

@@ -0,0 +1,22 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.TextTemplating
+{
+    public class TemplateContributorInitializationContext
+    {
+        [NotNull]
+        public TemplateDefinition TemplateDefinition { get; }
+
+        [NotNull]
+        public IServiceProvider ServiceProvider { get; }
+
+        public TemplateContributorInitializationContext(
+            TemplateDefinition templateDefinition,
+            IServiceProvider serviceProvider)
+        {
+            TemplateDefinition = Check.NotNull(templateDefinition, nameof(templateDefinition));
+            ServiceProvider = Check.NotNull(serviceProvider, nameof(serviceProvider));
+        }
+    }
+}

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/EmailTemplateContributorList.cs → framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorList.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Volo.Abp.Emailing.Templates
+namespace Volo.Abp.TextTemplating
 {
-    public class EmailTemplateContributorList : List<IEmailTemplateContributor>
+    public class TemplateContributorList : List<ITemplateContributor>
     {
         public string GetOrNull(string cultureName)
         {

framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs

@@ -0,0 +1,44 @@
+using System;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.TextTemplating
+{
+    public class TemplateDefinition
+    {
+        public const string DefaultLayoutPlaceHolder = "_";
+
+        [NotNull]
+        public string Name { get; }
+
+        public bool IsLayout { get; }
+
+        [CanBeNull]
+        public string Layout { get; set; }
+
+        public Type LocalizationResource { get; set; } //TODO: ???
+
+        public TemplateContributorList Contributors { get; }
+
+        [CanBeNull]
+        public string DefaultCultureName { get; }
+
+        public bool SingleTemplateFile { get; } //TODO: ???
+
+        public TemplateDefinition(
+            [NotNull] string name, 
+            Type localizationResource = null, 
+            bool isLayout = false,
+            string layout = DefaultLayoutPlaceHolder, 
+            string defaultCultureName = null, 
+            bool singleTemplateFile = false)
+        {
+            Name = Check.NotNullOrWhiteSpace(name, nameof(name));
+            LocalizationResource = localizationResource;
+            Contributors = new TemplateContributorList();
+            IsLayout = isLayout;
+            Layout = layout;
+            DefaultCultureName = defaultCultureName;
+            SingleTemplateFile = singleTemplateFile;
+        }
+    }
+}

framework/test/Volo.Abp.TextTemplating.Tests/Volo.Abp.TextTemplating.Tests.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\..\common.test.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.TextTemplating\Volo.Abp.TextTemplating.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+  </ItemGroup>
+
+</Project>

framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/AbpTextTemplatingTestModule.cs

@@ -0,0 +1,9 @@
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.TextTemplating
+{
+    public class AbpTextTemplatingTestModule : AbpModule
+    {
+
+    }
+}