minor cleanup, authors

adoconnection · adoconnection · commit a784732cc945 · 2020-05-25T09:22:36.000+03:00
diff --git a/RazorEngineCore/RazorEngine.cs b/RazorEngineCore/RazorEngine.cs
@@ -27,11 +27,9 @@ public RazorEngineCompiledTemplate<T> Compile<T>(string content, Action<RazorEng
             return new RazorEngineCompiledTemplate<T>(memoryStream);
         }
 
-        public Task<RazorEngineCompiledTemplate<T>> CompileAsync<T>(string content,
-            Action<RazorEngineCompilationOptionsBuilder> builderAction = null) 
-            where T : RazorEngineTemplateBase
+        public Task<RazorEngineCompiledTemplate<T>> CompileAsync<T>(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null) where T : RazorEngineTemplateBase
         {
-            return Task.Factory.StartNew(() => Compile<T>(content: content, builderAction: builderAction));
+            return Task.Factory.StartNew(() => this.Compile<T>(content: content, builderAction: builderAction));
         }
 
         public RazorEngineCompiledTemplate Compile(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null)
@@ -48,7 +46,7 @@ public RazorEngineCompiledTemplate Compile(string content, Action<RazorEngineCom
 
         public Task<RazorEngineCompiledTemplate> CompileAsync(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null)
         {
-            return Task.Factory.StartNew(() => Compile(content: content, builderAction: builderAction));
+            return Task.Factory.StartNew(() => this.Compile(content: content, builderAction: builderAction));
         }
         
         private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngineCompilationOptions options)
@@ -103,6 +101,7 @@ private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngine
             }
 
             memoryStream.Position = 0;
+
             return memoryStream;
         }
 
diff --git a/RazorEngineCore/RazorEngineCompiledTemplate.cs b/RazorEngineCore/RazorEngineCompiledTemplate.cs
@@ -38,7 +38,7 @@ public static async Task<RazorEngineCompiledTemplate> LoadFromFileAsync(string f
                 await fileStream.CopyToAsync(memoryStream);
             }
             
-            return new RazorEngineCompiledTemplate(assemblyByteCode: memoryStream);
+            return new RazorEngineCompiledTemplate(memoryStream);
         }
         
         public static RazorEngineCompiledTemplate LoadFromStream(Stream stream)
@@ -54,22 +54,10 @@ public static async Task<RazorEngineCompiledTemplate> LoadFromStreamAsync(Stream
             
             return new RazorEngineCompiledTemplate(memoryStream);
         }
-        
-        /*public static async Task<T> LoadFromStreamAsync<T>(Stream stream)
-            where T: RazorEngineCompiledTemplate, new()
-        {
-            MemoryStream memoryStream = new MemoryStream();
-            await stream.CopyToAsync(memoryStream);
-            memoryStream.Position = 0;
-
-            T instance = (T) Activator.CreateInstance<T>();
-                
-            return new T(memoryStream);
-        }*/
 
         public void SaveToStream(Stream stream)
         {
-            SaveToStreamAsync(stream).GetAwaiter().GetResult();
+            this.SaveToStreamAsync(stream).GetAwaiter().GetResult();
         }
 
         public Task SaveToStreamAsync(Stream stream)
@@ -79,7 +67,7 @@ public Task SaveToStreamAsync(Stream stream)
 
         public void SaveToFile(string fileName)
         {
-            SaveToFileAsync(fileName).GetAwaiter().GetResult();
+            this.SaveToFileAsync(fileName).GetAwaiter().GetResult();
         }
         
         public Task SaveToFileAsync(string fileName)
@@ -98,7 +86,7 @@ public Task SaveToFileAsync(string fileName)
         
         public string Run(object model = null)
         {
-            return RunAsync(model).GetAwaiter().GetResult();
+            return this.RunAsync(model).GetAwaiter().GetResult();
         }
         
         public async Task<string> RunAsync(object model = null)
@@ -108,9 +96,11 @@ public async Task<string> RunAsync(object model = null)
                 model = new AnonymousTypeWrapper(model);
             }
 
-            RazorEngineTemplateBase instance = (RazorEngineTemplateBase)Activator.CreateInstance(this.templateType);
+            RazorEngineTemplateBase instance = (RazorEngineTemplateBase) Activator.CreateInstance(this.templateType);
             instance.Model = model;
+
             await instance.ExecuteAsync();
+
             return instance.Result();
         }
     }
diff --git a/RazorEngineCore/RazorEngineCompiledTemplateT.cs b/RazorEngineCore/RazorEngineCompiledTemplateT.cs
@@ -38,10 +38,9 @@ public static async Task<RazorEngineCompiledTemplate<T>> LoadFromFileAsync(strin
                 await fileStream.CopyToAsync(memoryStream);
             }
             
-            return new RazorEngineCompiledTemplate<T>(assemblyByteCode: memoryStream);
+            return new RazorEngineCompiledTemplate<T>(memoryStream);
         }
 
-
         public static RazorEngineCompiledTemplate<T> LoadFromStream(Stream stream)
         {
             return LoadFromStreamAsync(stream).GetAwaiter().GetResult();
@@ -58,7 +57,7 @@ public static async Task<RazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Str
 
         public void SaveToStream(Stream stream)
         {
-            SaveToStreamAsync(stream).GetAwaiter().GetResult();
+            this.SaveToStreamAsync(stream).GetAwaiter().GetResult();
         }
 
         public Task SaveToStreamAsync(Stream stream)
@@ -68,7 +67,7 @@ public Task SaveToStreamAsync(Stream stream)
         
         public void SaveToFile(string fileName)
         {
-            SaveToFileAsync(fileName).GetAwaiter().GetResult();
+            this.SaveToFileAsync(fileName).GetAwaiter().GetResult();
         }
         
         public Task SaveToFileAsync(string fileName)
@@ -87,16 +86,17 @@ public Task SaveToFileAsync(string fileName)
 
         public string Run(Action<T> initializer)
         {
-            return RunAsync(initializer).GetAwaiter().GetResult();
+            return this.RunAsync(initializer).GetAwaiter().GetResult();
         }
         
         public async Task<string> RunAsync(Action<T> initializer)
         {
             T instance = (T) Activator.CreateInstance(this.templateType);
             initializer(instance);
+
             await instance.ExecuteAsync();
+
             return instance.Result();
         }
-        
     }
 }
diff --git a/RazorEngineCore/RazorEngineCore.csproj b/RazorEngineCore/RazorEngineCore.csproj
@@ -2,15 +2,15 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2020.3.3</Version>
-    <Authors>Alexander Selishchev</Authors>
+    <Version>2020.5.1</Version>
+    <Authors>Alexander Selishchev, Simon Mourier, William David Cossey</Authors>
     <PackageProjectUrl>https://github.com/adoconnection/RazorEngineCore</PackageProjectUrl>
-    <Description>ASP.NET Core 3.1.1 Razor Template Engine</Description>
-    <AssemblyVersion>2020.3.3.0</AssemblyVersion>
-    <FileVersion>2020.3.3.0</FileVersion>
+    <Description>ASP.NET Core 3.1 Razor Template Engine</Description>
+    <AssemblyVersion>2020.5.1.0</AssemblyVersion>
+    <FileVersion>2020.5.1.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="3.1.4" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,9 @@ public RazorEngineCompiledTemplate<T> Compile<T>(string content, Action<RazorEng`
`27`	`27`	`return new RazorEngineCompiledTemplate<T>(memoryStream);`
`28`	`28`	`}`
`29`	`29`
`30`		`- public Task<RazorEngineCompiledTemplate<T>> CompileAsync<T>(string content,`
`31`		`- Action<RazorEngineCompilationOptionsBuilder> builderAction = null)`
`32`		`- where T : RazorEngineTemplateBase`
	`30`	`+ public Task<RazorEngineCompiledTemplate<T>> CompileAsync<T>(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null) where T : RazorEngineTemplateBase`
`33`	`31`	`{`
`34`		`- return Task.Factory.StartNew(() => Compile<T>(content: content, builderAction: builderAction));`
	`32`	`+ return Task.Factory.StartNew(() => this.Compile<T>(content: content, builderAction: builderAction));`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`public RazorEngineCompiledTemplate Compile(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null)`
`@@ -48,7 +46,7 @@ public RazorEngineCompiledTemplate Compile(string content, Action<RazorEngineCom`
`48`	`46`
`49`	`47`	`public Task<RazorEngineCompiledTemplate> CompileAsync(string content, Action<RazorEngineCompilationOptionsBuilder> builderAction = null)`
`50`	`48`	`{`
`51`		`- return Task.Factory.StartNew(() => Compile(content: content, builderAction: builderAction));`
	`49`	`+ return Task.Factory.StartNew(() => this.Compile(content: content, builderAction: builderAction));`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngineCompilationOptions options)`
`@@ -103,6 +101,7 @@ private MemoryStream CreateAndCompileToStream(string templateSource, RazorEngine`
`103`	`101`	`}`
`104`	`102`
`105`	`103`	`memoryStream.Position = 0;`
	`104`	`+`
`106`	`105`	`return memoryStream;`
`107`	`106`	`}`
`108`	`107`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static async Task<RazorEngineCompiledTemplate> LoadFromFileAsync(string f`
`38`	`38`	`await fileStream.CopyToAsync(memoryStream);`
`39`	`39`	`}`
`40`	`40`
`41`		`- return new RazorEngineCompiledTemplate(assemblyByteCode: memoryStream);`
	`41`	`+ return new RazorEngineCompiledTemplate(memoryStream);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static RazorEngineCompiledTemplate LoadFromStream(Stream stream)`
`@@ -54,22 +54,10 @@ public static async Task<RazorEngineCompiledTemplate> LoadFromStreamAsync(Stream`
`54`	`54`
`55`	`55`	`return new RazorEngineCompiledTemplate(memoryStream);`
`56`	`56`	`}`
`57`		`-`
`58`		`- /*public static async Task<T> LoadFromStreamAsync<T>(Stream stream)`
`59`		`- where T: RazorEngineCompiledTemplate, new()`
`60`		`- {`
`61`		`- MemoryStream memoryStream = new MemoryStream();`
`62`		`- await stream.CopyToAsync(memoryStream);`
`63`		`- memoryStream.Position = 0;`
`64`		`-`
`65`		`- T instance = (T) Activator.CreateInstance<T>();`
`66`		`-`
`67`		`- return new T(memoryStream);`
`68`		`- }*/`
`69`	`57`
`70`	`58`	`public void SaveToStream(Stream stream)`
`71`	`59`	`{`
`72`		`- SaveToStreamAsync(stream).GetAwaiter().GetResult();`
	`60`	`+ this.SaveToStreamAsync(stream).GetAwaiter().GetResult();`
`73`	`61`	`}`
`74`	`62`
`75`	`63`	`public Task SaveToStreamAsync(Stream stream)`
`@@ -79,7 +67,7 @@ public Task SaveToStreamAsync(Stream stream)`
`79`	`67`
`80`	`68`	`public void SaveToFile(string fileName)`
`81`	`69`	`{`
`82`		`- SaveToFileAsync(fileName).GetAwaiter().GetResult();`
	`70`	`+ this.SaveToFileAsync(fileName).GetAwaiter().GetResult();`
`83`	`71`	`}`
`84`	`72`
`85`	`73`	`public Task SaveToFileAsync(string fileName)`
`@@ -98,7 +86,7 @@ public Task SaveToFileAsync(string fileName)`
`98`	`86`
`99`	`87`	`public string Run(object model = null)`
`100`	`88`	`{`
`101`		`- return RunAsync(model).GetAwaiter().GetResult();`
	`89`	`+ return this.RunAsync(model).GetAwaiter().GetResult();`
`102`	`90`	`}`
`103`	`91`
`104`	`92`	`public async Task<string> RunAsync(object model = null)`
`@@ -108,9 +96,11 @@ public async Task<string> RunAsync(object model = null)`
`108`	`96`	`model = new AnonymousTypeWrapper(model);`
`109`	`97`	`}`
`110`	`98`
`111`		`- RazorEngineTemplateBase instance = (RazorEngineTemplateBase)Activator.CreateInstance(this.templateType);`
	`99`	`+ RazorEngineTemplateBase instance = (RazorEngineTemplateBase) Activator.CreateInstance(this.templateType);`
`112`	`100`	`instance.Model = model;`
	`101`	`+`
`113`	`102`	`await instance.ExecuteAsync();`
	`103`	`+`
`114`	`104`	`return instance.Result();`
`115`	`105`	`}`
`116`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,9 @@ public static async Task<RazorEngineCompiledTemplate<T>> LoadFromFileAsync(strin`
`38`	`38`	`await fileStream.CopyToAsync(memoryStream);`
`39`	`39`	`}`
`40`	`40`
`41`		`- return new RazorEngineCompiledTemplate<T>(assemblyByteCode: memoryStream);`
	`41`	`+ return new RazorEngineCompiledTemplate<T>(memoryStream);`
`42`	`42`	`}`
`43`	`43`
`44`		`-`
`45`	`44`	`public static RazorEngineCompiledTemplate<T> LoadFromStream(Stream stream)`
`46`	`45`	`{`
`47`	`46`	`return LoadFromStreamAsync(stream).GetAwaiter().GetResult();`
`@@ -58,7 +57,7 @@ public static async Task<RazorEngineCompiledTemplate<T>> LoadFromStreamAsync(Str`
`58`	`57`
`59`	`58`	`public void SaveToStream(Stream stream)`
`60`	`59`	`{`
`61`		`- SaveToStreamAsync(stream).GetAwaiter().GetResult();`
	`60`	`+ this.SaveToStreamAsync(stream).GetAwaiter().GetResult();`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`public Task SaveToStreamAsync(Stream stream)`
`@@ -68,7 +67,7 @@ public Task SaveToStreamAsync(Stream stream)`
`68`	`67`
`69`	`68`	`public void SaveToFile(string fileName)`
`70`	`69`	`{`
`71`		`- SaveToFileAsync(fileName).GetAwaiter().GetResult();`
	`70`	`+ this.SaveToFileAsync(fileName).GetAwaiter().GetResult();`
`72`	`71`	`}`
`73`	`72`
`74`	`73`	`public Task SaveToFileAsync(string fileName)`
`@@ -87,16 +86,17 @@ public Task SaveToFileAsync(string fileName)`
`87`	`86`
`88`	`87`	`public string Run(Action<T> initializer)`
`89`	`88`	`{`
`90`		`- return RunAsync(initializer).GetAwaiter().GetResult();`
	`89`	`+ return this.RunAsync(initializer).GetAwaiter().GetResult();`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`public async Task<string> RunAsync(Action<T> initializer)`
`94`	`93`	`{`
`95`	`94`	`T instance = (T) Activator.CreateInstance(this.templateType);`
`96`	`95`	`initializer(instance);`
	`96`	`+`
`97`	`97`	`await instance.ExecuteAsync();`
	`98`	`+`
`98`	`99`	`return instance.Result();`
`99`	`100`	`}`
`100`		`-`
`101`	`101`	`}`
`102`	`102`	`}`