diff --git a/test/E2ETest/TyeRunTests.cs b/test/E2ETest/TyeRunTests.cs
index 0f37c412..1dfddff1 100644
--- a/test/E2ETest/TyeRunTests.cs
+++ b/test/E2ETest/TyeRunTests.cs
@@ -125,7 +125,7 @@ services:
[ConditionalTheory]
[SkipIfDockerNotRunning]
- [InlineData("single-project", "mcr.microsoft.com/dotnet/core/aspnet:3.1")]
+ [InlineData("single-project", "mcr.microsoft.com/dotnet/aspnet:6.0")]
[InlineData("single-project-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0")]
public async Task SingleProjectWithDocker_UsesCorrectBaseImage(string projectName, string baseImage)
{
@@ -251,7 +251,7 @@ services:
application.Services.Remove(project);
var outputFileName = project.AssemblyName + ".dll";
- var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/core/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
+ var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
{
IsAspNet = true
};
@@ -298,7 +298,7 @@ services:
application.Services.Remove(project);
var outputFileName = project.AssemblyName + ".dll";
- var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/core/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
+ var container = new ContainerServiceBuilder(project.Name, $"mcr.microsoft.com/dotnet/aspnet:{project.TargetFrameworkVersion}", ServiceSource.Configuration)
{
IsAspNet = true
};
@@ -445,8 +445,8 @@ services:
var project = (DotnetProjectServiceBuilder)application.Services.First(s => s.Name == "backend-baseimage");
// check ContainerInfo values
- Assert.True(string.Equals(project.ContainerInfo!.BaseImageName, "mcr.microsoft.com/dotnet/core/sdk"));
- Assert.True(string.Equals(project.ContainerInfo!.BaseImageTag, "3.1-buster"));
+ Assert.True(string.Equals(project.ContainerInfo!.BaseImageName, "mcr.microsoft.com/dotnet/sdk"));
+ Assert.True(string.Equals(project.ContainerInfo!.BaseImageTag, "6.0-focal"));
// check projectInfo values
var projectRunInfo = new ProjectRunInfo(project);
@@ -1194,7 +1194,7 @@ services:
[ConditionalTheory]
[SkipIfDockerNotRunning]
- [InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/core/aspnet:3.1", 8005)]
+ [InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/aspnet:6.0", 8005)]
[InlineData("non-standard-dashboard-port-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0", 8006)]
public async Task RunUsesYamlDashboardPort(string projectName, string baseImage, int expectedDashboardPort)
{
@@ -1236,7 +1236,7 @@ services:
[ConditionalTheory]
[SkipIfDockerNotRunning]
- [InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/core/aspnet:3.1", 8005)]
+ [InlineData("non-standard-dashboard-port", "mcr.microsoft.com/dotnet/aspnet:6.0", 8005)]
[InlineData("non-standard-dashboard-port-5.0", "mcr.microsoft.com/dotnet/aspnet:5.0", 8006)]
public async Task RunCliPortOverridesYamlDashboardPort(string projectName, string baseImage, int tyeYamlDashboardPort)
{
diff --git a/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj b/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
index 97be2d50..725cb159 100644
--- a/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
+++ b/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
@@ -6,8 +6,8 @@
- mcr.microsoft.com/dotnet/core/sdk
- 3.1-buster
+ mcr.microsoft.com/dotnet/sdk
+ 6.0-focal
diff --git a/test/E2ETest/testassets/projects/multi-project/frontend/wwwroot/lib/jquery/dist/jquery.js b/test/E2ETest/testassets/projects/multi-project/frontend/wwwroot/lib/jquery/dist/jquery.js
index 9b5206bc..fc6c299b 100644
--- a/test/E2ETest/testassets/projects/multi-project/frontend/wwwroot/lib/jquery/dist/jquery.js
+++ b/test/E2ETest/testassets/projects/multi-project/frontend/wwwroot/lib/jquery/dist/jquery.js
@@ -1,15 +1,15 @@
/*!
- * jQuery JavaScript Library v3.3.1
+ * jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
- * Date: 2018-01-20T17:24Z
+ * Date: 2021-03-02T17:08Z
*/
( function( global, factory ) {
@@ -47,13 +47,16 @@
var arr = [];
-var document = window.document;
-
var getProto = Object.getPrototypeOf;
var slice = arr.slice;
-var concat = arr.concat;
+var flat = arr.flat ? function( array ) {
+ return arr.flat.call( array );
+} : function( array ) {
+ return arr.concat.apply( [], array );
+};
+
var push = arr.push;
@@ -73,12 +76,16 @@ var support = {};
var isFunction = function isFunction( obj ) {
- // Support: Chrome <=57, Firefox <=52
- // In some browsers, typeof returns "function" for HTML