Skip to content

Commit c763a70

Browse files
omajidomajid
committed
Consolidate external repo versions into Versions.props
Fixes: dotnet/source-build#3897
1 parent 16ece46 commit c763a70

12 files changed

+32
-29
lines changed

‎eng/Versions.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,18 @@
88
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
99
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1010
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<AbstractionsXunitReleaseVersion>2.0.3</AbstractionsXunitReleaseVersion>
14+
<AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>7.1.2</AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion>
15+
<CssParserReleaseVersionSuffix>20230414.1</CssParserReleaseVersionSuffix>
16+
<HumanizerReleaseVersion>2.14.1</HumanizerReleaseVersion>
17+
<MSBuildLocatorReleaseVersion>1.6.10</MSBuildLocatorReleaseVersion>
18+
<SpectreConsoleReleaseVersion>0.48.0</SpectreConsoleReleaseVersion>
19+
<XunitReleaseVersion>2.4.2</XunitReleaseVersion>
20+
</PropertyGroup>
21+
22+
<PropertyGroup>
23+
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
24+
</PropertyGroup>
1125
</Project>

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Build">
10-
<Version>15.7.179</Version>
11-
</PackageReference>
12-
<PackageReference Include="Microsoft.Build.Framework">
13-
<Version>15.7.179</Version>
14-
</PackageReference>
15-
<PackageReference Include="Microsoft.Build.Tasks.Core">
16-
<Version>15.7.179</Version>
17-
</PackageReference>
18-
<PackageReference Include="Microsoft.Build.Utilities.Core">
19-
<Version>15.7.179</Version>
20-
</PackageReference>
9+
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
10+
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
11+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
12+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
2113
</ItemGroup>
2214

2315
<ItemGroup>

‎repo-projects/MSBuildLocator.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:EnablePackageValidation=false</BuildCommandArgs>
19-
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=1.6.10</BuildCommandArgs>
19+
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(MSBuildLocatorReleaseVersion)</BuildCommandArgs>
2020
</PropertyGroup>
2121

2222
<Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(BuildCommandArgs)"

‎repo-projects/abstractions-xunit.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PropertyGroup>
1313
<BuildCommandArgs>$(ProjectDirectory)/xunit.abstractions.sln</BuildCommandArgs>
1414
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
15-
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=2.0.3</BuildCommandArgs>
15+
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(AbstractionsXunitReleaseVersion)</BuildCommandArgs>
1616
<BuildCommandArgs>$(BuildCommandArgs) /p:AssemblyOriginatorKeyFile=$(XunitAbstractionsKeyFilePath)</BuildCommandArgs>
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:SignAssembly=true</BuildCommandArgs>
@@ -38,4 +38,4 @@
3838
</Target>
3939

4040
</Project>
41-
41+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1919
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
2020
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
21-
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=7.1.2</BuildCommandArgs>
21+
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(AzureActiveDirectoryIdentityModelExtensionsForDotNetReleaseVersion)</BuildCommandArgs>
2222

2323
<PackCommandArgs>$(BuildCommandArgs) --output $(ProjectDirectory)pack</PackCommandArgs>
2424
</PropertyGroup>

‎repo-projects/cssparser.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1414
<BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
1515
<BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
16-
<BuildCommandArgs>$(BuildCommandArgs) /p:VersionSuffix=20230414.1</BuildCommandArgs>
16+
<BuildCommandArgs>$(BuildCommandArgs) /p:VersionSuffix=$(CssParserReleaseVersionSuffix)</BuildCommandArgs>
1717
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
1919
</PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<DockerCredsProviderPackageVersion>2.2.0</DockerCredsProviderPackageVersion>
3+
<DockerCredsProviderReleaseVersion>2.2.0</DockerCredsProviderReleaseVersion>
44
</PropertyGroup>
55

66
<Import Project="docker-creds-provider.targets" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<DockerCredsProviderPackageVersion>2.2.1</DockerCredsProviderPackageVersion>
3+
<DockerCredsProviderReleaseVersion>2.2.1</DockerCredsProviderReleaseVersion>
44
</PropertyGroup>
55

66
<Import Project="docker-creds-provider.targets" />

‎repo-projects/docker-creds-provider.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1818
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
1919
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
20-
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(DockerCredsProviderPackageVersion)</BuildCommandArgs>
20+
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(DockerCredsProviderReleaseVersion)</BuildCommandArgs>
2121
<BuildCommandArgs>$(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent)</BuildCommandArgs>
2222
</PropertyGroup>
2323

‎repo-projects/humanizer.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<PropertyGroup>
55
<PackagesOutput>$(ProjectDirectory)/src/Humanizer/bin/Release</PackagesOutput>
66
<NuGetConfigFile>$(ProjectDirectory)/src/NuGet.config</NuGetConfigFile>
7-
<HumanizerCorePackageVersion>2.14.1</HumanizerCorePackageVersion>
87
</PropertyGroup>
98

109
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
@@ -21,7 +20,7 @@
2120
<PackCommandArgs>$(BuildCommandArgs)</PackCommandArgs>
2221
<PackCommandArgs>$(PackCommandArgs) /p:NuspecFile=$(ProjectDirectory)NuSpecs/Humanizer.Core.nuspec</PackCommandArgs>
2322
<PackCommandArgs>$(PackCommandArgs) /p:NuspecBasePath=$(ProjectDirectory)src/</PackCommandArgs>
24-
<PackCommandArgs>$(PackCommandArgs) /p:NuspecProperties=Version=$(HumanizerCorePackageVersion)</PackCommandArgs>
23+
<PackCommandArgs>$(PackCommandArgs) /p:NuspecProperties=Version=$(HumanizerReleaseVersion)</PackCommandArgs>
2524
</PropertyGroup>
2625

2726
<Exec Command="$(DotnetToolCommand) restore /bl:restore.binlog $(BuildCommandArgs) $(RedirectRepoOutputToLog)"

‎repo-projects/spectre-console.proj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
<PropertyGroup>
55
<PackagesOutput>$(ProjectDirectory)/src/Spectre.Console/bin/$(Configuration)/</PackagesOutput>
6-
<SpectreConsolePackageVersion>0.48.0</SpectreConsolePackageVersion>
76

87
<!-- Defining this ensures global.json gets rewritten to target the current SDK version -->
98
<GlobalJsonFile>$(ProjectDirectory)/global.json</GlobalJsonFile>
@@ -17,7 +16,7 @@
1716
<BuildCommandArgs>$(BuildCommandArgs) /p:Configuration=$(Configuration)</BuildCommandArgs>
1817
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
1918
<BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
20-
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(SpectreConsolePackageVersion)</BuildCommandArgs>
19+
<BuildCommandArgs>$(BuildCommandArgs) /p:Version=$(SpectreConsoleReleaseVersion)</BuildCommandArgs>
2120
<BuildCommandArgs>$(BuildCommandArgs) /p:TargetFrameworks=$(NetCurrent)</BuildCommandArgs>
2221
</PropertyGroup>
2322

@@ -38,4 +37,4 @@
3837
</Target>
3938

4039
</Project>
41-
40+

‎repo-projects/xunit.proj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
<Target Name="RepoBuild">
1515
<PropertyGroup>
1616
<BuildAndRestoreProject>$(ProjectDirectory)/xunit-notests.slnf</BuildAndRestoreProject>
17-
<XunitVersion>2.4.2</XunitVersion>
1817
<BuildCommandArgs>/p:Configuration=$(Configuration)</BuildCommandArgs>
19-
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(XunitVersion)</BuildCommandArgs>
18+
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageVersion=$(XunitReleaseVersion)</BuildCommandArgs>
2019
<BuildCommandArgs>$(BuildCommandArgs) /p:DelaySign=$(DelaySign)</BuildCommandArgs>
2120
<BuildCommandArgs>$(BuildCommandArgs) /p:PublicSign=$(PublicSign)</BuildCommandArgs>
2221
<BuildCommandArgs>$(BuildCommandArgs) /v:$(LogVerbosity)</BuildCommandArgs>
@@ -31,7 +30,7 @@
3130
two separate items in the item group -->
3231
<ItemGroup>
3332
<PackEnvironmentVariables Include="@(EnvironmentVariables)" />
34-
<PackEnvironmentVariables Include="NuspecProperties=PackageVersion=$(XunitVersion)%3BConfiguration=$(Configuration)"/>
33+
<PackEnvironmentVariables Include="NuspecProperties=PackageVersion=$(XunitReleaseVersion)%3BConfiguration=$(Configuration)"/>
3534

3635
<PackProjectAndNuspec Include="$(ProjectDirectory)/src/xunit.execution/xunit.execution.csproj">
3736
<NuspecFile>$(ProjectDirectory)/src/xunit.extensibility.execution.nuspec</NuspecFile>
@@ -69,4 +68,4 @@
6968
</Target>
7069

7170
</Project>
72-
71+

0 commit comments

Comments
 (0)