Fix race conditions when building command-line-api (#2336)

* Fix race conditions when building command-line-api

Failures observed in dotnet/installer#18762
when building command-line-api inside the VMR.

System.CommandLine was built twice, with different global properties but
to the same output path which resulted in binclashes.

* Update dotnet-suggest.Tests.csproj

* Update Directory.Build.targets

* Update dotnet-suggest.Tests.csproj

* Update dotnet-suggest.csproj

* Fixes

* Update dotnet-suggest.Tests.csproj

Author: ViktorHofer

Directory.Build.targets

@@ -13,4 +13,9 @@
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
+	<Target Name="PublishAfterBuild"
+         AfterTargets="Build"
+         DependsOnTargets="Publish"
+         Condition="'$(PublishAfterBuild)' == 'true'" />
+
 </Project>

src/System.CommandLine.Suggest.Tests/EndToEndTestApp/EndToEndTestApp.csproj

@@ -7,6 +7,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
+    <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
 </Project>

src/System.CommandLine.Suggest.Tests/dotnet-suggest.Tests.csproj

@@ -16,32 +16,12 @@
   <ItemGroup>
     <ProjectReference Include="..\System.CommandLine.Suggest\dotnet-suggest.csproj" />
     <ProjectReference Include="..\System.CommandLine.Tests\System.CommandLine.Tests.csproj" />
-  </ItemGroup>
-
-  <Target Name="DotnetSuggestIntegrationTestAssets" BeforeTargets="Build" Condition="'$(Configuration)' == 'Release'">
-    <PropertyGroup>
-      <TestAssetsPath>$([System.IO.Path]::GetFullPath('$(OutputPath)'))/TestAssets</TestAssetsPath>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
-      <Rid>win-x64</Rid>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
-      <Rid>osx-x64</Rid>
-    </PropertyGroup>
 
-    <PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
-      <Rid>linux-x64</Rid>
-    </PropertyGroup>
-
-    <MSBuild BuildInParallel="False" Projects="../System.CommandLine.Suggest/dotnet-suggest.csproj" Targets="Restore" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);ForceRestoreToEvaluateSeparately=1;Configuration=Release" />
-
-    <MSBuild BuildInParallel="False" Projects="../System.CommandLine.Suggest/dotnet-suggest.csproj" Targets="Build;Publish" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);PublishDir=$(TestAssetsPath);Configuration=Release" />
-    
-    <MSBuild BuildInParallel="False" Projects="EndToEndTestApp/EndToEndTestApp.csproj" Targets="Restore" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);ForceRestoreToEvaluateSeparately=1;Configuration=Release" />
-
-    <MSBuild BuildInParallel="False" Projects="EndToEndTestApp/EndToEndTestApp.csproj" Targets="Build;Publish" Properties="UseAppHost=true;SelfContained=false;RuntimeIdentifier=$(Rid);PublishDir=$(TestAssetsPath);Configuration=Release" />
-  </Target>
+    <!-- Sequence into build to make sure that publish assets are available for tests. -->
+    <ProjectReference Include="EndToEndTestApp/EndToEndTestApp.csproj;
+                               ../System.CommandLine.Suggest/dotnet-suggest.csproj"
+                      AdditionalProperties="SelfContained=false;RuntimeIdentifier=$(NETCoreSdkPortableRuntimeIdentifier);PublishDir=$(OutputPath)/TestAssets;PublishAfterBuild=true"
+                      ReferenceOutputAssembly="false" />
+  </ItemGroup>
 
 </Project>

src/System.CommandLine.Suggest/dotnet-suggest.csproj

@@ -18,12 +18,12 @@
 
   <PropertyGroup>
     <!--No warning for the scripts, it is part of the content, not to execuate-->
-    <NoWarn>$(NoWarn);NU5110;NU5111;</NoWarn>
+    <NoWarn>$(NoWarn);NU5110;NU5111</NoWarn>
   </PropertyGroup>
 
-
+  <!-- Remove the PublishDir global property to avoid System.CommandLine being built twice with different global properties (race condition). -->
   <ItemGroup>
-    <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />
+    <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" GlobalPropertiesToRemove="PublishDir;PublishAfterBuild" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,11 +41,4 @@
     </Content>
   </ItemGroup>
 
-  <!-- Workaround https://github.com/dotnet/arcade/issues/2233 -->
-  <Target Name="_InitializeAssemblyVersion" BeforeTargets="GetAssemblyVersion">
-    <PropertyGroup>
-      <FileVersion></FileVersion>
-    </PropertyGroup>
-  </Target>
-
 </Project>