Move trim tests to separate test\AheadOfTime location

azure-pipelines.yml

@@ -650,16 +650,19 @@ stages:
             displayName: Report dotnet SDK versions
           - script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig)
             displayName: Initial build and prepare packages.
-          - script:  dotnet publish -c $(_BuildConfig)  -bl:\"./bin/$(_BuildConfig)/net7.0/win-x64/publish/Trimming.binlog\"
+          - script:  dotnet publish -c Release -f:net472 -bl:"./artifacts/log/Release/AheadOfTime/SelfContained_Trimming_net472.binlog"
             displayName: Build and publish a trim test package.
-            workingDirectory: $(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test
+            workingDirectory: $(Build.SourcesDirectory)/tests/AheadOfTime/SelfContained_Trimming_Test
+          - script:  dotnet publish -c Release  -f:net7.0 -bl:"./artifacts/log/Release/AheadOfTime/SelfContained_Trimming_net7.0.binlog"
+            displayName: Build and publish a trim test package.
+            workingDirectory: $(Build.SourcesDirectory)/tests/AheadOfTime/SelfContained_Trimming_Test
           - script: .\check.cmd
             displayName: Check the state of the trimmed app.
-            workingDirectory: $(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test
+            workingDirectory: $(Build.SourcesDirectory)/tests/AheadOfTime/SelfContained_Trimming_Test
           - task: PublishPipelineArtifact@1
             displayName: Publish Trim Tests Logs
             inputs:
-              targetPath: '$(Build.SourcesDirectory)/tests/projects/SelfContained_Trimming_Test/bin/$(_BuildConfig)/net7.0/win-x64/publish'
+              targetPath: './artifacts/log/Release/AheadOfTime'
               artifactName: 'Trim Test Logs Attempt $(System.JobAttempt) Logs $(_kind)'
             continueOnError: true
             condition: always()

tests/AheadOfTime/Directory.Build.props

@@ -0,0 +1,3 @@
+<Project>
+  <!-- empty to prevent directory crawling -->
+</Project>

tests/AheadOfTime/Directory.Build.targets

@@ -0,0 +1,3 @@
+<Project>
+  <!-- empty to prevent directory crawling -->
+</Project>

tests/projects/SelfContained_Trimming_Test/NuGet.Config → tests/AheadOfTime/NuGet.Config

@@ -5,7 +5,7 @@
     </solution>
     <packageSources>
         <clear />
-        <add key="localPackages" value="../../../artifacts/packages/Release/Shipping"/>
+        <add key="localPackages" value="../../artifacts/packages/Release/Shipping"/>
         <add key="remote" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     </packageSources>
     <disabledPackageSources>

tests/projects/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj → tests/AheadOfTime/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net472;net7.0</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DotNetBuildOffline>true</DotNetBuildOffline>
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Program.fs" />
+    <Compile Include="..\Program.fs" />
   </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)../../../eng/Versions.props" />

tests/AheadOfTime/SelfContained_Trimming_Test/check.ps1

@@ -0,0 +1,35 @@
+function CheckTrim($tfm, $expected_len) {
+    Write-Host "Verify trimming ${tfm}:  Expected length: ${expected_len}"
+
+    $cwd = Get-Location
+    Set-Location (Join-Path $PSScriptRoot "bin\Release\${tfm}\win-x64\publish\")
+    $output = .\SelfContained_Trimming_Test.exe
+    Set-Location ${cwd}
+
+    # Checking that it is actually running.
+    if (-not ($LASTEXITCODE -eq 0))
+    {
+        Write-Error "Test failed with exit code ${LASTEXITCODE}" -ErrorAction Stop
+    }
+
+    # Checking that the output is as expected.
+    $expected = "All tests passed"
+    if (-not ($output -eq $expected))
+    {
+        Write-Error "Test failed with unexpected output:`nExpected:`n`t${expected}`nActual`n`t${output}" -ErrorAction Stop
+    }
+
+    # Checking that the trimmed FSharp.Core binary is of expected size (needs adjustments if test is updated).
+    $file = Get-Item (Join-Path $PSScriptRoot "bin\Release\${tfm}\win-x64\publish\FSharp.Core.dll")
+    $file_len = $file.Length
+    if (-not ($file_len -eq $expected_len))
+    {
+        Write-Error "Test failed with unexpected ${tfm}  -  trimmed FSharp.Core length:`nExpected:`n`t${expected_len} Bytes`nActual:`n`t${file_len} Bytes`nEither codegen or trimming logic have changed. Please investigate and update expected dll size or report an issue." -ErrorAction Stop
+    }
+}
+
+# Check net472 trimmed assemblies trimming doesn't work for tfm net472
+### CheckTrim -tfm "net472" -expected_len 287744
+
+# Check net7.0 trimmed assemblies
+CheckTrim -tfm "net7.0" -expected_len 287744

tests/AheadOfTime/buildtools.proj

@@ -0,0 +1,32 @@
+<Project>
+
+  <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
+    <NoWarn>$(NoWarn);NU1504</NoWarn>
+</PropertyGroup>
+
+  <ItemGroup>
+    <Projects Include="SelfContained_Trimming_Test\SelfContained_Trimming_Test.fsproj" />
+  </ItemGroup>
+
+  <Target Name="Build">
+    <MSBuild Projects="@(Projects)" Targets="Build" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Rebuild">
+    <MSBuild Projects="@(Projects)" Targets="Rebuild" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Clean">
+    <MSBuild Projects="@(Projects)" Targets="Clean" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Restore">
+    <MSBuild Projects="@(Projects)" Targets="Restore" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+  <Target Name="Publish">
+    <MSBuild Projects="@(Projects)" Targets="Publish" Properties="Configuration=$(Configuration)" />
+  </Target>
+
+</Project>