Revert MultipleOutputHelper.ttinclude to original from nuget.

* Move back to project root.
* Revert modifications (adding the using() pattern)
* Update usages

Author: angularsen

Src/UnitsNet/GeneratedCode/UnitClasses.tt

@@ -3,7 +3,7 @@
 <#@ import namespace="UnitsNet.Units" #>
 <#@ import namespace="UnitsNet.Attributes" #>
 <#@ import namespace="UnitsNet.Templating" #>
-<#@ include file="Includes\MultipleOutputHelper.ttinclude" once="true"#>
+<#@ include file="..\MultipleOutputHelper.ttinclude" once="true"#>
 <#@ output extension=".g.cs" #>
 <#
     var assembly = Assembly.GetAssembly(typeof (LengthUnit));
@@ -12,16 +12,17 @@
     var m = Manager.Create(Host, GenerationEnvironment);
     foreach (UnitClassInfo info in infos)
     {
+        m.StartNewFile(info.UnitClassName + ".g.cs");
         GenerateUnitClass(m, info.UnitClassName, info.UnitClassXmlDoc, info.BaseUnitName, info.BaseUnitPluralName, info.UnitEnumType.Name, info.OrderedUnits);
+        m.EndBlock();
     }
 
     m.Process(split: true);
 
 #><#+ 
     private void GenerateUnitClass(Manager manager, string className, string xmlDocSummary, string baseUnitName, string baseUnitPluralName, string unitEnumName, ICollection<UnitInfo> orderedClassUnits)
     {
-        using (manager.StartNewFile(className + ".g.cs"))
-        { 
+         
         List<UnitInfo> orderedClassUnitsExceptBaseUnit =
                 orderedClassUnits
                     .Where(val => val.SingularName != baseUnitName)
@@ -371,7 +372,6 @@ namespace UnitsNet
     }
 } 
 <#+
-        } // using
     } // GenerateUnitClass()
 #>
 <#+

Src/UnitsNet/GeneratedCode/Includes/MultipleOutputHelper.ttinclude renamed to Src/UnitsNet/MultipleOutputHelper.ttinclude

@@ -36,12 +36,10 @@ class Manager {
         return (host is IServiceProvider) ? new VSManager(host, template) : new Manager(host, template);
     }
 
-
-    public IDisposable StartNewFile(String name) {
+    public void StartNewFile(String name) {
         if (name == null)
             throw new ArgumentNullException("name");
         CurrentBlock = new Block { Name = name };
-        return new StartNewFileBlock(this);
     }
 
     public void StartFooter() {
@@ -154,7 +152,7 @@ class Manager {
             projectSyncAction = (IEnumerable<String> keepFileNames) => ProjectSync(templateProjectItem, keepFileNames);
         }
 
-        private void ProjectSync(EnvDTE.ProjectItem templateProjectItem, IEnumerable<String> keepFileNames) {
+        private static void ProjectSync(EnvDTE.ProjectItem templateProjectItem, IEnumerable<String> keepFileNames) {
             var keepFileNameSet = new HashSet<String>(keepFileNames);
             var projectFiles = new Dictionary<String, EnvDTE.ProjectItem>();
             var originalFilePrefix = Path.GetFileNameWithoutExtension(templateProjectItem.get_FileNames(0)) + ".";
@@ -169,18 +167,7 @@ class Manager {
             // Add missing files to the project
             foreach(String fileName in keepFileNameSet)
                 if (!projectFiles.ContainsKey(fileName))
-                {
-                    // Remove any "..\" in path when outputting to parent folder by getting full path.
-                    // Source: http://stackoverflow.com/a/4796339/134761
-                    string fileNameFullPath = Path.GetFullPath(new Uri(fileName).LocalPath);
-                    
-                    // Output as item in same folder as template file.
-                    //templateProjectItem.Collection.AddFromFile(fileNameFullPath);
-
-                    // Output as nested item under template file
-                    templateProjectItem.ProjectItems.AddFromFile(fileNameFullPath);
-                }
-                    
+                    templateProjectItem.ProjectItems.AddFromFile(fileName);
         }
 
         private void CheckoutFileIfRequired(String fileName) {
@@ -189,19 +176,4 @@ class Manager {
                 checkOutAction.EndInvoke(checkOutAction.BeginInvoke(fileName, null, null));
         }
     }
-    
-    private class StartNewFileBlock : IDisposable
-    {
-        private readonly Manager _manager;
-
-        public StartNewFileBlock(Manager manager)
-        {
-            _manager = manager;
-        }
-
-        public void Dispose()
-        {
-            _manager.EndBlock();
-        }
-    }
 } #>

Src/UnitsNet/UnitsNet.net35.csproj

@@ -123,7 +123,7 @@
     <Compile Include="Vector3.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="GeneratedCode\Includes\MultipleOutputHelper.ttinclude" />
+    <None Include="MultipleOutputHelper.ttinclude" />
     <None Include="GeneratedCode\UnitClasses.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>UnitClasses.g.cs</LastGenOutput>