From 211de220255d707ad910a637d5bc873b7a47780d Mon Sep 17 00:00:00 2001 From: Srujan Saggam Date: Tue, 6 Aug 2019 11:15:17 -0700 Subject: [PATCH 1/3] bumped version --- build/BranchInfo.props | 2 +- src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj | 2 +- src/mlnet/Templates/Console/ModelProject.cs | 8 ++++---- src/mlnet/Templates/Console/ModelProject.tt | 8 ++++---- src/mlnet/Templates/Console/PredictProject.cs | 8 ++++---- src/mlnet/Templates/Console/PredictProject.tt | 8 ++++---- ...torTests.ConsoleAppProjectFileContentTest.approved.txt | 6 +++--- ...eneratorTests.ModelProjectFileContentTest.approved.txt | 8 ++++---- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index 0f0880500f..f8d7ee2394 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -28,7 +28,7 @@ 0 - 15 + 16 0 preview diff --git a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj index a224813e70..d05a302c5d 100644 --- a/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj +++ b/src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj @@ -7,7 +7,7 @@ - 1.2.0 + 1.3.1 diff --git a/src/mlnet/Templates/Console/ModelProject.cs b/src/mlnet/Templates/Console/ModelProject.cs index be2afa2ead..fd1bb7f12a 100644 --- a/src/mlnet/Templates/Console/ModelProject.cs +++ b/src/mlnet/Templates/Console/ModelProject.cs @@ -27,15 +27,15 @@ public virtual string TransformText() { this.Write("\r\n\r\n \r\n netc" + "oreapp2.1\r\n \r\n \r\n \r\n"); + "rence Include=\"Microsoft.ML\" Version=\"1.3.1\" />\r\n"); if (IncludeLightGBMPackage) { - this.Write(" \r\n"); + this.Write(" \r\n"); } if (IncludeMklComponentsPackage){ - this.Write(" \r\n"); + this.Write(" \r\n"); } if (IncludeFastTreePackage){ - this.Write(" \r\n"); + this.Write(" \r\n"); } this.Write(" \r\n\r\n \r\n \r\n PreserveNewest\r\n \r\n netcoreapp2.1 - + <# if (IncludeLightGBMPackage) { #> - + <#}#> <# if (IncludeMklComponentsPackage){ #> - + <#}#> <# if (IncludeFastTreePackage){ #> - + <#}#> diff --git a/src/mlnet/Templates/Console/PredictProject.cs b/src/mlnet/Templates/Console/PredictProject.cs index 527b1ae22d..f4ce27724e 100644 --- a/src/mlnet/Templates/Console/PredictProject.cs +++ b/src/mlnet/Templates/Console/PredictProject.cs @@ -28,16 +28,16 @@ public virtual string TransformText() { this.Write("\r\n\r\n \r\n Exe\r\n netcoreapp2.1\r\n \r\n \r\n \r\n \r\n \r\n"); if (IncludeLightGBMPackage){ - this.Write(" \r\n"); + this.Write(" \r\n"); } if (IncludeMklComponentsPackage){ - this.Write(" \r\n"); + this.Write(" \r\n"); } if (IncludeFastTreePackage){ - this.Write(" \r\n"); + this.Write(" \r\n"); } this.Write(" \r\n \r\n netcoreapp2.1 - + <# if (IncludeLightGBMPackage){ #> - + <#}#> <# if (IncludeMklComponentsPackage){ #> - + <#}#> <# if (IncludeFastTreePackage){ #> - + <#}#> diff --git a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt index d256f0bd62..520fe6baa3 100644 --- a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt +++ b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ConsoleAppProjectFileContentTest.approved.txt @@ -5,9 +5,9 @@ netcoreapp2.1 - - - + + + diff --git a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ModelProjectFileContentTest.approved.txt b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ModelProjectFileContentTest.approved.txt index e321e2daf5..9dca35e693 100644 --- a/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ModelProjectFileContentTest.approved.txt +++ b/test/mlnet.Tests/ApprovalTests/ConsoleCodeGeneratorTests.ModelProjectFileContentTest.approved.txt @@ -4,10 +4,10 @@ netcoreapp2.1 - - - - + + + + From 913f896f3dabc9c27c103c215b1312815d253da6 Mon Sep 17 00:00:00 2001 From: Srujan Saggam Date: Tue, 6 Aug 2019 11:18:17 -0700 Subject: [PATCH 2/3] change versions in nupkg --- pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj | 6 +++--- pkg/mlnet/mlnet.nupkgproj | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj index aa6059b114..6bcd10ba44 100644 --- a/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj +++ b/pkg/Microsoft.ML.AutoML/Microsoft.ML.AutoML.nupkgproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/pkg/mlnet/mlnet.nupkgproj b/pkg/mlnet/mlnet.nupkgproj index 98042f3401..14efa3925c 100644 --- a/pkg/mlnet/mlnet.nupkgproj +++ b/pkg/mlnet/mlnet.nupkgproj @@ -19,9 +19,9 @@           - - - + + +       From dd4c1d29b9dec2da675fed6841a2a138c461d38d Mon Sep 17 00:00:00 2001 From: Srujan Saggam Date: Tue, 6 Aug 2019 11:38:31 -0700 Subject: [PATCH 3/3] revert version bump in branch props --- build/BranchInfo.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/BranchInfo.props b/build/BranchInfo.props index f8d7ee2394..c1d6e8de5b 100644 --- a/build/BranchInfo.props +++ b/build/BranchInfo.props @@ -28,8 +28,8 @@ 0 - 16 - 0 + 15 + 1 preview