Merge branch 'release/6.0.4xx' into release/7.0.1xx

2022-11-13 21:43:19 -08:00 · 2022-11-13 21:43:19 -08:00 · c2db622a6b
commit c2db622a6b
parent cbfa597305 53b4e90baf
2 changed files with 2 additions and 0 deletions
--- a/eng/common/sdl/sdl.ps1
+++ b/eng/common/sdl/sdl.ps1
@ -1,6 +1,7 @@

 function Install-Gdn {
    param(
+        [Parameter(Mandatory=$true)]
        [string]$Path,

        # If omitted, install the latest version of Guardian, otherwise install that specific version.
--- a/src/SourceBuild/tarball/content/repos/fsharp.proj
+++ b/src/SourceBuild/tarball/content/repos/fsharp.proj
@ -27,6 +27,7 @@

  <ItemGroup>
    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
+    <EnvironmentVariables Include="CheckEolTargetFramework=false" />
  </ItemGroup>

  <Target Name="SetArcadeSdkDir"