1.5 mlnet update (#839)

* update ml.net versions * update proj to .net core 3.1 * shorten ccfraud project / file name Fixes Error MSB3491 * update image classification training solution to .net core 3 * update ranking sample to .net core 3.1 * Update BikeDemandForecasting.csproj * update to .net core 3.1 to fix errors * Update samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/assets/inputs/images/flower_photos_small_set/LICENSE.txt Co-authored-by: Justin Ormont <[email protected]> * Update samples/csharp/getting-started/DeepLearning_ImageClassification_Training/ImageClassification.Train/assets/inputs/images/flower_photos_small_set/LICENSE.txt Co-authored-by: Justin Ormont <[email protected]> * fix fsharp mnist project * fix automl taxi fare fsharp project * fix fsharp shampoo sales anomaly detection project * fix fsharp power anomaly detection project * Create PowerAnomalyDetection.sln * Update project name so web app will build * fix model explainability project * fix e2e matrix factorization by updating to .net core 3.1 * update scalable web api to 3.1 * update scalable web api integration to 3.1 * Update Startup.cs * Shorten length of project name to fix blazor app * add scisharp package for image classification model consumption * Create ImageClassification.Score.sln * Update samples to 1.5 (#841) * Updated and debuggined ONNX F# sample * Updates to DL TF Estimator * Updated OnnxObjectDetectionE2E * Updated AutoML samples * Fixed bugs in web app when upgraded to 3.1 * Updated version packages for DL binary * Updated to net core 3.1 * Fixed bugs in upgrade to 3.1 * Updated READMES * Delete imageClassifier.zip Co-authored-by: Justin Ormont <[email protected]> Co-authored-by: Luis Quintanilla <[email protected]>
dotnet · Aug 24, 2020 · 81cae9a · 81cae9a
1 parent 5308cda
commit 81cae9a
Show file tree

Hide file tree

Showing 378 changed files with 4,024 additions and 293 deletions.
diff --git a/samples/.ionide/symbolCache.db b/samples/.ionide/symbolCache.db
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <MicrosoftMLVersion>1.4.0</MicrosoftMLVersion>
-    <MicrosoftMLPreviewVersion>0.16.0</MicrosoftMLPreviewVersion>
+    <MicrosoftMLVersion>1.5.0</MicrosoftMLVersion>
+    <MicrosoftMLPreviewVersion>0.17.0</MicrosoftMLPreviewVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/...-Sales/SpikeDetectionE2EApp/SpikeDetection.ModelTrainer/SpikeDetectionModelTrainer.csproj b/...-Sales/SpikeDetectionE2EApp/SpikeDetection.ModelTrainer/SpikeDetectionModelTrainer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/..._ImageClassification_TensorFlow/README.md → ...Learning_ImageClassification_TF/README.md b/..._ImageClassification_TensorFlow/README.md → ...Learning_ImageClassification_TF/README.md
diff --git a/...trollers/ImageClassificationController.cs → ...trollers/ImageClassificationController.cs b/...trollers/ImageClassificationController.cs → ...trollers/ImageClassificationController.cs
@@ -9,10 +9,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ML;
-using TensorFlowImageClassification.ImageHelpers;
-using TensorFlowImageClassification.ML.DataModels;
+using TFClassification.ML.DataModels;
+using TFImageClassification.ImageHelpers;
+using TFImageClassification.ML.DataModels;
 
-namespace TensorFlowImageClassification.Controllers
+namespace TFImageClassification.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]

diff --git a/...ification/ImageHelpers/ImageValidation.cs → ...ification/ImageHelpers/ImageValidation.cs b/...ification/ImageHelpers/ImageValidation.cs → ...ification/ImageHelpers/ImageValidation.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Text;
 
-namespace TensorFlowImageClassification.ImageHelpers
+namespace TFImageClassification.ImageHelpers
 {
     public static class ImageValidationExtensions
     {

diff --git a/...ification/ML/DataModels/ImageInputData.cs → ...ification/ML/DataModels/ImageInputData.cs b/...ification/ML/DataModels/ImageInputData.cs → ...ification/ML/DataModels/ImageInputData.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Linq;
 
-namespace TensorFlowImageClassification.ML.DataModels
+namespace TFImageClassification.ML.DataModels
 {
     public class ImageInputData
     {

diff --git a/...on/ML/DataModels/ImageLabelPredictions.cs → ...on/ML/DataModels/ImageLabelPredictions.cs b/...on/ML/DataModels/ImageLabelPredictions.cs → ...on/ML/DataModels/ImageLabelPredictions.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.ML.Data;
 
-namespace TensorFlowImageClassification.ML.DataModels
+namespace TFClassification.ML.DataModels
 {
     public class ImageLabelPredictions
     {

diff --git a/...els/ImagePredictedLabelWithProbability.cs → ...els/ImagePredictedLabelWithProbability.cs b/...els/ImagePredictedLabelWithProbability.cs → ...els/ImagePredictedLabelWithProbability.cs
@@ -1,11 +1,11 @@
 
-namespace TensorFlowImageClassification.ML.DataModels
+namespace TFClassification.ML.DataModels
 {
     public class ImagePredictedLabelWithProbability
     {
         public string ImageId;
 
-        public string PredictedLabel;
+        public string PredictedLabel { get; set; }
         public float Probability { get; set; }
 
         public long PredictionExecutionTime;

diff --git a/...eClassification/ML/InMemoryModelLoader.cs → ...eClassification/ML/InMemoryModelLoader.cs b/...eClassification/ML/InMemoryModelLoader.cs → ...eClassification/ML/InMemoryModelLoader.cs
@@ -3,7 +3,7 @@
 using Microsoft.ML;
 using System.Threading;
 
-namespace TensorFlowImageClassification.ML
+namespace TFClassification.ML
 {
     public class InMemoryModelLoader : ModelLoader
     {

diff --git a/...ssification/ML/TensorFlowModel/labels.txt → ...ssification/ML/TensorFlowModel/labels.txt b/...ssification/ML/TensorFlowModel/labels.txt → ...ssification/ML/TensorFlowModel/labels.txt
diff --git a/...lassification/ML/TensorFlowModel/model.pb → ...lassification/ML/TensorFlowModel/model.pb b/...lassification/ML/TensorFlowModel/model.pb → ...lassification/ML/TensorFlowModel/model.pb
diff --git a/...ication/ML/TensorFlowModelConfigurator.cs → ...ication/ML/TensorFlowModelConfigurator.cs b/...ication/ML/TensorFlowModelConfigurator.cs → ...ication/ML/TensorFlowModelConfigurator.cs
@@ -1,9 +1,9 @@
 using Microsoft.ML;
 using System.Collections.Generic;
 using System.Linq;
-using TensorFlowImageClassification.ML.DataModels;
+using TFImageClassification.ML.DataModels;
 
-namespace TensorFlowImageClassification.ML
+namespace TFImageClassification.ML
 {
     public class TensorFlowModelConfigurator
     {

diff --git a/...lowImageClassification/Pages/Error.cshtml → .../TFImageClassification/Pages/Error.cshtml b/...lowImageClassification/Pages/Error.cshtml → .../TFImageClassification/Pages/Error.cshtml
diff --git a/...ImageClassification/Pages/Error.cshtml.cs → ...ImageClassification/Pages/Error.cshtml.cs b/...ImageClassification/Pages/Error.cshtml.cs → ...ImageClassification/Pages/Error.cshtml.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace TensorFlowImageClassification.Pages
+namespace TFImageClassification.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel

diff --git a/...lowImageClassification/Pages/Index.cshtml → .../TFImageClassification/Pages/Index.cshtml b/...lowImageClassification/Pages/Index.cshtml → .../TFImageClassification/Pages/Index.cshtml
diff --git a/...ImageClassification/Pages/Index.cshtml.cs → ...ImageClassification/Pages/Index.cshtml.cs b/...ImageClassification/Pages/Index.cshtml.cs → ...ImageClassification/Pages/Index.cshtml.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace TensorFlowImageClassification.Pages
+namespace TFImageClassification.Pages
 {
     public class IndexModel : PageModel
     {

diff --git a/...wImageClassification/Pages/Privacy.cshtml → ...FImageClassification/Pages/Privacy.cshtml b/...wImageClassification/Pages/Privacy.cshtml → ...FImageClassification/Pages/Privacy.cshtml
diff --git a/...ageClassification/Pages/Privacy.cshtml.cs → ...ageClassification/Pages/Privacy.cshtml.cs b/...ageClassification/Pages/Privacy.cshtml.cs → ...ageClassification/Pages/Privacy.cshtml.cs
@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace TensorFlowImageClassification.Pages
+namespace TFImageClassification.Pages
 {
     public class PrivacyModel : PageModel
     {

diff --git a/...Pages/Shared/_CookieConsentPartial.cshtml → ...Pages/Shared/_CookieConsentPartial.cshtml b/...Pages/Shared/_CookieConsentPartial.cshtml → ...Pages/Shared/_CookieConsentPartial.cshtml
diff --git a/...lassification/Pages/Shared/_Layout.cshtml → ...lassification/Pages/Shared/_Layout.cshtml b/...lassification/Pages/Shared/_Layout.cshtml → ...lassification/Pages/Shared/_Layout.cshtml
diff --git a/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml b/...s/Shared/_ValidationScriptsPartial.cshtml → ...s/Shared/_ValidationScriptsPartial.cshtml
diff --git a/...-apps/DeepLearning_ImageClassification_TF/TFImageClassification/Pages/_ViewImports.cshtml b/...-apps/DeepLearning_ImageClassification_TF/TFImageClassification/Pages/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using TFImageClassification
+@namespace TFImageClassification.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/...ageClassification/Pages/_ViewStart.cshtml → ...ageClassification/Pages/_ViewStart.cshtml b/...ageClassification/Pages/_ViewStart.cshtml → ...ageClassification/Pages/_ViewStart.cshtml
diff --git a/.../TensorFlowImageClassification/Program.cs → ...ation_TF/TFImageClassification/Program.cs b/.../TensorFlowImageClassification/Program.cs → ...ation_TF/TFImageClassification/Program.cs
@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace TensorFlowImageClassification
+namespace TFImageClassification
 {
     public class Program
     {

diff --git a/.../TensorFlowImageClassification/Startup.cs → ...ation_TF/TFImageClassification/Startup.cs b/.../TensorFlowImageClassification/Startup.cs → ...ation_TF/TFImageClassification/Startup.cs
@@ -2,15 +2,17 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.ML;
+using Microsoft.Extensions.Hosting;
 using Microsoft.ML;
-using TensorFlowImageClassification.ML;
-using TensorFlowImageClassification.ML.DataModels;
+using TFImageClassification.ML;
+using TFImageClassification.ML.DataModels;
+using TFClassification.ML.DataModels;
+using TFClassification.ML;
 
-namespace TensorFlowImageClassification
+namespace TFImageClassification
 {
     public class Startup
     {
@@ -41,7 +43,8 @@ public void ConfigureServices(IServiceCollection services)
                 options.MinimumSameSitePolicy = SameSiteMode.None;
             });
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllers();
+            services.AddRazorPages();
 
             /////////////////////////////////////////////////////////////////////////////
             // Register the PredictionEnginePool as a service in the IoC container for DI.
@@ -55,7 +58,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -72,7 +75,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseStaticFiles();
             app.UseCookiePolicy();
 
-            app.UseMvc();
+            app.UseRouting();
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+                endpoints.MapRazorPages();
+            });
         }
 
         public static string GetAbsolutePath(string relativePath)

diff --git a/...tion/TensorFlowImageClassification.csproj → ...assification/TFImageClassification.csproj b/...tion/TensorFlowImageClassification.csproj → ...assification/TFImageClassification.csproj
@@ -1,20 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="Microsoft.Extensions.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.TensorFlow" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="1.15.0" />
+    <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...on/TestImages/Green-Office-Chair-Test.jpg → ...on/TestImages/Green-Office-Chair-Test.jpg b/...on/TestImages/Green-Office-Chair-Test.jpg → ...on/TestImages/Green-Office-Chair-Test.jpg
diff --git a/...on/TestImages/High-Office-Metal-Chair.jpg → ...on/TestImages/High-Office-Metal-Chair.jpg b/...on/TestImages/High-Office-Metal-Chair.jpg → ...on/TestImages/High-Office-Metal-Chair.jpg
diff --git a/...rFlowImageClassification/appsettings.json → ...TF/TFImageClassification/appsettings.json b/...rFlowImageClassification/appsettings.json → ...TF/TFImageClassification/appsettings.json
diff --git a/...wImageClassification/wwwroot/css/site.css → ...FImageClassification/wwwroot/css/site.css b/...wImageClassification/wwwroot/css/site.css → ...FImageClassification/wwwroot/css/site.css
diff --git a/...owImageClassification/wwwroot/favicon.ico → ...TFImageClassification/wwwroot/favicon.ico b/...owImageClassification/wwwroot/favicon.ico → ...TFImageClassification/wwwroot/favicon.ico
diff --git a/...lowImageClassification/wwwroot/js/site.js → .../TFImageClassification/wwwroot/js/site.js b/...lowImageClassification/wwwroot/js/site.js → .../TFImageClassification/wwwroot/js/site.js
diff --git a/...wImageClassification/wwwroot/js/upload.js → ...FImageClassification/wwwroot/js/upload.js b/...wImageClassification/wwwroot/js/upload.js → ...FImageClassification/wwwroot/js/upload.js
diff --git a/...ssification/wwwroot/lib/bootstrap/LICENSE → ...ssification/wwwroot/lib/bootstrap/LICENSE b/...ssification/wwwroot/lib/bootstrap/LICENSE → ...ssification/wwwroot/lib/bootstrap/LICENSE
diff --git a/...lib/bootstrap/dist/css/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css b/...lib/bootstrap/dist/css/bootstrap-grid.css → ...lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/...bootstrap/dist/css/bootstrap-grid.css.map → ...bootstrap/dist/css/bootstrap-grid.css.map b/...bootstrap/dist/css/bootstrap-grid.css.map → ...bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/...bootstrap/dist/css/bootstrap-grid.min.css → ...bootstrap/dist/css/bootstrap-grid.min.css b/...bootstrap/dist/css/bootstrap-grid.min.css → ...bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/...strap/dist/css/bootstrap-grid.min.css.map → ...strap/dist/css/bootstrap-grid.min.css.map b/...strap/dist/css/bootstrap-grid.min.css.map → ...strap/dist/css/bootstrap-grid.min.css.map
diff --git a/...b/bootstrap/dist/css/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css b/...b/bootstrap/dist/css/bootstrap-reboot.css → ...b/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/...otstrap/dist/css/bootstrap-reboot.css.map → ...otstrap/dist/css/bootstrap-reboot.css.map b/...otstrap/dist/css/bootstrap-reboot.css.map → ...otstrap/dist/css/bootstrap-reboot.css.map
diff --git a/...otstrap/dist/css/bootstrap-reboot.min.css → ...otstrap/dist/css/bootstrap-reboot.min.css b/...otstrap/dist/css/bootstrap-reboot.min.css → ...otstrap/dist/css/bootstrap-reboot.min.css
diff --git a/...rap/dist/css/bootstrap-reboot.min.css.map → ...rap/dist/css/bootstrap-reboot.min.css.map b/...rap/dist/css/bootstrap-reboot.min.css.map → ...rap/dist/css/bootstrap-reboot.min.css.map
diff --git a/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css b/...root/lib/bootstrap/dist/css/bootstrap.css → ...root/lib/bootstrap/dist/css/bootstrap.css
diff --git a/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map b/.../lib/bootstrap/dist/css/bootstrap.css.map → .../lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css b/.../lib/bootstrap/dist/css/bootstrap.min.css → .../lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map b/.../bootstrap/dist/css/bootstrap.min.css.map → .../bootstrap/dist/css/bootstrap.min.css.map
diff --git a/...lib/bootstrap/dist/js/bootstrap.bundle.js → ...lib/bootstrap/dist/js/bootstrap.bundle.js b/...lib/bootstrap/dist/js/bootstrap.bundle.js → ...lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/...bootstrap/dist/js/bootstrap.bundle.js.map → ...bootstrap/dist/js/bootstrap.bundle.js.map b/...bootstrap/dist/js/bootstrap.bundle.js.map → ...bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/...bootstrap/dist/js/bootstrap.bundle.min.js → ...bootstrap/dist/js/bootstrap.bundle.min.js b/...bootstrap/dist/js/bootstrap.bundle.min.js → ...bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/...strap/dist/js/bootstrap.bundle.min.js.map → ...strap/dist/js/bootstrap.bundle.min.js.map b/...strap/dist/js/bootstrap.bundle.min.js.map → ...strap/dist/js/bootstrap.bundle.min.js.map
diff --git a/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js b/...wwroot/lib/bootstrap/dist/js/bootstrap.js → ...wwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.js.map → ...ot/lib/bootstrap/dist/js/bootstrap.js.map b/...ot/lib/bootstrap/dist/js/bootstrap.js.map → ...ot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js b/...ot/lib/bootstrap/dist/js/bootstrap.min.js → ...ot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/...ib/bootstrap/dist/js/bootstrap.min.js.map → ...ib/bootstrap/dist/js/bootstrap.min.js.map b/...ib/bootstrap/dist/js/bootstrap.min.js.map → ...ib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt b/...jquery-validation-unobtrusive/LICENSE.txt → ...jquery-validation-unobtrusive/LICENSE.txt
diff --git a/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js b/...nobtrusive/jquery.validate.unobtrusive.js → ...nobtrusive/jquery.validate.unobtrusive.js
diff --git a/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js b/...rusive/jquery.validate.unobtrusive.min.js → ...rusive/jquery.validate.unobtrusive.min.js
diff --git a/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md b/.../wwwroot/lib/jquery-validation/LICENSE.md → .../wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js b/...ery-validation/dist/additional-methods.js → ...ery-validation/dist/additional-methods.js
diff --git a/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js b/...validation/dist/additional-methods.min.js → ...validation/dist/additional-methods.min.js
diff --git a/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js b/...jquery-validation/dist/jquery.validate.js → ...jquery-validation/dist/jquery.validate.js
diff --git a/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js b/...ry-validation/dist/jquery.validate.min.js → ...ry-validation/dist/jquery.validate.min.js
diff --git a/...sification/wwwroot/lib/jquery/LICENSE.txt → ...sification/wwwroot/lib/jquery/LICENSE.txt b/...sification/wwwroot/lib/jquery/LICENSE.txt → ...sification/wwwroot/lib/jquery/LICENSE.txt
diff --git a/...ication/wwwroot/lib/jquery/dist/jquery.js → ...ication/wwwroot/lib/jquery/dist/jquery.js b/...ication/wwwroot/lib/jquery/dist/jquery.js → ...ication/wwwroot/lib/jquery/dist/jquery.js
diff --git a/...ion/wwwroot/lib/jquery/dist/jquery.min.js → ...ion/wwwroot/lib/jquery/dist/jquery.min.js b/...ion/wwwroot/lib/jquery/dist/jquery.min.js → ...ion/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/...on/wwwroot/lib/jquery/dist/jquery.min.map → ...on/wwwroot/lib/jquery/dist/jquery.min.map b/...on/wwwroot/lib/jquery/dist/jquery.min.map → ...on/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/...sorFlow/TensorFlowImageClassification.sln → ...tion_TF/TensorFlowImageClassification.sln b/...sorFlow/TensorFlowImageClassification.sln → ...tion_TF/TensorFlowImageClassification.sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TensorFlowImageClassification", "TensorFlowImageClassification\TensorFlowImageClassification.csproj", "{3B0E6181-5C60-45D7-A722-A4AC13103DC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TFImageClassification", "TFImageClassification\TFImageClassification.csproj", "{A1F1D6DD-7AA0-4378-B9CB-CDFB0B460E93}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B0E6181-5C60-45D7-A722-A4AC13103DC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B0E6181-5C60-45D7-A722-A4AC13103DC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B0E6181-5C60-45D7-A722-A4AC13103DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B0E6181-5C60-45D7-A722-A4AC13103DC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1F1D6DD-7AA0-4378-B9CB-CDFB0B460E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1F1D6DD-7AA0-4378-B9CB-CDFB0B460E93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1F1D6DD-7AA0-4378-B9CB-CDFB0B460E93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1F1D6DD-7AA0-4378-B9CB-CDFB0B460E93}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...TensorFlow/docs/scenario-architecture.png → ...ication_TF/docs/scenario-architecture.png b/...TensorFlow/docs/scenario-architecture.png → ...ication_TF/docs/scenario-architecture.png
diff --git a/...ng_ImageClassification_TensorFlow/TensorFlowImageClassification/Pages/_ViewImports.cshtml b/...ng_ImageClassification_TensorFlow/TensorFlowImageClassification/Pages/_ViewImports.cshtml
diff --git a/samples/csharp/end-to-end-apps/Model-Explainability/TaxiFarePrediction.Test/Program.cs b/samples/csharp/end-to-end-apps/Model-Explainability/TaxiFarePrediction.Test/Program.cs
@@ -7,7 +7,7 @@ namespace TaxiFareRegression
 {
     internal static class Program
     {
-        private static string BaseRelativePath = @"../../../../TaxiFarePrediction";
+        private static string BaseRelativePath = @"../../../../TaxiFarePrediction/TaxiFarePredictionConsoleApp";
         private static string BaseDataPath = Path.Combine(Path.GetFullPath(BaseRelativePath), "inputs");
         private static string TestDataPath = Path.Combine(BaseDataPath, "taxi-fare-test.csv");
         private static string ModelPath = Path.Combine(BaseRelativePath, "outputs", "TaxiFareModel.zip");

diff --git a/...d-to-end-apps/Model-Explainability/TaxiFarePrediction.Test/TaxiFarePrediction.Test.csproj b/...d-to-end-apps/Model-Explainability/TaxiFarePrediction.Test/TaxiFarePrediction.Test.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...end-to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionApp/OnnxObjectDetectionApp.csproj b/...end-to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionApp/OnnxObjectDetectionApp.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
+    <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.4.0" />
     <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.1.0-preview2.19523.17" />
     <PackageReference Include="OpenCvSharp3-AnyCPU" Version="4.0.0.20181129" />

diff --git a/...to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionWeb/ImagesTemp/9499668.Jpeg b/...to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionWeb/ImagesTemp/9499668.Jpeg
diff --git a/...end-to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionWeb/OnnxObjectDetectionWeb.csproj b/...end-to-end-apps/ObjectDetection-Onnx/OnnxObjectDetectionWeb/OnnxObjectDetectionWeb.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="Microsoft.Extensions.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML.ImageAnalytics" Version="$(MicrosoftMLVersion)" />
+    <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.4.0" />
     <PackageReference Include="Microsoft.ML.OnnxTransformer" Version="$(MicrosoftMLVersion)" />
   </ItemGroup>
 

diff --git a/samples/csharp/end-to-end-apps/ObjectDetection-Onnx/README.md b/samples/csharp/end-to-end-apps/ObjectDetection-Onnx/README.md
@@ -2,7 +2,7 @@
 
 | ML.NET version | API type    | Status     | App Type    | Data type   | Scenario         | ML Task       | Algorithms                        |
 |----------------|-------------|------------|-------------|-------------|------------------|---------------|-----------------------------------|
-| v1.4         | Dynamic API | Up-to-date | End-End app | image files | Object Detection | Deep Learning | ONNX: Tiny YOLOv2 & Custom Vision |
+| v1.5.0         | Dynamic API | Up-to-date | End-End app | image files | Object Detection | Deep Learning | ONNX: Tiny YOLOv2 & Custom Vision |
 
 ## Problem
 

diff --git a/...Recommendation-MovieRecommender/MovieRecommender/movierecommender/MovieRecommender.csproj b/...Recommendation-MovieRecommender/MovieRecommender/movierecommender/MovieRecommender.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="12.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Extensions.ML" Version="$(MicrosoftMLVersion)" />
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <Content Update="wwwroot\images\smileybob.png">

diff --git a/...-to-end-apps/Recommendation-MovieRecommender/MovieRecommender/movierecommender/Startup.cs b/...-to-end-apps/Recommendation-MovieRecommender/MovieRecommender/movierecommender/Startup.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.ML;
 using movierecommender.Services;
 using MovieRecommender.DataStructures;
@@ -25,11 +25,12 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IMovieService, MovieService>();
             services.AddPredictionEnginePool<MovieRating, MovieRatingPrediction>().FromFile(Configuration["MLModelPath"]);
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllersWithViews();
+            services.AddRazorPages();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -42,12 +43,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseStaticFiles();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Movies}/{action=Profiles}/{id?}");
+                endpoints.MapRazorPages();
+                endpoints.MapControllerRoute("default", "{controller=Movies}/{action=Profiles}/{id?}");
             });
         }
     }
-}
+}
diff --git a/...pps/ScalableMLModelOnWebAPI-Custom/src/Scalable.WebAPI/Controllers/PredictorController.cs b/...pps/ScalableMLModelOnWebAPI-Custom/src/Scalable.WebAPI/Controllers/PredictorController.cs
@@ -32,7 +32,6 @@ public ActionResult<string> PredictSentiment([FromQuery]string sentimentText)
             string retVal = $"Prediction: Is Toxic?: '{isToxic.ToString()}' with {probability.ToString()}% probability of toxicity  for the text '{sentimentText}'";
 
             return retVal;
-
         }
 
         public static float CalculatePercentage(double value)

diff --git a/...end-to-end-apps/ScalableMLModelOnWebAPI-Custom/src/Scalable.WebAPI/Scalable.WebAPI.csproj b/...end-to-end-apps/ScalableMLModelOnWebAPI-Custom/src/Scalable.WebAPI/Scalable.WebAPI.csproj
@@ -1,16 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.ML" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.ML.FastTree" Version="$(MicrosoftMLVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up @@
                 string retVal = $"Prediction: Is Toxic?: '{isToxic.ToString()}' with {probability.ToString()}% probability of toxicity  for the text '{sentimentText}'";
                 return retVal;
             }
             public static float CalculatePercentage(double value)
@@ Expand Down @@