sdk: converge slnf-direct and transitive cache keys in single-API mode

Parallel MSBuild was racing on obj/ outputs because Stride.Games (and other API-dep projects) ended up with two cache entries per TF: one from the slnf's direct Build (AdditionalProperties included StrideGraphicsApi) and one from transitive dispatches (where the singular never made it through). Two cache entries → two real compiles → same obj path → race.

In single-API builds the singular StrideGraphicsApi is redundant information — the plural already pins the API. Strip it at ProjectReference evaluation time via ItemDefinitionGroup, and drop it from the inner-build AdditionalProperties too. Both paths now converge on one cache key per (project, TF); the inner reads the singular locally from StrideGraphicsApis when it needs it.

Multi-API mode (StrideGraphicsApiDependentBuildAll=true) keeps the singular as a cache-key differentiator, with the strip disabled and the SetTargetFramework augmentation preserved for transitive dispatches. The target uses Update (not Remove+Include) so existing metadata — SetTargetFramework from _GetProjectReferenceTargetFrameworkProperties, GlobalPropertiesToRemove from the ItemDefinitionGroup — survives.

Author: xen2

sources/sdk/Stride.Build.Sdk/Sdk/Stride.GraphicsApi.InnerBuild.targets

@@ -69,37 +69,36 @@
       <Output ItemName="_StrideGraphicsApisItems" TaskParameter="TargetOutputs" />
     </MSBuild>
 
-    <!-- Create one inner build per TFM x API combination -->
+    <!-- Create one inner build per TFM (single-API) or per TFMxAPI (multi-API).
+         StrideGraphicsApi is only added to AdditionalProperties in multi-API mode; in single-API
+         mode the inner evaluates it from StrideGraphicsApis locally, keeping the cache key
+         identical to transitive dispatches (which can't reliably propagate it via SetTargetFramework). -->
     <ItemGroup Condition="'$(StrideGraphicsApiDependent)' == 'true'">
       <_TargetFrameworkWithStrideGraphicsApi Include="@(_StrideGraphicsApisItems->'%(OriginalItemSpec)')" StrideGraphicsApi="%(_StrideGraphicsApisItems.Identity)" />
       <_InnerBuildProjects Include="$(MSBuildProjectFile)">
         <AdditionalProperties Condition="'%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApiDependent)' != 'true'">TargetFramework=%(_TargetFrameworkWithStrideGraphicsApi.TargetFramework)</AdditionalProperties>
-        <AdditionalProperties Condition="'%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApiDependent)' == 'true'">TargetFramework=%(_TargetFrameworkWithStrideGraphicsApi.TargetFramework);StrideGraphicsApi=%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApi)</AdditionalProperties>
+        <AdditionalProperties Condition="'%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApiDependent)' == 'true' And '$(StrideGraphicsApiDependentBuildAll)' != 'true'">TargetFramework=%(_TargetFrameworkWithStrideGraphicsApi.TargetFramework)</AdditionalProperties>
+        <AdditionalProperties Condition="'%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApiDependent)' == 'true' And '$(StrideGraphicsApiDependentBuildAll)' == 'true'">TargetFramework=%(_TargetFrameworkWithStrideGraphicsApi.TargetFramework);StrideGraphicsApi=%(_TargetFrameworkWithStrideGraphicsApi.StrideGraphicsApi)</AdditionalProperties>
       </_InnerBuildProjects>
     </ItemGroup>
   </Target>
 
   <!-- ================================================================ -->
   <!-- Project reference Graphics API propagation                       -->
   <!-- ================================================================ -->
-  <!-- Detects if referenced projects are StrideGraphicsApiDependent
-       and injects StrideGraphicsApi into their SetTargetFramework.
-       For non-dependent references, removes StrideGraphicsApi to
-       prevent unnecessary rebuilds. -->
+  <!-- Detects which referenced projects are StrideGraphicsApiDependent and stamps that
+       metadata. Also strips StrideGraphicsApi from all ProjectReferences at evaluation time
+       so the singular property never flows through as a global, keeping slnf-direct and
+       transitive dispatches on the same project-instance cache key. -->
   <Target Name="_StrideQueryGraphicsApiDependent" Returns="@(_StrideGraphicsApiDependentItemsInternal)" Condition="'$(StrideProjectType)' != 'Cpp'">
     <ItemGroup>
       <_StrideGraphicsApiDependentItemsInternal Include="stride_fake_graphics_api" StrideGraphicsApiDependent="$(StrideGraphicsApiDependent)" />
     </ItemGroup>
   </Target>
 
-  <!-- Evaluation-time strip so both _GetProjectReferenceTargetFrameworkProperties (the TFM
-       query) and the main Build dispatch honour it — target-time metadata set in
-       _StrideProjectReferenceGraphicsApiDependent runs too late for the TFM query. Stripped
-       unconditionally; API-dependent references re-add StrideGraphicsApi via SetTargetFramework
-       at target time (see lines below), which is applied as Properties by the dispatcher. -->
-  <ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(StrideGraphicsApiDependentBuildAll)' != 'true'">
     <ProjectReference>
-      <GlobalPropertiesToRemove>%(ProjectReference.GlobalPropertiesToRemove);StrideGraphicsApi;StrideGraphicsApis;StrideGraphicsApiDependent;StrideGraphicsApiDependentBuildAll;StridePlatform;StridePlatforms;StrideNativeBuildMode;StrideTestRuntimeIdentifier;StrideSkipAutoPack</GlobalPropertiesToRemove>
+      <GlobalPropertiesToRemove>%(ProjectReference.GlobalPropertiesToRemove);StrideGraphicsApi</GlobalPropertiesToRemove>
     </ProjectReference>
   </ItemDefinitionGroup>
 
@@ -123,12 +122,17 @@
       <_StrideGraphicsApiCurrent Condition="'$(_StrideGraphicsApiCurrent)' == ''">Direct3D11</_StrideGraphicsApiCurrent>
     </PropertyGroup>
     <ItemGroup>
-      <_MSBuildProjectReferenceExistent Remove="@(_StrideGraphicsApiDependentItems->'%(OriginalItemSpec)')" />
-      <_MSBuildProjectReferenceExistent Include="@(_StrideGraphicsApiDependentItems->'%(OriginalItemSpec)')" Condition="'%(_StrideGraphicsApiDependentItems.StrideGraphicsApiDependent)' != 'true'" />
-      <_MSBuildProjectReferenceExistent Include="@(_StrideGraphicsApiDependentItems->'%(OriginalItemSpec)')" Condition="'%(_StrideGraphicsApiDependentItems.StrideGraphicsApiDependent)' == 'true'">
+      <!-- Stamp StrideGraphicsApiDependent per ref, then (in multi-API mode only) augment
+           API-dep refs so inner-build dispatches match the slnf-direct cache key. In single-API
+           mode the singular StrideGraphicsApi is computed locally by the inner from the plural. -->
+      <_MSBuildProjectReferenceExistent Update="@(_StrideGraphicsApiDependentItems->'%(OriginalItemSpec)')">
         <StrideGraphicsApiDependent>%(_StrideGraphicsApiDependentItems.StrideGraphicsApiDependent)</StrideGraphicsApiDependent>
+      </_MSBuildProjectReferenceExistent>
+    </ItemGroup>
+    <ItemGroup Condition="'$(StrideGraphicsApiDependentBuildAll)' == 'true'">
+      <_MSBuildProjectReferenceExistent Update="@(_MSBuildProjectReferenceExistent)" Condition="'%(_MSBuildProjectReferenceExistent.StrideGraphicsApiDependent)' == 'true'">
         <StrideGraphicsApi>$(_StrideGraphicsApiCurrent)</StrideGraphicsApi>
-        <SetTargetFramework>%(_StrideGraphicsApiDependentItems.SetTargetFramework);StrideGraphicsApi=$(_StrideGraphicsApiCurrent)</SetTargetFramework>
+        <SetTargetFramework>%(_MSBuildProjectReferenceExistent.SetTargetFramework);StrideGraphicsApi=$(_StrideGraphicsApiCurrent)</SetTargetFramework>
       </_MSBuildProjectReferenceExistent>
     </ItemGroup>
   </Target>