Fix race generating Microsoft.Managed.Core.CurrentVersions.targets (#…

…76701)
dotnet · Jan 10, 2025 · 71681a6 · 71681a6
1 parent 4d3377d
commit 71681a6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
@@ -76,15 +76,15 @@
   </ItemGroup>
 
   <!-- Generate a .targets file that sets $(CompilerApiVersion) to the current Roslyn version -->
-  <PropertyGroup>
-    <CompilerVersionTargetsFileIntermediatePath>$(IntermediateOutputPath)Microsoft.Managed.Core.CurrentVersions.targets</CompilerVersionTargetsFileIntermediatePath>
-  </PropertyGroup>
+  <ItemGroup>
+    <CompilerVersionTargetsFile Include="$(IntermediateOutputPath)Microsoft.Managed.Core.CurrentVersions.targets" />
+  </ItemGroup>
 
   <Target Name="GenerateCompilerVersionTargets"
           BeforeTargets="AssignTargetPaths"
           DependsOnTargets="GenerateCompilerVersionTargetsFile">
     <ItemGroup>
-      <Content Include="$(CompilerVersionTargetsFileIntermediatePath)">
+      <Content Include="@(CompilerVersionTargetsFile)">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         <Pack>true</Pack>
         <BuildAction>None</BuildAction>
@@ -95,7 +95,7 @@
   </Target>
 
   <Target Name="GenerateCompilerVersionTargetsFile"
-          Outputs="$(CompilerVersionTargetsFileIntermediatePath)">
+          Outputs="@(CompilerVersionTargetsFile)">
 
     <PropertyGroup>
       <_CompilerApiVersion>$([System.Version]::Parse($(VersionPrefix)).Major).$([System.Version]::Parse($(VersionPrefix)).Minor)</_CompilerApiVersion>
@@ -108,7 +108,7 @@
       </_CompilerVersionTargetsFileContent>
     </PropertyGroup>
 
-    <WriteLinesToFile File="$(CompilerVersionTargetsFileIntermediatePath)"
+    <WriteLinesToFile File="@(CompilerVersionTargetsFile)"
                       Lines="$(_CompilerVersionTargetsFileContent)"
                       Overwrite="true"
                       WriteOnlyWhenDifferent="true" />