Merge branch 'release/6.0.1xx' into main

2021-10-28 23:16:31 -07:00 · 2021-10-28 23:16:31 -07:00 · 3d723365aa
commit 3d723365aa
parent cf9c05f688 9e8b04bbff
69 changed files with 1834 additions and 640 deletions
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@ -424,6 +424,13 @@ namespace EndToEnd.Tests
                {
                    buildArgs += $" --framework {framework}";
                }
+                
+                // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved.
+                if (language == "F#")
+                {
+                    buildArgs += $" /p:_NETCoreSdkIsPreview=true";
+                }
+            
                string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
                new BuildCommand()
                     .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet