From 4aebb5555e52436c895e8123e2b6e4941c283c59 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Tue, 27 Aug 2024 14:17:11 +0200
Subject: [PATCH 01/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 26cd7a2394fa..04ac1818362d 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -29,6 +29,7 @@
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/FSharp.Core.*.nupkg" SubDir="library-packs\"/>
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/*" Exclude="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
+        <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc/*" SubDir="" />
     </ItemGroup>
     <ItemGroup>
         <ResolvedFileToPublish

From f42f14e5644ee16b68288a6f87411b3dd2fbf697 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 28 Aug 2024 15:30:39 +0200
Subject: [PATCH 02/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 04ac1818362d..97738f734a02 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -5,6 +5,19 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>
 
+  <!-- MIBC, PGO -->
+  <PropertyGroup>
+    <MibcTargetOS>linux</MibcTargetOS>
+    <!-- We deliberately want to use linux mibc pgo data on macOS -->
+    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">linux</MibcTargetOS>
+    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows_nt</MibcTargetOS>
+    <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
+    <MibcTargetArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</MibcTargetArchitecture>
+    <MibcCurrentMachineArcitecture>$(MibcTargetOS)-$(MibcTargetArchitecture)</MibcCurrentMachineArcitecture>
+    <MibcFile>$(MibcPath)/optimization.$(MibcCurrentMachineArcitecture).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
+    <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.FSharp.Compiler" ExcludeAssets="contentFiles" GeneratePathProperty="true" />
     <PackageReference Include="Microsoft.Build.Framework" />
@@ -12,6 +25,10 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
   </ItemGroup>
 
+  <Target Name="ValidateMibcFile" AfterTargets="_ResolvePublishNuGetPackagePdbsAndXml">
+    <Error Condition="!Exists('$(MibcFile)')" Text="MIBC file '$(MibcFile)' does not exist." />
+  </Target>
+
    <Target Name="_ResolvePublishNuGetPackagePdbsAndXml"
         AfterTargets="_ResolveCopyLocalAssetsForPublish">
     <PropertyGroup>
@@ -29,7 +46,7 @@
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/FSharp.Core.*.nupkg" SubDir="library-packs\"/>
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/*" Exclude="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
-        <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc/*" SubDir="" />
+        <FilesToCopyFromFSharpCompilerPackage Include="$(MibcPath)/*" SubDir="" />
     </ItemGroup>
     <ItemGroup>
         <ResolvedFileToPublish

From 30905fcfb5e7e6c8b98f22c387185c634ca53a8b Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:12:12 +0200
Subject: [PATCH 03/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 97738f734a02..34b79b6c5725 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -25,7 +25,8 @@
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
   </ItemGroup>
 
-  <Target Name="ValidateMibcFile" AfterTargets="_ResolvePublishNuGetPackagePdbsAndXml">
+  <!-- MIBC don't work for SB yet: https://github.com/dotnet/source-build/issues/247 -->
+  <Target Name="ValidateMibcFile" AfterTargets="_ResolvePublishNuGetPackagePdbsAndXml" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
     <Error Condition="!Exists('$(MibcFile)')" Text="MIBC file '$(MibcFile)' does not exist." />
   </Target>
 

From e35fc5b0d902f935c2efee8e038436c9ef7ff3c1 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Thu, 29 Aug 2024 13:59:58 +0200
Subject: [PATCH 04/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 34b79b6c5725..8a8e0ba701ab 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -47,7 +47,7 @@
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/FSharp.Core.*.nupkg" SubDir="library-packs\"/>
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/$(FSharpCorePath)/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
         <FilesToCopyFromFSharpCompilerPackage Include="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/*" Exclude="$(PkgMicrosoft_FSharp_Compiler)/contentFiles/any/any/Microsoft.FSharp.Core.NetSdk.props" SubDir="" />
-        <FilesToCopyFromFSharpCompilerPackage Include="$(MibcPath)/*" SubDir="" />
+        <FilesToCopyFromFSharpCompilerPackage Include="$(MibcPath)/*" SubDir="" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
     </ItemGroup>
     <ItemGroup>
         <ResolvedFileToPublish

From d17e887f51328dbd82009023f5cabe72b971a0c8 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:00:08 +0200
Subject: [PATCH 05/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 8a8e0ba701ab..67752b20212f 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -7,14 +7,9 @@
 
   <!-- MIBC, PGO -->
   <PropertyGroup>
-    <MibcTargetOS>linux</MibcTargetOS>
-    <!-- We deliberately want to use linux mibc pgo data on macOS -->
-    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">linux</MibcTargetOS>
-    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows_nt</MibcTargetOS>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcTargetArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</MibcTargetArchitecture>
-    <MibcCurrentMachineArcitecture>$(MibcTargetOS)-$(MibcTargetArchitecture)</MibcCurrentMachineArcitecture>
-    <MibcFile>$(MibcPath)/optimization.$(MibcCurrentMachineArcitecture).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
+    <MibcId>$(NETCoreSdkRuntimeIdentifier)</MibcId>
+    <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
   </PropertyGroup>
 

From 9de7827a2769b3d8df27435f310c11aa8259c922 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:20:36 +0200
Subject: [PATCH 06/12] i hate msbuild

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 67752b20212f..ba2b552f78f3 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -8,7 +8,9 @@
   <!-- MIBC, PGO -->
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcId>$(NETCoreSdkRuntimeIdentifier)</MibcId>
+    <MibcTargetOS>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '^[^-]+').Value)</MibcTargetOS>
+    <MibcTargetArch>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '[^-]+$').Value)</MibcTargetArch>
+    <MibcId>$(MibcTargetOS)-$(MibcTargetArch)</MibcId>
     <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
   </PropertyGroup>

From 2cb2a782661592e69b53a65005164e4048e6935e Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:12:55 +0200
Subject: [PATCH 07/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index ba2b552f78f3..886b382622ff 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -9,6 +9,7 @@
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
     <MibcTargetOS>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '^[^-]+').Value)</MibcTargetOS>
+    <MibcTargetOS Condition="'$(MibcTargetOS)'=='win'">windows_nt</MibcTargetOS>
     <MibcTargetArch>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '[^-]+$').Value)</MibcTargetArch>
     <MibcId>$(MibcTargetOS)-$(MibcTargetArch)</MibcId>
     <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>

From 0abbf0287d1e4685278423aca86cf62a3c9cc33c Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 4 Sep 2024 16:21:04 +0200
Subject: [PATCH 08/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 886b382622ff..62d7ffac1536 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -10,6 +10,7 @@
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
     <MibcTargetOS>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '^[^-]+').Value)</MibcTargetOS>
     <MibcTargetOS Condition="'$(MibcTargetOS)'=='win'">windows_nt</MibcTargetOS>
+    <MibcTargetOS Condition="'$(MibcTargetOS)'=='osx'">linux</MibcTargetOS>
     <MibcTargetArch>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '[^-]+$').Value)</MibcTargetArch>
     <MibcId>$(MibcTargetOS)-$(MibcTargetArch)</MibcId>
     <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>

From 55028993e7fb99ba1c11433b32a72f4e99092326 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Mon, 9 Sep 2024 17:34:16 +0200
Subject: [PATCH 09/12] Revert stuff

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 8a8e0ba701ab..62d7ffac1536 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -7,14 +7,13 @@
 
   <!-- MIBC, PGO -->
   <PropertyGroup>
-    <MibcTargetOS>linux</MibcTargetOS>
-    <!-- We deliberately want to use linux mibc pgo data on macOS -->
-    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">linux</MibcTargetOS>
-    <MibcTargetOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows_nt</MibcTargetOS>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcTargetArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</MibcTargetArchitecture>
-    <MibcCurrentMachineArcitecture>$(MibcTargetOS)-$(MibcTargetArchitecture)</MibcCurrentMachineArcitecture>
-    <MibcFile>$(MibcPath)/optimization.$(MibcCurrentMachineArcitecture).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
+    <MibcTargetOS>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '^[^-]+').Value)</MibcTargetOS>
+    <MibcTargetOS Condition="'$(MibcTargetOS)'=='win'">windows_nt</MibcTargetOS>
+    <MibcTargetOS Condition="'$(MibcTargetOS)'=='osx'">linux</MibcTargetOS>
+    <MibcTargetArch>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '[^-]+$').Value)</MibcTargetArch>
+    <MibcId>$(MibcTargetOS)-$(MibcTargetArch)</MibcId>
+    <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
   </PropertyGroup>
 

From 9e3f3403660e6ed947c60baa241769324f46bbf0 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 11 Sep 2024 18:19:10 +0200
Subject: [PATCH 10/12] okay try this

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 62d7ffac1536..7816747bf3b7 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -8,12 +8,7 @@
   <!-- MIBC, PGO -->
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcTargetOS>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '^[^-]+').Value)</MibcTargetOS>
-    <MibcTargetOS Condition="'$(MibcTargetOS)'=='win'">windows_nt</MibcTargetOS>
-    <MibcTargetOS Condition="'$(MibcTargetOS)'=='osx'">linux</MibcTargetOS>
-    <MibcTargetArch>$([System.Text.RegularExpressions.Regex]::Match('$(NETCoreSdkRuntimeIdentifier)', '[^-]+$').Value)</MibcTargetArch>
-    <MibcId>$(MibcTargetOS)-$(MibcTargetArch)</MibcId>
-    <MibcFile>$(MibcPath)/optimization.$(MibcId).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
+    <MibcFile>$(MibcPath)/optimization.$(Rid).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
   </PropertyGroup>
 

From 925702aff7cdf09e45c4a11bb5bf7130981c2301 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:53:31 +0200
Subject: [PATCH 11/12] Update tool_fsc.csproj

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 7816747bf3b7..7a395855a45c 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <!-- MIBC, PGO -->
+  <Import Project="..\redist\targets\GetRuntimeInformation.targets" /> <!-- Rid is set here -->
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
     <MibcFile>$(MibcPath)/optimization.$(Rid).mibc.runtime/DotNet_FSharp.mibc</MibcFile>

From cb369fb9388aa9a17245ea157ddcfcaedaa0d5c8 Mon Sep 17 00:00:00 2001
From: psfinaki <psfinaki@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:20:09 +0200
Subject: [PATCH 12/12] try this maybe

---
 src/Layout/tool_fsharp/tool_fsc.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
index 7a395855a45c..d0e032fef721 100644
--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
@@ -9,7 +9,9 @@
   <Import Project="..\redist\targets\GetRuntimeInformation.targets" /> <!-- Rid is set here -->
   <PropertyGroup>
     <MibcPath>$(PkgMicrosoft_FSharp_Compiler)/contentFiles/mibc</MibcPath>
-    <MibcFile>$(MibcPath)/optimization.$(Rid).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
+    <MibcRid>$(Rid)</MibcRid>  
+    <MibcRid Condition="$(MibcRid.Contains('musl-'))">$(MibcRid.Replace('musl-', ''))</MibcRid>
+    <MibcFile>$(MibcPath)/optimization.$(MibcRid).mibc.runtime/DotNet_FSharp.mibc</MibcFile>
     <ReadyToRunOptimizationData>$(MibcFile)</ReadyToRunOptimizationData>
   </PropertyGroup>
 
@@ -21,7 +23,7 @@
   </ItemGroup>
 
   <!-- MIBC don't work for SB yet: https://github.com/dotnet/source-build/issues/247 -->
-  <Target Name="ValidateMibcFile" AfterTargets="_ResolvePublishNuGetPackagePdbsAndXml" Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+  <Target Name="ValidateMibcFile" AfterTargets="_ResolvePublishNuGetPackagePdbsAndXml" Condition="'$(DotNetBuildSourceOnly)' != 'true' AND '$(SelfContained)' == 'true'">
     <Error Condition="!Exists('$(MibcFile)')" Text="MIBC file '$(MibcFile)' does not exist." />
   </Target>