Update projects/tests to target .NET 6.

5 years ago · bd0968bd1e
63 changed files with 96 additions and 77 deletions
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -521,7 +521,7 @@ function InitializeBuildTool() {
      ExitWithExitCode 1
    }
    $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net6.0' }
  } elseif ($msbuildEngine -eq "vs") {
    try {
      $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@ -306,7 +306,7 @@ function InitializeBuildTool {
  # return values
  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
  _InitializeBuildToolCommand="msbuild"
-  _InitializeBuildToolFramework="netcoreapp3.1"
+  _InitializeBuildToolFramework="net6.0"
 }

 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
--- a/src/Microsoft.Tye.Core/ApplicationFactory.cs
+++ b/src/Microsoft.Tye.Core/ApplicationFactory.cs
@ -164,7 +164,8 @@ namespace Microsoft.Tye

                    if (!string.IsNullOrEmpty(configService.Project))
                    {
-                        var project = new DotnetProjectServiceBuilder(configService.Name!, new FileInfo(configService.ProjectFullPath));
+                        // TODO: Investigate possible null.
+                        var project = new DotnetProjectServiceBuilder(configService.Name!, new FileInfo(configService.ProjectFullPath!));
                        service = project;

                        project.Build = configService.Build ?? true;
--- a/src/Microsoft.Tye.Core/ConfigModel/ConfigApplication.cs
+++ b/src/Microsoft.Tye.Core/ConfigModel/ConfigApplication.cs
@ -142,7 +142,8 @@ namespace Microsoft.Tye.ConfigModel
                foreach (var probe in probes)
                {
                    context = new ValidationContext(probe.Probe!);
-                    if (!Validator.TryValidateObject(probe.Probe, context, results, validateAllProperties: true))
+                    // TODO: Investigate possible null.
+                    if (!Validator.TryValidateObject(probe.Probe!, context, results, validateAllProperties: true))
                    {
                        throw new TyeYamlException(
                            $"Probe '{probe.Name}' in service '{service.Name}' validation failed." + Environment.NewLine +
--- a/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
+++ b/src/Microsoft.Tye.Core/Microsoft.Tye.Core.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Tye</RootNamespace>
    <AssemblyName>Microsoft.Tye.Core</AssemblyName>
    <PackageId>Microsoft.Tye.Core</PackageId>
--- a/src/Microsoft.Tye.Extensions/Microsoft.Tye.Extensions.csproj
+++ b/src/Microsoft.Tye.Extensions/Microsoft.Tye.Extensions.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
+++ b/src/Microsoft.Tye.Hosting.Diagnostics/Microsoft.Tye.Hosting.Diagnostics.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Description>Diagnostics collector and exporter for .NET Core applications.</Description>
    <AssemblyName>Microsoft.Tye.Hosting.Diagnostics</AssemblyName>
    <PackageId>Microsoft.Tye.Hosting.Diagnostics</PackageId>
--- a/src/Microsoft.Tye.Hosting/HttpProxyService.cs
+++ b/src/Microsoft.Tye.Hosting/HttpProxyService.cs
@ -177,7 +177,8 @@ namespace Microsoft.Tye.Hosting
                                            }
                                            var uri = new UriBuilder(uris[next].Uri)
                                            {
-                                                Path = rule.PreservePath ? $"{context.Request.Path}" : (string)context.Request.RouteValues["path"] ?? "/",
+                                                // TODO: Investigate possible null.
+                                                Path = rule.PreservePath ? $"{context.Request.Path}" : (string)context.Request!.RouteValues["path"]! ?? "/",
                                                Query = context.Request.QueryString.Value
                                            };

--- a/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs
+++ b/src/Microsoft.Tye.Hosting/Infrastructure/ProxyExtensions.cs
@ -88,7 +88,8 @@ namespace Microsoft.AspNetCore.Proxy

            // Append request forwarding headers
            requestMessage.Headers.TryAddWithoutValidation("Via", $"{context.Request.Protocol} Tye");
-            requestMessage.Headers.TryAddWithoutValidation("X-Forwarded-For", context.Connection.RemoteIpAddress.ToString());
+            // TODO: Investigate possible null.
+            requestMessage.Headers.TryAddWithoutValidation("X-Forwarded-For", context.Connection!.RemoteIpAddress!.ToString());
            requestMessage.Headers.TryAddWithoutValidation("X-Forwarded-Proto", request.Scheme);
            requestMessage.Headers.TryAddWithoutValidation("X-Forwarded-Host", request.Host.ToUriComponent());

@ -129,7 +130,8 @@ namespace Microsoft.AspNetCore.Proxy
            }

            AppendHeaderValue(client.Options, context.Request.Headers, "Via", context.Request.Protocol);
-            AppendHeaderValue(client.Options, context.Request.Headers, "X-Forwarded-For", context.Connection.RemoteIpAddress.ToString());
+            // TODO: Investigate possible null.
+            AppendHeaderValue(client.Options, context.Request.Headers, "X-Forwarded-For", context.Connection!.RemoteIpAddress!.ToString());
            AppendHeaderValue(client.Options, context.Request.Headers, "X-Forwarded-Proto", context.Request.Scheme);
            AppendHeaderValue(client.Options, context.Request.Headers, "X-Forwarded-Host", context.Request.Host.ToUriComponent());

--- a/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs
+++ b/src/Microsoft.Tye.Hosting/Infrastructure/ServiceLoggerProvider.cs
@ -47,9 +47,12 @@ namespace Microsoft.Tye.Hosting
                return true;
            }

-            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception, string>? formatter)
            {
-                _logs.OnNext($"[{logLevel}]: {formatter(state, exception)}");
+                if (formatter != null && exception != null)
+                {
+                    _logs.OnNext($"[{logLevel}]: {formatter(state, exception)}");
+                }

                if (exception != null)
                {
--- a/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
+++ b/src/Microsoft.Tye.Hosting/Microsoft.Tye.Hosting.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Description>Orchestration host APIs.</Description>
    <AssemblyName>Microsoft.Tye.Hosting</AssemblyName>
    <PackageId>Microsoft.Tye.Hosting</PackageId>
--- a/src/Microsoft.Tye.Hosting/ProxyService.cs
+++ b/src/Microsoft.Tye.Hosting/ProxyService.cs
@ -89,7 +89,8 @@ namespace Microsoft.Tye.Hosting
                                                return;
                                            }

-                                            using var _ = cts.Token.Register(() => notificationFeature.RequestClose());
+                                            // TODO: Investigate possible null.
+                                            using var _ = cts.Token.Register(() => notificationFeature!.RequestClose());

                                            NetworkStream? targetStream = null;

@ -126,11 +127,13 @@ namespace Microsoft.Tye.Hosting
                                            {
                                                _logger.LogDebug("Proxying traffic to {ServiceName} {ExternalPort}:{InternalPort}", service.Description.Name, binding.Port, ports[next]);

+                                                // TODO: Investigate possible null.
                                                // external -> internal
-                                                var reading = Task.Run(() => connection.Transport.Input.CopyToAsync(targetStream, notificationFeature.ConnectionClosedRequested));
+                                                var reading = Task.Run(() => connection.Transport.Input.CopyToAsync(targetStream, notificationFeature!.ConnectionClosedRequested));

+                                                // TODO: Investigate possible null.
                                                // internal -> external
-                                                var writing = Task.Run(() => targetStream.CopyToAsync(connection.Transport.Output, notificationFeature.ConnectionClosedRequested));
+                                                var writing = Task.Run(() => targetStream.CopyToAsync(connection.Transport.Output, notificationFeature!.ConnectionClosedRequested));

                                                await Task.WhenAll(reading, writing);
                                            }
@ -144,7 +147,8 @@ namespace Microsoft.Tye.Hosting
                                            }
                                            catch (OperationCanceledException ex)
                                            {
-                                                if (!notificationFeature.ConnectionClosedRequested.IsCancellationRequested)
+                                                // TODO: Investigate possible null.
+                                                if (!notificationFeature!.ConnectionClosedRequested.IsCancellationRequested)
                                                {
                                                    _logger.LogDebug(0, ex, "Proxy error for service {ServiceName}", service.Description.Name);
                                                }
--- a/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs
+++ b/src/Microsoft.Tye.Hosting/TransformProjectsIntoContainers.cs
@ -87,10 +87,10 @@ namespace Microsoft.Tye.Hosting
            // This is .NET specific
            var userSecretStore = GetUserSecretsPathFromSecrets();

-            Directory.CreateDirectory(userSecretStore);
-
            if (!string.IsNullOrEmpty(userSecretStore))
            {
+                Directory.CreateDirectory(userSecretStore);
+
                // Map the user secrets on this drive to user secrets
                dockerRunInfo.VolumeMappings.Add(new DockerVolume(source: userSecretStore, name: null, target: "/root/.microsoft/usersecrets", readOnly: true));
            }
--- a/src/Microsoft.Tye.Hosting/TyeHost.cs
+++ b/src/Microsoft.Tye.Hosting/TyeHost.cs
@ -102,7 +102,8 @@ namespace Microsoft.Tye.Hosting

            await app.StartAsync();

-            _addresses = DashboardWebApplication.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>().Addresses;
+            // TODO: Investigate possible null.
+            _addresses = DashboardWebApplication.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>()!.Addresses;

            _logger.LogInformation("Dashboard running on {Address}", _addresses.First());

--- a/src/Microsoft.Tye.Proxy/Microsoft.Tye.Proxy.csproj
+++ b/src/Microsoft.Tye.Proxy/Microsoft.Tye.Proxy.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/src/Microsoft.Tye.Proxy/Program.cs
+++ b/src/Microsoft.Tye.Proxy/Program.cs
@ -64,7 +64,8 @@ namespace Microsoft.Tye.Proxy

                                            logger.LogDebug("Attempting to connect to {ServiceName} listening on {Port}:{ExternalPort}", serviceName, mapping.Port, mapping.ExternalPort);

-                                            await target.ConnectAsync(containerHost, mapping.ExternalPort);
+                                            // TODO: Investigate null host.
+                                            await target.ConnectAsync(containerHost!, mapping.ExternalPort);

                                            logger.LogDebug("Successfully connected to {ServiceName} listening on {Port}:{ExternalPort}", serviceName, mapping.Port, mapping.ExternalPort);

@ -87,11 +88,13 @@ namespace Microsoft.Tye.Proxy
                                        {
                                            logger.LogDebug("Proxying traffic to {ServiceName} {Port}:{ExternalPort}", serviceName, mapping.Port, mapping.ExternalPort);

-                                            // external -> internal
-                                            var reading = Task.Run(() => connection.Transport.Input.CopyToAsync(targetStream, notificationFeature.ConnectionClosedRequested));
+                                            // TODO: Investigate possible null.
+                                            // external -> internal                                            
+                                            var reading = Task.Run(() => connection.Transport.Input.CopyToAsync(targetStream, notificationFeature!.ConnectionClosedRequested));

+                                            // TODO: Investigate possible null.
                                            // internal -> external
-                                            var writing = Task.Run(() => targetStream.CopyToAsync(connection.Transport.Output, notificationFeature.ConnectionClosedRequested));
+                                            var writing = Task.Run(() => targetStream.CopyToAsync(connection.Transport.Output, notificationFeature!.ConnectionClosedRequested));

                                            await Task.WhenAll(reading, writing);
                                        }
@ -105,7 +108,8 @@ namespace Microsoft.Tye.Proxy
                                        }
                                        catch (OperationCanceledException ex)
                                        {
-                                            if (!notificationFeature.ConnectionClosedRequested.IsCancellationRequested)
+                                            // TODO: Investigate possible null.
+                                            if (!notificationFeature!.ConnectionClosedRequested.IsCancellationRequested)
                                            {
                                                logger.LogDebug(0, ex, "Proxy error for service {ServiceName}", serviceName);
                                            }
--- a/src/shared/KubectlDetector.cs
+++ b/src/shared/KubectlDetector.cs
@ -47,8 +47,9 @@ namespace Microsoft.Tye
                    {
                        continue;
                    }
-                    var major = int.Parse(element.Value.GetProperty("major").GetString());
-                    var minor = int.Parse(element.Value.GetProperty("minor").GetString().Trim('+'));
+                    // TODO: Investigate possible null.
+                    var major = int.Parse(element.Value!.GetProperty("major")!.GetString()!);
+                    var minor = int.Parse(element.Value!.GetProperty("minor")!.GetString()!.Trim('+'));
                    var version = new Version(major, minor);
                    return version;
                }
--- a/src/tye-diag-agent/tye-diag-agent.csproj
+++ b/src/tye-diag-agent/tye-diag-agent.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Microsoft.Tye</RootNamespace>
  </PropertyGroup>

--- a/src/tye/InitHost.cs
+++ b/src/tye/InitHost.cs
@ -37,7 +37,8 @@ namespace Microsoft.Tye
                    throw new CommandException(errorMessage!);
                }

-                path = new FileInfo(filePath);
+                // TODO: Investigate possible null.
+                path = new FileInfo(filePath!);
            }

            var template = @"
--- a/src/tye/tye.csproj
+++ b/src/tye/tye.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Microsoft.Tye</RootNamespace>
    <AssemblyName>tye</AssemblyName>
    <PackageId>Microsoft.Tye</PackageId>
--- a/test/E2ETest/ApplicationFactoryTests.cs
+++ b/test/E2ETest/ApplicationFactoryTests.cs
@ -135,14 +135,14 @@ services:
            // Debug targets can be null if not specified, so make sure calling host.Start does not throw.
            var outputContext = new OutputContext(_sink, Verbosity.Debug);
            var projectFile = new FileInfo(yamlFile);
-            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net6.0");

            Assert.Single(applicationBuilder.Services);
            var service = applicationBuilder.Services.Single(s => s.Name == "multi-targetframeworks");

            var containsTargetFramework = ((DotnetProjectServiceBuilder)service).BuildProperties.TryGetValue("TargetFramework", out var targetFramework);
            Assert.True(containsTargetFramework);
-            Assert.Equal("netcoreapp3.1", targetFramework);
+            Assert.Equal("net6.0", targetFramework);
        }

        [Fact]
@ -154,7 +154,7 @@ services:
            // Debug targets can be null if not specified, so make sure calling host.Start does not throw.
            var outputContext = new OutputContext(_sink, Verbosity.Debug);
            var projectFile = new FileInfo(yamlFile);
-            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var applicationBuilder = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net6.0");

            Assert.Single(applicationBuilder.Services);
            var service = applicationBuilder.Services.Single(s => s.Name == "multi-targetframeworks");
--- a/test/E2ETest/Microsoft.Tye.E2ETests.csproj
+++ b/test/E2ETest/Microsoft.Tye.E2ETests.csproj
@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <AssemblyName>Microsoft.Tye.E2ETest</AssemblyName>
    <IsTestProject>true</IsTestProject>
    <IsUnitTestProject>true</IsUnitTestProject>
--- a/test/E2ETest/TyeBuildTests.Dockerfile.cs
+++ b/test/E2ETest/TyeBuildTests.Dockerfile.cs
@ -226,7 +226,7 @@ namespace E2ETest
            var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye-no-buildproperties.yaml"));

            var outputContext = new OutputContext(sink, Verbosity.Debug);
-            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net6.0");

            application.Registry = new ContainerRegistry("test");

@ -260,7 +260,7 @@ namespace E2ETest
            var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye-with-netcoreapp31.yaml"));

            var outputContext = new OutputContext(sink, Verbosity.Debug);
-            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net6.0");

            application.Registry = new ContainerRegistry("test");

--- a/test/E2ETest/TyeRunTests.cs
+++ b/test/E2ETest/TyeRunTests.cs
@ -1040,7 +1040,7 @@ services:

            var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye-no-buildproperties.yaml"));
            var outputContext = new OutputContext(_sink, Verbosity.Debug);
-            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "netcoreapp3.1");
+            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile, "net6.0");

            var handler = new HttpClientHandler
            {
--- a/test/E2ETest/testassets/projects/Console.Normalization.svc.Name/Console.Normalization.svc.Name.csproj
+++ b/test/E2ETest/testassets/projects/Console.Normalization.svc.Name/Console.Normalization.svc.Name.csproj
@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationA/ApplicationA.csproj
+++ b/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationA/ApplicationA.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationB/ApplicationB.csproj
+++ b/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationB/ApplicationB.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationC-UI/ApplicationC-UI.csproj
+++ b/test/E2ETest/testassets/projects/apps-with-ingress/ApplicationC-UI/ApplicationC-UI.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/azure-functions/backend/backend.csproj
+++ b/test/E2ETest/testassets/projects/azure-functions/backend/backend.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <AzureFunctionsVersion>v3</AzureFunctionsVersion>
  </PropertyGroup>
  <ItemGroup>
--- a/test/E2ETest/testassets/projects/azure-functions/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/azure-functions/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Frontend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/dapr/dapr.csproj
+++ b/test/E2ETest/testassets/projects/dapr/dapr.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/dockerfile/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/dockerfile/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Frontend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
+++ b/test/E2ETest/testassets/projects/frontend-backend/backend/backend-baseimage.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Backend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/frontend-backend/backend/backend.csproj
+++ b/test/E2ETest/testassets/projects/frontend-backend/backend/backend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Backend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/frontend-backend/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/frontend-backend/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Frontend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/generate-connectionstring-dependency/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/generate-connectionstring-dependency/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/generate-named-binding/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/generate-named-binding/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/generate-uri-dependency/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/generate-uri-dependency/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/health-checks/api/api.csproj
+++ b/test/E2ETest/testassets/projects/health-checks/api/api.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>


--- a/test/E2ETest/testassets/projects/multi-phase-dockerfile/multi-phase-dockerfile.csproj
+++ b/test/E2ETest/testassets/projects/multi-phase-dockerfile/multi-phase-dockerfile.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>multi_phase_dockerfile</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/multi-project/backend/backend.csproj
+++ b/test/E2ETest/testassets/projects/multi-project/backend/backend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Backend</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/multi-project/frontend/frontend.csproj
+++ b/test/E2ETest/testassets/projects/multi-project/frontend/frontend.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

  <ItemGroup>
--- a/test/E2ETest/testassets/projects/multi-project/worker/worker.csproj
+++ b/test/E2ETest/testassets/projects/multi-project/worker/worker.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <UserSecretsId>dotnet-worker-E4419EA1-F496-4FE1-A024-7E75E40B9E10</UserSecretsId>
    <RootNamespace>Worker</RootNamespace>
  </PropertyGroup>
--- a/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/multi-targetframeworks.csproj
+++ b/test/E2ETest/testassets/projects/multi-targetframeworks/multi-targetframeworks/multi-targetframeworks.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp2.1</TargetFrameworks>
    <RootNamespace>MultiTargetFrameworks</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/multi-targetframeworks/tye-with-netcoreapp31.yaml
+++ b/test/E2ETest/testassets/projects/multi-targetframeworks/tye-with-netcoreapp31.yaml
@ -6,4 +6,4 @@ services:
  project: multi-targetframeworks/multi-targetframeworks.csproj
  buildProperties:
    - name: TargetFramework
-      value: netcoreapp3.1
+      value: net6.0
--- a/test/E2ETest/testassets/projects/multirepo/results/results.csproj
+++ b/test/E2ETest/testassets/projects/multirepo/results/results.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Results</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/multirepo/vote/vote.csproj
+++ b/test/E2ETest/testassets/projects/multirepo/vote/vote.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>Vote</RootNamespace>
  </PropertyGroup>
  
--- a/test/E2ETest/testassets/projects/multirepo/worker/worker.csproj
+++ b/test/E2ETest/testassets/projects/multirepo/worker/worker.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <UserSecretsId>dotnet-worker-A47A7C4B-4BF2-4243-9BBE-E6B3CB3E9C6F</UserSecretsId>
    <RootNamespace>Worker</RootNamespace>
  </PropertyGroup>
--- a/test/E2ETest/testassets/projects/nginx-ingress/ApplicationA/ApplicationA.csproj
+++ b/test/E2ETest/testassets/projects/nginx-ingress/ApplicationA/ApplicationA.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/nginx-ingress/ApplicationB/ApplicationB.csproj
+++ b/test/E2ETest/testassets/projects/nginx-ingress/ApplicationB/ApplicationB.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/project-types/app/app.csproj
+++ b/test/E2ETest/testassets/projects/project-types/app/app.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>

 </Project>
--- a/test/E2ETest/testassets/projects/project-types/class-library/class-library.csproj
+++ b/test/E2ETest/testassets/projects/project-types/class-library/class-library.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>class_library</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/project-types/test-project/test-project.csproj
+++ b/test/E2ETest/testassets/projects/project-types/test-project/test-project.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>test_project</RootNamespace>

    <IsPackable>false</IsPackable>
--- a/test/E2ETest/testassets/projects/single-phase-dockerfile-args-duplicates/single-phase-dockerfile-args.csproj
+++ b/test/E2ETest/testassets/projects/single-phase-dockerfile-args-duplicates/single-phase-dockerfile-args.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>single_phase_dockerfile_args</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/single-phase-dockerfile-args/single-phase-dockerfile-args.csproj
+++ b/test/E2ETest/testassets/projects/single-phase-dockerfile-args/single-phase-dockerfile-args.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>single_phase_dockerfile_args</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/single-phase-dockerfile-multi-args/single-phase-dockerfile-multi-args.csproj
+++ b/test/E2ETest/testassets/projects/single-phase-dockerfile-multi-args/single-phase-dockerfile-multi-args.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>single_phase_dockerfile_args</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/single-phase-dockerfile/single-phase-dockerfile.csproj
+++ b/test/E2ETest/testassets/projects/single-phase-dockerfile/single-phase-dockerfile.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>single_phase_dockerfile</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/single-project/test-project/test-project.csproj
+++ b/test/E2ETest/testassets/projects/single-project/test-project/test-project.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>test_project</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/volume-test/volume-test.csproj
+++ b/test/E2ETest/testassets/projects/volume-test/volume-test.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>volume_test</RootNamespace>
  </PropertyGroup>

--- a/test/E2ETest/testassets/projects/web-app/web-app.csproj
+++ b/test/E2ETest/testassets/projects/web-app/web-app.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <RootNamespace>web_app</RootNamespace>
  </PropertyGroup>

--- a/test/Microsoft.Tye.Extensions.Configuration.Tests/Microsoft.Tye.Extensions.Configuration.Tests.csproj
+++ b/test/Microsoft.Tye.Extensions.Configuration.Tests/Microsoft.Tye.Extensions.Configuration.Tests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <IsTestProject>true</IsTestProject>
  </PropertyGroup>

--- a/test/Test.Infrastructure/Test.Infrastructure.csproj
+++ b/test/Test.Infrastructure/Test.Infrastructure.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <IsPackable>false</IsPackable>
    <TestRunnerName>XUnit</TestRunnerName>
    <Nullable>disable</Nullable>
--- a/test/UnitTests/Microsoft.Tye.UnitTests.csproj
+++ b/test/UnitTests/Microsoft.Tye.UnitTests.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <AssemblyName>Microsoft.Tye.UnitTests</AssemblyName>
    <IsTestProject>true</IsTestProject>
    <IsUnitTestProject>true</IsUnitTestProject>