[CodeGenerator] Fix MLNet.CLI build error. (#5546)

* upgrade to 3.1

* write inline data using invariantCulture

* fix mlnet build error

Author: LittleLittleCloud

src/Microsoft.ML.CodeGenerator/Templates/Console/ConsumeModel.cs

@@ -41,11 +41,12 @@ public class ConsumeModel
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath(""");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, """);
             this.Write(this.ToStringHelper.ToStringWithCulture(MLNetModelName));
             this.Write("\");\r\n");
 if(IsAzureImage || IsAzureObjectDetection){ 
-            this.Write(" \r\n        public static string OnnxModelPath = Path.GetFullPath(\"");
+            this.Write(" \r\n        public static string OnnxModelPath = Path.Combine(System.AppContext.Ba" +
+                    "seDirectory, \"");
             this.Write(this.ToStringHelper.ToStringWithCulture(OnnxModelName));
             this.Write("\");\r\n");
 } 

src/Microsoft.ML.CodeGenerator/Templates/Console/ConsumeModel.tt

@@ -23,9 +23,9 @@ namespace <#= Namespace #>.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("<#= MLNetModelName #>");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "<#= MLNetModelName #>");
 <#if(IsAzureImage || IsAzureObjectDetection){ #> 
-        public static string OnnxModelPath = Path.GetFullPath("<#= OnnxModelName #>");
+        public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "<#= OnnxModelName #>");
 <#} #>
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureCodeGeneratorTest.ConsumeModel.cs.approved.txt

@@ -14,7 +14,7 @@ namespace Test.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("\path\to\model");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "\path\to\model");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureImageCodeGeneratorTest.ConsumeModel.cs.approved.txt

@@ -14,9 +14,9 @@ namespace CodeGenTest.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("/path/to/model");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/model");
 
-        public static string OnnxModelPath = Path.GetFullPath("/path/to/onnxModel");
+        public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/onnxModel");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.AzureObjectDetectionCodeGeneratorTest.ConsumeModel.cs.approved.txt

@@ -14,9 +14,9 @@ namespace CodeGenTest.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("/path/to/model");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/model");
 
-        public static string OnnxModelPath = Path.GetFullPath("/path/to/onnxModel");
+        public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "/path/to/onnxModel");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsumeModelContentTest.approved.txt

@@ -18,7 +18,7 @@ namespace TestNamespace.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("x:\models\model.zip");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "x:\models\model.zip");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/ConsoleCodeGeneratorTests.Recommendation_GenerateModelProjectContents_VerifyConsumeModel.approved.txt

@@ -18,7 +18,7 @@ namespace TestNamespace.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("x:\models\model.zip");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "x:\models\model.zip");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/TemplateTest.TestConsumeModel_AzureImage.approved.txt

@@ -14,9 +14,9 @@ namespace Namespace.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");
 
-        public static string OnnxModelPath = Path.GetFullPath("onnx.onnx");
+        public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "onnx.onnx");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/TemplateTest.TestConsumeModel_AzureObjectDetection.approved.txt

@@ -14,9 +14,9 @@ namespace Namespace.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");
 
-        public static string OnnxModelPath = Path.GetFullPath("onnx.onnx");
+        public static string OnnxModelPath = Path.Combine(System.AppContext.BaseDirectory, "onnx.onnx");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app

test/Microsoft.ML.CodeGenerator.Tests/ApprovalTests/TemplateTest.TestConsumeModel_NotAzureImage_NotObjectDetection.approved.txt

@@ -14,7 +14,7 @@ namespace Namespace.Model
     {
         private static Lazy<PredictionEngine<ModelInput, ModelOutput>> PredictionEngine = new Lazy<PredictionEngine<ModelInput, ModelOutput>>(CreatePredictionEngine);
 
-        public static string MLNetModelPath = Path.GetFullPath("mlmodel.zip");
+        public static string MLNetModelPath = Path.Combine(System.AppContext.BaseDirectory, "mlmodel.zip");
 
         // For more info on consuming ML.NET models, visit https://aka.ms/mlnet-consume
         // Method for consuming model in your app