From 89ccf86e8dcf8001e1108373d5481ceb7c1e3b04 Mon Sep 17 00:00:00 2001
From: Jo Shields <joshield@microsoft.com>
Date: Tue, 24 Sep 2024 11:52:05 -0400
Subject: [PATCH] Always override RID in aspnetcore build, not SB-only

This was mistakenly restricted to source-build-only builds, resulting in incorrect RID being used for Musl VMR builds

Closes: https://github.com/dotnet/source-build/issues/4628
---
 src/SourceBuild/content/repo-projects/aspnetcore.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj
index 007f9a6432d8..b8baca71ec8f 100644
--- a/src/SourceBuild/content/repo-projects/aspnetcore.proj
+++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj
@@ -11,6 +11,7 @@
     <BuildActions Condition="'$(BuildOS)' != 'windows'">$(BuildActions) $(FlagParameterPrefix)no-build-java</BuildActions>
 
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture)</BuildArgs>
+    <BuildArgs>$(BuildArgs) /p:TargetRuntimeIdentifier=$(TargetRid)</BuildArgs>
     <ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>
 
     <LogVerbosityOptOut>true</LogVerbosityOptOut>
@@ -18,7 +19,6 @@
 
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <BuildArgs>$(BuildArgs) /p:PortableBuild=$(PortableBuild)</BuildArgs>
-    <BuildArgs>$(BuildArgs) /p:TargetRuntimeIdentifier=$(TargetRid)</BuildArgs>
     <BuildArgs>$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
   </PropertyGroup>