Fix AOT (dotnet#17238)

nojaf · May 28, 2024 · 7e59327 · 7e59327
1 parent c88f99b
commit 7e59327
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -128,7 +128,7 @@ extends:
             - script: eng\CIBuild.cmd
                       -configuration $(_BuildConfig)
                       -prepareMachine
-                      -testAllButIntegrationAndAot
+                      -testAllButIntegration
                       -officialSkipTests $(SkipTests)
                       /p:SignType=$(_SignType)
                       /p:DotNetSignType=$(_SignType)

diff --git a/eng/Build.ps1 b/eng/Build.ps1
@@ -61,7 +61,6 @@ param (
     [switch]$testVs,
     [switch]$testAll,
     [switch]$testAllButIntegration,
-    [switch]$testAllButIntegrationAndAot,
     [switch]$testpack,
     [switch]$testAOT,
     [switch]$testBenchmarks,
@@ -105,7 +104,6 @@ function Print-Usage() {
     Write-Host "Test actions"
     Write-Host "  -testAll                      Run all tests"
     Write-Host "  -testAllButIntegration        Run all but integration tests"
-    Write-Host "  -testAllButIntegrationAndAot  Run all but integration and AOT tests"
     Write-Host "  -testCambridge                Run Cambridge tests"
     Write-Host "  -testCompiler                 Run FSharpCompiler unit tests"
     Write-Host "  -testCompilerService          Run FSharpCompilerService unit tests"
@@ -172,19 +170,9 @@ function Process-Arguments() {
         $script:testAOT = $True
     }
 
-    if($testAllButIntegrationAndAot) {
-        $script:testDesktop = $True
-        $script:testCoreClr = $True
-        $script:testFSharpQA = $True
-        $script:testIntegration = $False
-        $script:testVs = $True
-        $script:testAOT = $False
-    }
-
     if ([System.Boolean]::Parse($script:officialSkipTests)) {
         $script:testAll = $False
         $script:testAllButIntegration = $False
-        $script:testAllButIntegrationAndAot = $False
         $script:testCambridge = $False
         $script:testCompiler = $False
         $script:testCompilerService = $False

diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
@@ -48,9 +48,6 @@
     <DependentProjects Include="$(MSBuildThisFileDirectory)..\Compiler\FSharp.Compiler.Service.fsproj">
         <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
     </DependentProjects>
-    <DependentProjects Include="$(MSBuildThisFileDirectory)..\Compiler\FSharp.Compiler.Service.fsproj">
-        <AdditionalProperties>TargetFrameworks=netstandard2.0</AdditionalProperties>
-    </DependentProjects>
   </ItemGroup>
 
    <ItemGroup>

diff --git a/tests/AheadOfTime/check.ps1 b/tests/AheadOfTime/check.ps1
@@ -1,4 +1,12 @@
 Write-Host "AheadOfTime: check1.ps1"
 
+# the NUGET_PACKAGES environment variable tells dotnet nuget where the global package is
+# So save the current setting, we'll reset it after the tests are complete
+# Then clear the global cache so that we can grab the FSharp.Core nuget we built earlier
+$savedNUGET_PACKAGES=$env:NUGET_PACKAGES
+$env:NUGET_PACKAGES=Join-Path $PSScriptRoot "../../artifacts/nuget/AOT/"
+dotnet nuget locals global-packages --clear
+
 Equality\check.ps1
 Trimming\check.ps1
+$env:NUGET_PACKAGES=$savedNUGET_PACKAGES