In tests and samples the .NET Core App 2.0 target was updated to version 2.1

Author: Taritsyn

JavaScriptEngineSwitcher.sln

@@ -95,7 +95,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1\JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1.csproj", "{5CA92021-B75A-40AF-B5AA-500BAF76B4D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2\JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.csproj", "{0342791E-6390-4F97-9163-5CE02E4CFF07}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21", "samples\JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21\JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.csproj", "{0342791E-6390-4F97-9163-5CE02E4CFF07}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

samples/JavaScriptEngineSwitcher.Sample.AspNet4.Mvc4/gulpfile.js

@@ -1,5 +1,9 @@
 /*global require, exports */
 /*jshint esversion: 6 */
+const WEB_ROOT_PATH = ".";
+const BOWER_DIR_PATH = "lib";
+const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
+const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
 
 // include plug-ins
 let { src, dest, series, parallel, watch } = require('gulp');
@@ -12,11 +16,6 @@ let autoprefixer = require('gulp-autoprefixer');
 let cleanCss = require('gulp-clean-css');
 let uglify = require('gulp-uglify');
 
-const WEB_ROOT_PATH = ".";
-const BOWER_DIR_PATH = "lib";
-const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
-const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
-
 //#region Clean
 //#region Clean builded assets
 function cleanBuildedStyles() {

samples/JavaScriptEngineSwitcher.Sample.AspNetCore1.Mvc1/gulpfile.js

@@ -1,5 +1,9 @@
 /*global require, exports */
 /*jshint esversion: 6 */
+const WEB_ROOT_PATH = "wwwroot";
+const BOWER_DIR_PATH = WEB_ROOT_PATH + "/lib";
+const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
+const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
 
 // include plug-ins
 let { src, dest, series, parallel, watch } = require('gulp');
@@ -12,11 +16,6 @@ let autoprefixer = require('gulp-autoprefixer');
 let cleanCss = require('gulp-clean-css');
 let uglify = require('gulp-uglify');
 
-const WEB_ROOT_PATH = "wwwroot";
-const BOWER_DIR_PATH = WEB_ROOT_PATH + "/lib";
-const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
-const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
-
 //#region Clean
 //#region Clean builded assets
 function cleanBuildedStyles() {

samples/JavaScriptEngineSwitcher.Sample.AspNetCore1Full.Mvc1/gulpfile.js

@@ -1,5 +1,9 @@
 /*global require, exports */
 /*jshint esversion: 6 */
+const WEB_ROOT_PATH = "wwwroot";
+const BOWER_DIR_PATH = WEB_ROOT_PATH + "/lib";
+const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
+const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
 
 // include plug-ins
 let { src, dest, series, parallel, watch } = require('gulp');
@@ -12,11 +16,6 @@ let autoprefixer = require('gulp-autoprefixer');
 let cleanCss = require('gulp-clean-css');
 let uglify = require('gulp-uglify');
 
-const WEB_ROOT_PATH = "wwwroot";
-const BOWER_DIR_PATH = WEB_ROOT_PATH + "/lib";
-const STYLE_DIR_PATH = WEB_ROOT_PATH + '/styles';
-const SCRIPT_DIR_PATH = WEB_ROOT_PATH + '/scripts';
-
 //#region Clean
 //#region Clean builded assets
 function cleanBuildedStyles() {

samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/Views/_ViewImports.cshtml

@@ -1,14 +1,16 @@
-using System.Threading.Tasks;
+using System.Diagnostics;
+using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 
+using JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.Models;
 using JavaScriptEngineSwitcher.Sample.Logic.Models;
 using JavaScriptEngineSwitcher.Sample.Logic.Services;
 
-namespace JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.Controllers
+namespace JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.Controllers
 {
 	public class HomeController : Controller
 	{
@@ -72,9 +74,10 @@ public IActionResult Contact()
 			return View();
 		}
 
+		[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 		public IActionResult Error()
 		{
-			return View();
+			return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
 		}
 	}
 }

samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/.bowerrc renamed to samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/.bowerrc

@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.Infrastructure.Helpers
+namespace JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.Infrastructure.Helpers
 {
 	public static class CommonExtensions
 	{

samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/Controllers/HomeController.cs renamed to samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/Controllers/HomeController.cs

@@ -2,7 +2,7 @@
 
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.Infrastructure.TagHelpers
+namespace JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.Infrastructure.TagHelpers
 {
 	[HtmlTargetElement("conditional-comment")]
 	public class ConditionalCommentTagHelper : TagHelper

samples/JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2/Infrastructure/Helpers/CommonExtensions.cs renamed to samples/JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21/Infrastructure/Helpers/CommonExtensions.cs

@@ -1,4 +1,4 @@
-namespace JavaScriptEngineSwitcher.Sample.AspNetCore2.Mvc2.Infrastructure.TagHelpers
+namespace JavaScriptEngineSwitcher.Sample.AspNetCore21.Mvc21.Infrastructure.TagHelpers
 {
 	public enum ConditionalCommentType
 	{