Includes changes from https://github.com/microsoft/dotnet-framework-docker/pull/1040 as well as updates to .NET 7.0 to fix the test project failure in that PR. I don't have permissions to push to dotnet-docker-bot's branch so I'm opening this as a separate PR.
Includes changes from https://github.com/microsoft/dotnet-framework-docker/pull/1040 as well as updates to .NET 7.0 to fix the test project failure in that PR. I don't have permissions to push to dotnet-docker-bot's branch so I'm opening this as a separate PR.