Fix publishing in official build

Commit migrated from https://github.com/dotnet/coreclr/commit/79c3f85963a3447cbf349c421a78e2a585a8dafe

diff --git a/src/coreclr/src/publishwitharcade.proj b/src/coreclr/src/publishwitharcade.proj
index f5129c3..b88b54f 100644 (file)
--- a/src/coreclr/src/publishwitharcade.proj
+++ b/src/coreclr/src/publishwitharcade.proj
@@ -1,11 +1,11 @@
 <Project DefaultTargets="PublishPackages">
 
-  <!-- TODO: move properties imported from here into a common props file -->
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <!-- Publishing should always use Arcade -->
+  <PropertyGroup>
+    <ArcadeBuild>true</ArcadeBuild>
+  </PropertyGroup>
 
-  <!-- Use an explicit SDK import so that arcade uses the build
-       configuration computed in dir.common.props. -->
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="Directory.Build.props" />
 
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />