diff --git a/eng/scripts/GenerateProjectList.ps1 b/eng/scripts/GenerateProjectList.ps1
index 5135db533b7..e5e2f2ea219 100644
--- a/eng/scripts/GenerateProjectList.ps1
+++ b/eng/scripts/GenerateProjectList.ps1
@@ -8,7 +8,7 @@ $msbuildEngine = 'dotnet'
 $repoRoot = Resolve-Path "$PSScriptRoot/../.."
 
 try {
-  & "$repoRoot\eng\common\msbuild.ps1" -ci:$ci "$repoRoot/eng/CodeGen.proj" /t:GenerateProjectList
+  & "$repoRoot\eng\common\msbuild.ps1" -msbuildEngine $msbuildEngine -ci:$ci "$repoRoot/eng/CodeGen.proj" /t:GenerateProjectList
 } finally {
   Remove-Item variable:global:_BuildTool -ErrorAction Ignore
   Remove-Item variable:global:_DotNetInstallDir -ErrorAction Ignore
diff --git a/global.json b/global.json
index c5686c0222a..fdb8f883946 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-preview.3.22171.1"
+    "version": "7.0.100-preview.4.22174.1"
   },
   "tools": {
-    "dotnet": "7.0.100-preview.3.22171.1",
+    "dotnet": "7.0.100-preview.4.22174.1",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
diff --git a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
index 1e563b83cca..5f65db02a31 100644
--- a/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
+++ b/src/Middleware/StaticFiles/test/UnitTests/DefaultFilesMiddlewareTests.cs
@@ -133,7 +133,6 @@ public class DefaultFilesMiddlewareTests
     [InlineData("", @"./SubFolder", "", false)]
     [InlineData("", @"./SubFolder", "/你好", false)]
     [InlineData("", @"./SubFolder", "/你好/世界", false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task FoundDirectoryWithDefaultFile_PathModified_All(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
     {
         await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@@ -154,7 +153,6 @@ public class DefaultFilesMiddlewareTests
     [InlineData("", @".\subFolder", "", false)]
     [InlineData("", @".\SubFolder", "/你好", false)]
     [InlineData("", @".\SubFolder", "/你好/世界", false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task FoundDirectoryWithDefaultFile_PathModified_Windows(string baseUrl, string baseDir, string requestUrl, bool appendTrailingSlash = true)
     {
         await FoundDirectoryWithDefaultFile_PathModified(baseUrl, baseDir, requestUrl, appendTrailingSlash);
@@ -190,7 +188,6 @@ public class DefaultFilesMiddlewareTests
     [InlineData("", @"./", "/SubFolder", "?a=b")]
     [InlineData("", @"./SubFolder", "/你好", "?a=b")]
     [InlineData("", @"./SubFolder", "/你好/世界", "?a=b")]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task NearMatch_RedirectAddSlash_All(string baseUrl, string baseDir, string requestUrl, string queryString)
     {
         await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);
@@ -203,7 +200,6 @@ public class DefaultFilesMiddlewareTests
     [InlineData("", @".\", "/SubFolder", "?a=b")]
     [InlineData("", @".\SubFolder", "/你好", "?a=b")]
     [InlineData("", @".\SubFolder", "/你好/世界", "?a=b")]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40642")]
     public async Task NearMatch_RedirectAddSlash_Windows(string baseUrl, string baseDir, string requestUrl, string queryString)
     {
         await NearMatch_RedirectAddSlash(baseUrl, baseDir, requestUrl, queryString);