[ci] Fix versions again when no sha provided

dotnet · Feb 27, 2024 · 3b442b2 · 3b442b2
1 parent e109469
commit 3b442b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/eng/Versions.targets b/eng/Versions.targets
@@ -57,12 +57,12 @@
       <GitSemVerDashLabel Condition="'$(GitSemVerLabel)' != ''" >-$(GitSemVerLabel)</GitSemVerDashLabel>
     </PropertyGroup>
     <ItemGroup>
-      <VersionMetadata Include="$(GitCommits)" Condition="'$(GitSemVerDashLabel)' == ''" />
+      <VersionMetadata Condition="'$(GitSemVerDashLabel)' == '' and '$(GitCommits)' != ''" Include="$(GitCommits)" />
 
       <VersionMetadata Condition="$(CI) and '$(BUILD_REASON)' == 'PullRequest'"
                        Include="pr.$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)"/>
 
-      <VersionMetadata Include="sha.$(GitCommit)"/>
+      <VersionMetadata Condition="'$(GitCommit)' != ''"  Include="sha.$(GitCommit)"/>
 
       <VersionMetadata Condition="$(CI)"
                        Include="azdo.$(BUILD_BUILDID)"/>