Consolidate external repo versions into Versions.props

eng/Versions.props

@@ -8,4 +8,18 @@
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <AbstractionsXunitReleaseVersion>2.0.3</AbstractionsXunitReleaseVersion>
+    <AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.1.2</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
+    <CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
+    <HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
+    <MSBuildLocatorReleaseVersion>1.6.10</MSBuildLocatorReleaseVersion>
+    <SpectreConsoleReleaseVersion>0.48.0</SpectreConsoleReleaseVersion>
+    <XunitReleaseVersion>2.4.2</XunitReleaseVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
+  </PropertyGroup>
 </Project>

eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj

@@ -6,18 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Framework">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Tasks.Core">
-      <Version>15.7.179</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Utilities.Core">
-      <Version>15.7.179</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
   </ItemGroup>
 
   <ItemGroup>

repo-projects/MSBuildLocator.proj

@@ -16,7 +16,7 @@
       <BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs>
-      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=1.6.10</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(MSBuildLocatorReleaseVersion)</BuildCommandArgs>
     </PropertyGroup>
 
     <Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(BuildCommandArgs)"

repo-projects/abstractions-xunit.proj

@@ -12,7 +12,7 @@
       <PropertyGroup>
         <BuildCommandArgs>$(ProjectDirectory)/xunit.abstractions.sln</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
-        <BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=2.0.3</BuildCommandArgs>
+        <BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(AbstractionsXunitReleaseVersion)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:AssemblyOriginatorKeyFile=$(XunitAbstractionsKeyFilePath)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:SignAssembly=true</BuildCommandArgs>
@@ -38,4 +38,4 @@
     </Target>
 
   </Project>
-  
+

repo-projects/azure-activedirectory-identitymodel-extensions-for-dotnet.proj

@@ -18,7 +18,7 @@
       <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
-      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.1.2</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion)</BuildCommandArgs>
 
       <PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
     </PropertyGroup>

repo-projects/cssparser.proj

@@ -13,7 +13,7 @@
       <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
-      <BuildCommandArgs>$(BuildCommandArgs) /p:VersionSuffix=20230414.1</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:VersionSuffix=$(CssParserReleaseVersionSuffix)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
     </PropertyGroup>

repo-projects/docker-creds-provider-2.2.0.proj

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DockerCredsProviderPackageVersion>2.2.0</DockerCredsProviderPackageVersion>
+    <DockerCredsProviderReleaseVersion>2.2.0</DockerCredsProviderReleaseVersion>
   </PropertyGroup>
 
   <Import Project="docker-creds-provider.targets" />

repo-projects/docker-creds-provider-2.2.1.proj

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DockerCredsProviderPackageVersion>2.2.1</DockerCredsProviderPackageVersion>
+    <DockerCredsProviderReleaseVersion>2.2.1</DockerCredsProviderReleaseVersion>
   </PropertyGroup>
 
   <Import Project="docker-creds-provider.targets" />

repo-projects/docker-creds-provider.targets

@@ -17,7 +17,7 @@
       <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
-      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(DockerCredsProviderPackageVersion)</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(DockerCredsProviderReleaseVersion)</BuildCommandArgs>
       <BuildCommandArgs>$(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent)</BuildCommandArgs>
     </PropertyGroup>
 

repo-projects/humanizer.proj

@@ -4,7 +4,6 @@
   <PropertyGroup>
     <PackagesOutput>$(ProjectDirectory)/src/Humanizer/bin/Release</PackagesOutput>
     <NuGetConfigFile>$(ProjectDirectory)/src/NuGet.config</NuGetConfigFile>
-    <HumanizerCorePackageVersion>2.14.1</HumanizerCorePackageVersion>
   </PropertyGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
@@ -21,7 +20,7 @@
       <PackCommandArgs>$(BuildCommandArgs)</PackCommandArgs>
       <PackCommandArgs>$(PackCommandArgs) /p:NuspecFile=$(ProjectDirectory)NuSpecs/Humanizer.Core.nuspec</PackCommandArgs>
       <PackCommandArgs>$(PackCommandArgs) /p:NuspecBasePath=$(ProjectDirectory)src/</PackCommandArgs>
-      <PackCommandArgs>$(PackCommandArgs) /p:NuspecProperties=Version=$(HumanizerCorePackageVersion)</PackCommandArgs>
+      <PackCommandArgs>$(PackCommandArgs) /p:NuspecProperties=Version=$(HumanizerReleaseVersion)</PackCommandArgs>
     </PropertyGroup>
 
     <Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(BuildCommandArgs) $(RedirectRepoOutputToLog)"

repo-projects/spectre-console.proj

@@ -3,7 +3,6 @@
 
     <PropertyGroup>
       <PackagesOutput>$(ProjectDirectory)/src/Spectre.Console/bin/$(Configuration)/</PackagesOutput>
-      <SpectreConsolePackageVersion>0.48.0</SpectreConsolePackageVersion>
 
       <!-- Defining this ensures global.json gets rewritten to target the current SDK version -->
       <GlobalJsonFile>$(ProjectDirectory)/global.json</GlobalJsonFile>
@@ -17,7 +16,7 @@
         <BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
-        <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(SpectreConsolePackageVersion)</BuildCommandArgs>
+        <BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(SpectreConsoleReleaseVersion)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent)</BuildCommandArgs>
       </PropertyGroup>
 
@@ -38,4 +37,4 @@
     </Target>
 
   </Project>
-  
+

repo-projects/xunit.proj

@@ -14,9 +14,8 @@
     <Target Name="RepoBuild">
       <PropertyGroup>
         <BuildAndRestoreProject>$(ProjectDirectory)/xunit-notests.slnf</BuildAndRestoreProject>
-        <XunitVersion>2.4.2</XunitVersion>
         <BuildCommandArgs>/p:Configuration=$(Configuration)</BuildCommandArgs>
-        <BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(XunitVersion)</BuildCommandArgs>
+        <BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(XunitReleaseVersion)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
         <BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
@@ -31,7 +30,7 @@
            two separate items in the item group -->
       <ItemGroup>
         <PackEnvironmentVariables Include="@(EnvironmentVariables)" />
-        <PackEnvironmentVariables Include="NuspecProperties=PackageVersion=$(XunitVersion)%3BConfiguration=$(Configuration)"/>
+        <PackEnvironmentVariables Include="NuspecProperties=PackageVersion=$(XunitReleaseVersion)%3BConfiguration=$(Configuration)"/>
 
         <PackProjectAndNuspec Include="$(ProjectDirectory)/src/xunit.execution/xunit.execution.csproj">
           <NuspecFile>$(ProjectDirectory)/src/xunit.extensibility.execution.nuspec</NuspecFile>
@@ -69,4 +68,4 @@
     </Target>
 
   </Project>
-  
+