Namespace collisions with Visual Studio SDK

Mono.TextTemplating.Roslyn/Mono.TextTemplating.Roslyn.csproj

@@ -27,15 +27,23 @@ To enable the in-process C# compiler, use the TemplatingEngine.UseInProcessCompi
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.6.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Mono.TextTemplating\Mono.TextTemplating.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.2.31" />
+  </ItemGroup>
 </Project>

Mono.TextTemplating.Tests/DummyHost.cs

@@ -27,7 +27,7 @@
 using System;
 using System.Collections.Generic;
 using System.CodeDom.Compiler;
-using Microsoft.VisualStudio.TextTemplating;
+using Mono.VisualStudio.TextTemplating;
 
 namespace Mono.TextTemplating.Tests
 {
@@ -37,11 +37,11 @@ public class DummyHost : ITextTemplatingEngineHost
 		public readonly Dictionary<string, string> Locations = new Dictionary<string, string> ();
 		public readonly Dictionary<string, string> Contents = new Dictionary<string, string> ();
 		public readonly Dictionary<string, object> HostOptions = new Dictionary<string, object> ();
-	 	List<string> standardAssemblyReferences = new List<string> ();
+	 	List<string> standardAssemblyReferences = new List<string> (new[] { typeof(TemplatingEngine).Assembly.Location });
 		List<string> standardImports = new List<string> ();
 		public readonly CompilerErrorCollection Errors = new CompilerErrorCollection ();
 		public readonly Dictionary<string, Type> DirectiveProcessors = new Dictionary<string, Type> ();
-
+		public readonly Dictionary<string, string> Parameters = new Dictionary<string, string> ();
 		public virtual object GetHostOption (string optionName)
 		{
 			object o;
@@ -68,7 +68,7 @@ public virtual AppDomain ProvideTemplatingAppDomain (string content)
 
 		public virtual string ResolveAssemblyReference (string assemblyReference)
 		{
-			throw new System.NotImplementedException();
+			return assemblyReference;
 		}
 
 		public virtual Type ResolveDirectiveProcessor (string processorName)
@@ -80,22 +80,24 @@ public virtual Type ResolveDirectiveProcessor (string processorName)
 
 		public virtual string ResolveParameterValue (string directiveId, string processorName, string parameterName)
 		{
-			throw new System.NotImplementedException();
+			return Parameters[parameterName];
 		}
 
 		public virtual string ResolvePath (string path)
 		{
 			throw new System.NotImplementedException();
 		}
-
+
+		string extension;
+
 		public virtual void SetFileExtension (string extension)
 		{
-			throw new System.NotImplementedException();
+			this.extension = extension;
 		}
 
 		public virtual void SetOutputEncoding (System.Text.Encoding encoding, bool fromOutputDirective)
 		{
-			throw new System.NotImplementedException();
+
 		}
 
 		public virtual IList<string> StandardAssemblyReferences {

Mono.TextTemplating.Tests/GenerationTests.cs

@@ -28,9 +28,10 @@
 using System.Collections.Generic;
 using System.IO;
 using NUnit.Framework;
-using Microsoft.VisualStudio.TextTemplating;
+using Mono.VisualStudio.TextTemplating;
 using System.Linq;
 using System.CodeDom.Compiler;
+using System.Reflection;
 
 namespace Mono.TextTemplating.Tests
 {
@@ -48,6 +49,60 @@ public void TemplateGeneratorTest ()
 			Assert.IsNull (gen.Errors.OfType<CompilerError> ().FirstOrDefault (), "ProcessTemplate");
 		}
 
+		[Test]
+		public void GenerateStaticPropertyForParameter ()
+		{
+			var engine = new TemplatingEngine ();
+
+			var host = new DummyHost ();
+
+			var output = engine.PreprocessTemplate (T4ParameterSample, host, "ParameterTestClass", "Testing", out string language, out string[] references);
+
+			foreach (CompilerError error in host.Errors) {
+				Console.Error.WriteLine (error.ErrorText);
+			}
+
+			Assert.IsTrue (output.Contains ("public static string TestParameter"));
+
+			Console.Out.WriteLine (output);
+		}
+
+		[Test]
+		[TestCase("some nonsense value")]
+		public void GenerateStaticPropertyForParameterCanInitilialize (string value)
+		{
+			var engine = new TemplatingEngine ();
+
+			var host = new DummyHost () {
+				TemplateFile = "test.tt"
+			};
+
+			host.Parameters.Add ("TestParameter", value);
+
+
+			var tt = engine.CompileTemplate (T4ParameterSample, host);
+
+			foreach (CompilerError error in host.Errors) {
+				Console.Error.WriteLine (error.ErrorText);
+			}
+
+			Type ttType = tt.textTransformation?.GetType ();
+
+			Assert.IsNotNull (ttType);
+
+			var initMethod = ttType.GetMethod ("Initialize");
+			var testAssignment = ttType.GetMethod ("TestAssignment");
+			var parameter = ttType.GetProperty ("TestParameter", BindingFlags.Public | BindingFlags.Static);
+
+			initMethod.Invoke (tt.textTransformation, null);
+
+			if (testAssignment.Invoke(tt.textTransformation, null) is bool success) {
+				Assert.IsTrue (success);
+			}
+
+			Assert.AreEqual (value, parameter.GetValue (null));
+		}
+
 		[Test]
 		public void ImportReferencesTest ()
 		{
@@ -105,6 +160,8 @@ public void GenerateWindowsNewlines ()
 			Generate (WinInput, WinOutput, "\r\n");
 		}
 
+
+
 		[Test]
 		public void DefaultLanguage ()
 		{
@@ -121,7 +178,7 @@ public void DefaultLanguage ()
 		void Generate (string input, string expectedOutput, string newline)
 		{
 			var host = new DummyHost ();
-			string nameSpaceName = "Microsoft.VisualStudio.TextTemplating4f504ca0";
+			string nameSpaceName = "Mono.VisualStudio.TextTemplating4f504ca0";
 			string code = GenerateCode (host, input, nameSpaceName, newline);
 			Assert.AreEqual (0, host.Errors.Count);
 
@@ -164,14 +221,28 @@ string GenerateCode (ITextTemplatingEngineHost host, string content, string name
 
 		#endregion
 
+		#region input strings
+		public const string T4ParameterSample =
+@"<#@ template hostspecific=""true"" language=""C#"" #>
+<#@ output extension="".cs"" #>
+<#@ parameter type=""System.String"" name=""TestParameter"" #>
+<#@ import namespace=""System"" #>
+using System;
+<#+
+public bool TestAssignment() {
+	return !string.IsNullOrEmpty(TestParameter);
+}
+#>";
+		#endregion
+
 		#region Expected output strings
 
 		public static string OutputSample1 =
 @"
-namespace Microsoft.VisualStudio.TextTemplating4f504ca0 {
+namespace Mono.VisualStudio.TextTemplating4f504ca0 {
 
 
-    public partial class GeneratedTextTransformation : global::Microsoft.VisualStudio.TextTemplating.TextTransformation {
+    public partial class GeneratedTextTransformation : global::Mono.VisualStudio.TextTemplating.TextTransformation {
 
 
         #line 9 """"
@@ -205,7 +276,7 @@ public override string TransformText() {
             #line hidden
 
             #line 7 """"
-            this.Write(global::Microsoft.VisualStudio.TextTemplating.ToStringHelper.ToStringWithCulture( bar ));
+            this.Write(global::Mono.VisualStudio.TextTemplating.ToStringHelper.ToStringWithCulture( bar ));
 
             #line default
             #line hidden

Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj

@@ -8,8 +8,15 @@
   <ItemGroup>
     <ProjectReference Include="..\Mono.TextTemplating.Roslyn\Mono.TextTemplating.Roslyn.csproj" />
     <ProjectReference Include="..\Mono.TextTemplating\Mono.TextTemplating.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.2.31" />
   </ItemGroup>
 </Project>

Mono.TextTemplating.Tests/TemplateEnginePreprocessTemplateTests.cs

@@ -29,7 +29,7 @@
 using System.Collections.Generic;
 using System.IO;
 using NUnit.Framework;
-using Microsoft.VisualStudio.TextTemplating;
+using Mono.VisualStudio.TextTemplating;
 
 namespace Mono.TextTemplating.Tests
 {

Mono.TextTemplating.Tests/TextTemplatingSessionTests.cs

@@ -1,4 +1,4 @@
-//
+//
 // TextTemplatingSessionTests.cs
 //
 // Author:
@@ -26,7 +26,7 @@
 
 using System;
 using System.Reflection;
-using Microsoft.VisualStudio.TextTemplating;
+using Mono.VisualStudio.TextTemplating;
 using NUnit.Framework;
 
 namespace Mono.TextTemplating.Tests

Mono.TextTemplating.sln

@@ -1,23 +1,24 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating", "Mono.TextTemplating\Mono.TextTemplating.csproj", "{A2364D6A-00EF-417C-80A6-815726C70032}"
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30320.27
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.TextTemplating", "Mono.TextTemplating\Mono.TextTemplating.csproj", "{A2364D6A-00EF-417C-80A6-815726C70032}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating.Tests", "Mono.TextTemplating.Tests\Mono.TextTemplating.Tests.csproj", "{CB590106-8331-4CBE-8131-B154E7BF79E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.TextTemplating.Tests", "Mono.TextTemplating.Tests\Mono.TextTemplating.Tests.csproj", "{CB590106-8331-4CBE-8131-B154E7BF79E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTransform", "TextTransform\TextTransform.csproj", "{D1D35409-C814-47F6-B038-B9B5BF0FE490}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextTransform", "TextTransform\TextTransform.csproj", "{D1D35409-C814-47F6-B038-B9B5BF0FE490}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EEE624A1-0ED3-4D57-96B4-5D1B22E72697}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-t4", "dotnet-t4\dotnet-t4.csproj", "{6AA924D8-7119-4593-9B56-11D17AC3578E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-t4", "dotnet-t4\dotnet-t4.csproj", "{6AA924D8-7119-4593-9B56-11D17AC3578E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-t4-project-tool", "dotnet-t4-project-tool\dotnet-t4-project-tool.csproj", "{114B7AEF-61DA-453A-9A84-6DDEA13460B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-t4-project-tool", "dotnet-t4-project-tool\dotnet-t4-project-tool.csproj", "{114B7AEF-61DA-453A-9A84-6DDEA13460B7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.TextTemplating.Roslyn", "Mono.TextTemplating.Roslyn\Mono.TextTemplating.Roslyn.csproj", "{8DB780A9-27C1-44B4-860F-50C4419FD349}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.TextTemplating.Roslyn", "Mono.TextTemplating.Roslyn\Mono.TextTemplating.Roslyn.csproj", "{8DB780A9-27C1-44B4-860F-50C4419FD349}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Mono.TextTemplating/Microsoft.VisualStudio.TextTemplating/Engine.cs

@@ -26,11 +26,13 @@
 
 using System;
 using Mono.TextTemplating;
+using Mono.VisualStudio.TextTemplating;
 
 namespace Microsoft.VisualStudio.TextTemplating
 {
-	[Obsolete ("Use Mono.TextTemplating.TemplatingEngine directly")]
-	public class Engine : ITextTemplatingEngine
+	[Obsolete ("Use Mono.TextTemplating.TemplatingEngine directly", true)]
+	public class Engine
+		: ITextTemplatingEngine
 	{
 		TemplatingEngine engine = new TemplatingEngine ();
 
@@ -44,7 +46,7 @@ public string PreprocessTemplate (string content, ITextTemplatingEngineHost host
 		{
 			return engine.PreprocessTemplate (content, host, className, classNamespace, out language, out references);
 		}
-		
+
 		public const string CacheAssembliesOptionString = "CacheAssemblies";
 	}
 }

Mono.TextTemplating/Mono.TextTemplating.CodeCompilation/AssemblyResolver.cs

@@ -42,7 +42,7 @@ IEnumerable<string> GetImplicitReferences ()
 			{
 				yield return "mscorlib.dll";
 				yield return "netstandard.dll";
-
+				
 				if (runtime.Kind == RuntimeKind.NetCore) {
 					yield return "System.Runtime.dll";
 					//because we're referencing the impl not the ref asms, we end up