clean up

Author: kccarter76

Services/SubSonicTemplatingService/SubSonicTemplatingService.cs

@@ -82,14 +82,18 @@ private string TransformationHost_ResolveParameterValueEventHandler(object sende
 
         private string TransformationHost_ExpandAllVariablesEventHandler(object sender, Host.ExpandAllVariablesEventArgs args)
         {
+#pragma warning disable VSTHRD102 // Implement internal logic asynchronously
             return VsShell.ThreadHelper.JoinableTaskFactory.Run(async () =>
+#pragma warning restore VSTHRD102 // Implement internal logic asynchronously
                await ExpandAllVariablesAsync(args.FilePath)
            );
         }
 
         private string TransformationHost_ResolveAssemblyReferenceEventHandler(object sender, Host.ResolveAssemblyReferenceEventArgs args)
         {
+#pragma warning disable VSTHRD102 // Implement internal logic asynchronously
             return VsShell.ThreadHelper.JoinableTaskFactory.Run(async () =>
+#pragma warning restore VSTHRD102 // Implement internal logic asynchronously
                 await ResolveAssemblyReferenceAsync(args.AssemblyReference)
             );
         }

Services/SubSonicTemplatingService/TextTemplating.cs

@@ -559,7 +559,9 @@ private void StartTransformation(string filename, IProcessTransformationRunner r
 
                     foreach (var templateError in result.Errors)
                     {
-                        ThreadHelper.JoinableTaskFactory.RunAsync(async () => await LogErrorAsync(templateError.Message, templateError.Location, templateError.IsWarning));
+#pragma warning disable VSTHRD010
+                        ThreadHelper.JoinableTaskFactory.RunAsync(async () => await LogErrorAsync(templateError.Message, templateError.Location, templateError.IsWarning).ConfigureAwait(false));
+#pragma warning restore VSTHRD010
                     }
 
                     processOutput = result.TemplateOutput;

SubSonic.Core.VisualStudio.Common/SubSonic.Core.VisualStudio.Host/RemoteTransformationHost.cs

@@ -32,8 +32,6 @@ public class RemoteTransformationHost
         private readonly Dictionary<RuntimeKind, List<string>> referencePaths;
         private readonly Dictionary<string, string> parameters;
         private readonly Dictionary<string, KeyValuePair<string, string>> directiveProcessors;
-        
-        private readonly TemplateErrorCollection errors;
 
         [NonSerialized]
         private GetHostOptionEventHandler getHostOptionEventHandler;
@@ -117,7 +115,6 @@ public RemoteTransformationHost()
             includePaths = new List<string>();
             referencePaths = new Dictionary<RuntimeKind, List<string>>();
             directiveProcessors = new Dictionary<string, KeyValuePair<string, string>>();
-            errors = new TemplateErrorCollection();
         }
 
         public Dictionary<RuntimeKind, List<string>> ReferencePaths => referencePaths;
@@ -182,9 +179,10 @@ public void AddReferencePath(RuntimeKind runtime, string directoryPath)
 
         public override ITextTemplatingSession CreateSession()
         {
-            ITextTemplatingSession session = new TextTemplatingSession();
-
-            session[nameof(TemplateFile)] = TemplateFile;
+            ITextTemplatingSession session = new TextTemplatingSession
+            {
+                [nameof(TemplateFile)] = TemplateFile
+            };
 
             return session;
         }