From 83f20850140568e2a4018b23b5efde10755b1ab0 Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Fri, 13 Sep 2024 11:04:20 -0700
Subject: [PATCH] Support net9+ VMR properties We want to remove the old source
 build properties from VMR builds in net10. This repo is still on net8, which
 is fine. Adding support for the net9+ properties will enable removal of
 support for the old properties in .NET 10 Arcade.

---
 eng/Build.props                         | 2 +-
 eng/apicompat/PublicApiAnalyzer.targets | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 86ed7c175cf..d105e934cc8 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <!-- When building from source, we want to use the live repo contents as opposed to cloning the repo. -->
-  <PropertyGroup Condition="'$(ArcadeBuildFromSource)' == 'true'">
+  <PropertyGroup Condition="'$(ArcadeBuildFromSource)' == 'true' or '$(DotNetBuildRepo)' == 'true'">
     <CopySrcInsteadOfClone>true</CopySrcInsteadOfClone>
   </PropertyGroup>
 </Project>
diff --git a/eng/apicompat/PublicApiAnalyzer.targets b/eng/apicompat/PublicApiAnalyzer.targets
index 19d5483bcfe..81ca3e242e4 100644
--- a/eng/apicompat/PublicApiAnalyzer.targets
+++ b/eng/apicompat/PublicApiAnalyzer.targets
@@ -1,9 +1,9 @@
 <Project>
 
-  <ItemGroup Condition="'$(UsePublicApiAnalyzers)' == 'true' AND '$(DotNetBuildFromSource)' != 'true'">
+  <ItemGroup Condition="'$(UsePublicApiAnalyzers)' == 'true' AND '$(DotNetBuildFromSource)' != 'true' AND '$(DotNetBuildSourceOnly)' != 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" ExcludeAssets="Compile" PrivateAssets="All" />
     <AdditionalFiles Include="$(ProjectDir)PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="$(ProjectDir)PublicAPI.Unshipped.txt" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>