update based on comment

dotnet · Jul 30, 2019 · 5a705ba · 5a705ba
1 parent 53ccf43
commit 5a705ba
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 169 deletions.
diff --git a/Microsoft.ML.AutoML.sln b/Microsoft.ML.AutoML.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28902.138
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2050	
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.AutoML", "src\Microsoft.ML.AutoML\Microsoft.ML.AutoML.csproj", "{B3727729-3DF8-47E0-8710-9B41DAF55817}"
 EndProject

diff --git a/src/Microsoft.ML.AutoML/Assembly.cs b/src/Microsoft.ML.AutoML/Assembly.cs
@@ -8,4 +8,5 @@
 [assembly: InternalsVisibleTo("mlnet, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
 [assembly: InternalsVisibleTo("mlnet.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010015c01ae1f50e8cc09ba9eac9147cf8fd9fce2cfe9f8dce4f7301c4132ca9fb50ce8cbf1df4dc18dd4d210e4345c744ecb3365ed327efdbc52603faa5e21daa11234c8c4a73e51f03bf192544581ebe107adee3a34928e39d04e524a9ce729d5090bfd7dad9d10c722c0def9ccc08ff0a03790e48bcd1f9b6c476063e1966a1c4")]
 [assembly: InternalsVisibleTo("Benchmark, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
-[assembly: InternalsVisibleTo("Microsoft.ML.CodeGen, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("Microsoft.ML.CodeGen, PublicKey=00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb")]
+[assembly: InternalsVisibleTo("Microsoft.ML.ModelBuilder, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGenerator.cs b/src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGenerator.cs
@@ -9,7 +9,7 @@
 using System.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.ML.AutoML;
-using Microsoft.ML.CLI.Templates.Console;
+using Microsoft.ML.CodeGen.Templates.Console;
 using Microsoft.ML.CodeGen.Utilities;
 
 namespace Microsoft.ML.CodeGen.CSharp

diff --git a/src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGeneratorSettings.cs b/src/Microsoft.ML.CodeGen/CodeGenerator/CSharp/CodeGeneratorSettings.cs
@@ -1,4 +1,7 @@
-using Microsoft.ML.AutoML;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using Microsoft.ML.AutoML;
 
 namespace Microsoft.ML.CodeGen.CSharp
 {

diff --git a/src/Microsoft.ML.CodeGen/Microsoft.ML.CodeGen.csproj b/src/Microsoft.ML.CodeGen/Microsoft.ML.CodeGen.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <DelaySign>false</DelaySign>
-    <LangVersion>7.1</LangVersion>
+    <LangVersion>7.3</LangVersion>
+    <Version>0.15.0-preview-27912-1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,49 +21,29 @@
 
   <ItemGroup>
     <None Update="Templates\Console\ModelBuilder.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>ModelBuilder.cs</LastGenOutput>
     </None>
     <None Update="Templates\Console\ModelInputClass.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>ModelInputClass.cs</LastGenOutput>
     </None>
     <None Update="Templates\Console\ModelOutputClass.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>ModelOutputClass.cs</LastGenOutput>
     </None>
     <None Update="Templates\Console\ModelProject.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>ModelProject.cs</LastGenOutput>
     </None>
     <None Update="Templates\Console\PredictProgram.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>PredictProgram.cs</LastGenOutput>
     </None>
     <None Update="Templates\Console\PredictProject.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
+      <Generator>TextTemplatingFilePreprocessor</Generator>
       <LastGenOutput>PredictProject.cs</LastGenOutput>
     </None>
-    <None Update="Templates\Templates\Console\ModelBuilder.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
-    <None Update="Templates\Templates\Console\ModelInputClass.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>ModelInputClass.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Templates\Console\ModelOutputClass.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>ModelOutputClass.cs</LastGenOutput>
-    </None>
-    <None Update="Templates\Templates\Console\ModelProject.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
-    <None Update="Templates\Templates\Console\PredictProgram.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
-    <None Update="Templates\Templates\Console\PredictProject.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/ModelBuilder.cs b/src/Microsoft.ML.CodeGen/Templates/Console/ModelBuilder.cs
@@ -7,7 +7,7 @@
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/ModelInputClass.cs b/src/Microsoft.ML.CodeGen/Templates/Console/ModelInputClass.cs
@@ -1,13 +1,13 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;
@@ -17,7 +17,7 @@ namespace Microsoft.ML.CLI.Templates.Console
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModelInputClass : ModelInputClassBase
     {
         /// <summary>
@@ -53,7 +53,7 @@ namespace  ");
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class ModelInputClassBase
     {
         #region Fields

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/ModelOutputClass.cs b/src/Microsoft.ML.CodeGen/Templates/Console/ModelOutputClass.cs
@@ -1,13 +1,13 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;
@@ -17,7 +17,7 @@ namespace Microsoft.ML.CLI.Templates.Console
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModelOutputClass : ModelOutputClassBase
     {
         /// <summary>
@@ -66,7 +66,7 @@ namespace  ");
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class ModelOutputClassBase
     {
         #region Fields

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/ModelProject.cs b/src/Microsoft.ML.CodeGen/Templates/Console/ModelProject.cs
@@ -1,13 +1,13 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;
@@ -17,7 +17,7 @@ namespace Microsoft.ML.CLI.Templates.Console
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class ModelProject : ModelProjectBase
     {
         /// <summary>
@@ -52,7 +52,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class ModelProjectBase
     {
         #region Fields

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/PredictProgram.cs b/src/Microsoft.ML.CodeGen/Templates/Console/PredictProgram.cs
@@ -1,13 +1,13 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;
@@ -19,7 +19,7 @@ namespace Microsoft.ML.CLI.Templates.Console
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class PredictProgram : PredictProgramBase
     {
         /// <summary>
@@ -143,7 +143,7 @@ public static string GetAbsolutePath(string relativePath)
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class PredictProgramBase
     {
         #region Fields

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/PredictProgram.tt b/src/Microsoft.ML.CodeGen/Templates/Console/PredictProgram.tt
@@ -4,7 +4,7 @@
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Text.RegularExpressions" #>
 <#@ import namespace="System.Collections.Generic" #>
-<#@ import namespace="Microsoft.ML.CLI.Utilities" #>
+<#@ import namespace="Microsoft.ML.CodeGen.Utilities" #>
 //*****************************************************************************************
 //*                                                                                       *
 //* This is an auto-generated file by Microsoft ML.NET CLI (Command-Line Interface) tool. *

diff --git a/src/Microsoft.ML.CodeGen/Templates/Console/PredictProject.cs b/src/Microsoft.ML.CodeGen/Templates/Console/PredictProject.cs
@@ -1,13 +1,13 @@
 // ------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version: 15.0.0.0
+//     Runtime Version: 16.0.0.0
 //  
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 // ------------------------------------------------------------------------------
-namespace Microsoft.ML.CLI.Templates.Console
+namespace Microsoft.ML.CodeGen.Templates.Console
 {
     using System.Linq;
     using System.Text;
@@ -18,7 +18,7 @@ namespace Microsoft.ML.CLI.Templates.Console
     /// <summary>
     /// Class to produce the template output
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public partial class PredictProject : PredictProjectBase
     {
         /// <summary>
@@ -57,7 +57,7 @@ public virtual string TransformText()
     /// <summary>
     /// Base class for this transformation
     /// </summary>
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")]
     public class PredictProjectBase
     {
         #region Fields