From 619b3bc6acd0812894f11e094bab0e69a0367cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Fri, 5 Jan 2024 05:52:25 +0100
Subject: [PATCH] Rename _RidFanOut to IsOuterBuild and make it a public
 property.

Closes #68.
---
 src/sdk/build/Vezel.Zig.Sdk.Build.targets     |  8 ++++----
 src/sdk/build/Vezel.Zig.Sdk.Clean.targets     |  8 ++++----
 src/sdk/build/Vezel.Zig.Sdk.Overrides.targets |  8 ++++----
 src/sdk/build/Vezel.Zig.Sdk.Publish.targets   | 10 +++++-----
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/sdk/build/Vezel.Zig.Sdk.Build.targets b/src/sdk/build/Vezel.Zig.Sdk.Build.targets
index 1373938..ccc61d6 100644
--- a/src/sdk/build/Vezel.Zig.Sdk.Build.targets
+++ b/src/sdk/build/Vezel.Zig.Sdk.Build.targets
@@ -1,14 +1,14 @@
 <Project>
     <PropertyGroup>
-        <_RealOrFanOutBuild>_InnerBuild</_RealOrFanOutBuild>
-        <_RealOrFanOutBuild Condition="'$(_RidFanOut)' == 'true'">_FanOutBuild</_RealOrFanOutBuild>
+        <_InnerOrOuterBuild>_InnerBuild</_InnerOrOuterBuild>
+        <_InnerOrOuterBuild Condition="'$(IsOuterBuild)' == 'true'">_OuterBuild</_InnerOrOuterBuild>
     </PropertyGroup>
 
     <Target Name="Build"
-            DependsOnTargets="$(_RealOrFanOutBuild)"
+            DependsOnTargets="$(_InnerOrOuterBuild)"
             Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
 
-    <Target Name="_FanOutBuild">
+    <Target Name="_OuterBuild">
         <ItemGroup>
             <_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
             <_InnerProjects Include="$(MSBuildProjectFullPath)"
diff --git a/src/sdk/build/Vezel.Zig.Sdk.Clean.targets b/src/sdk/build/Vezel.Zig.Sdk.Clean.targets
index b2ce377..48e1c20 100644
--- a/src/sdk/build/Vezel.Zig.Sdk.Clean.targets
+++ b/src/sdk/build/Vezel.Zig.Sdk.Clean.targets
@@ -5,15 +5,15 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <_RealOrFanOutClean>_InnerClean</_RealOrFanOutClean>
-        <_RealOrFanOutClean Condition="'$(_RidFanOut)' == 'true'">_FanOutClean</_RealOrFanOutClean>
+        <_InnerOrOuterClean>_InnerClean</_InnerOrOuterClean>
+        <_InnerOrOuterClean Condition="'$(IsOuterBuild)' == 'true'">_OuterClean</_InnerOrOuterClean>
     </PropertyGroup>
 
     <Target Name="Clean"
-            DependsOnTargets="$(_RealOrFanOutClean)"
+            DependsOnTargets="$(_InnerOrOuterClean)"
             Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
 
-    <Target Name="_FanOutClean">
+    <Target Name="_OuterClean">
         <ItemGroup>
             <_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
             <_InnerProjects Include="$(MSBuildProjectFullPath)"
diff --git a/src/sdk/build/Vezel.Zig.Sdk.Overrides.targets b/src/sdk/build/Vezel.Zig.Sdk.Overrides.targets
index e3b769a..70a3f27 100644
--- a/src/sdk/build/Vezel.Zig.Sdk.Overrides.targets
+++ b/src/sdk/build/Vezel.Zig.Sdk.Overrides.targets
@@ -18,13 +18,13 @@
 
     <!--
     If a RuntimeIdentifier value has not been set, it means the Build, Clean,
-    and Publish targets should fan out and run for every RID supported by the
+    and Publish targets should run inner builds for every RID supported by the
     project. That said, for running and testing, we still need to run natively
-    by default, so we still have to set a default RID. We use _RidFanOut to
-    indicate whether the fan-out behavior is required.
+    by default, so we still have to set a default RID. We use IsOuterBuild to
+    indicate whether inner builds are required.
     -->
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
         <RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
-        <_RidFanOut>true</_RidFanOut>
+        <IsOuterBuild>true</IsOuterBuild>
     </PropertyGroup>
 </Project>
diff --git a/src/sdk/build/Vezel.Zig.Sdk.Publish.targets b/src/sdk/build/Vezel.Zig.Sdk.Publish.targets
index cf87242..d40c4e3 100644
--- a/src/sdk/build/Vezel.Zig.Sdk.Publish.targets
+++ b/src/sdk/build/Vezel.Zig.Sdk.Publish.targets
@@ -1,14 +1,14 @@
 <Project>
     <PropertyGroup>
-        <_RealOrFanOutPublish>_InnerPublish</_RealOrFanOutPublish>
-        <_RealOrFanOutPublish Condition="'$(_RidFanOut)' == 'true'">_FanOutPublish</_RealOrFanOutPublish>
+        <_InnerOrOuterPublish>_InnerPublish</_InnerOrOuterPublish>
+        <_InnerOrOuterPublish Condition="'$(IsOuterBuild)' == 'true'">_OuterPublish</_InnerOrOuterPublish>
     </PropertyGroup>
 
     <Target Name="Publish"
-            DependsOnTargets="$(_RealOrFanOutPublish)"
+            DependsOnTargets="$(_InnerOrOuterPublish)"
             Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
 
-    <Target Name="_FanOutPublish">
+    <Target Name="_OuterPublish">
         <ItemGroup>
             <_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
             <_InnerProjects Include="$(MSBuildProjectFullPath)"
@@ -32,6 +32,6 @@
                  Importance="high" />
 
         <AllowEmptyTelemetry EventName="PublishProperties"
-                             EventData="PublishReadyToRun=$(PublishReadyToRun); PublishTrimmed=$(PublishTrimmed); PublishSingleFile=$(PublishSingleFile)" />
+                             EventData="PublishReadyToRun=$(PublishReadyToRun); PublishTrimmed=$(PublishTrimmed); PublishSingleFile=$(PublishSingleFile); PublishAot=$(PublishAot); PublishProtocol=$(PublishProtocol)" />
     </Target>
 </Project>