Skip to content

Commit 6a047ef

Browse files
NickCraverNickCraver
authored
Solution: Centralized package versions and test/toy dependency updates (#2034)
This migrates to Directory.Pacakges.props and bumps versions of things we don't want to cause binding redirect pain on.
1 parent ffebc58 commit 6a047ef

10 files changed

+40
-37
lines changed

‎.github/.github.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<Project Sdk="Microsoft.Build.NoTargets/1.0.94">
1+
<Project Sdk="Microsoft.Build.NoTargets/3.3.0">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
55
</Project>

‎Directory.Build.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<IncludeSymbols>false</IncludeSymbols>
2626
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2727
<IsPackable>false</IsPackable>
28+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
2829
</PropertyGroup>
2930
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
3031
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
@@ -35,6 +36,6 @@
3536
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
3637
</ItemGroup>
3738
<ItemGroup>
38-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
39+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
3940
</ItemGroup>
4041
</Project>

‎Directory.Build.targets

-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,5 @@
11
<Project>
2-
<!-- workaround for deterministic builds; see https://github.com/clairernovotny/DeterministicBuilds -->
3-
<PropertyGroup>
4-
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
5-
</PropertyGroup>
62
<ItemGroup>
73
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
84
</ItemGroup>
9-
<ItemGroup>
10-
<PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
11-
<PackageReference Update="GitHubActionsTestLogger" Version="1.1.2" />
12-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
13-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.0" />
14-
<PackageReference Update="Moq" Version="4.15.1" />
15-
<PackageReference Update="NSubstitute" Version="4.2.2" />
16-
<PackageReference Update="Pipelines.Sockets.Unofficial" Version="2.2.2" />
17-
<PackageReference Update="System.Diagnostics.PerformanceCounter" Version="5.0.0" />
18-
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
19-
<PackageReference Update="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
20-
<PackageReference Update="System.Threading.Channels" Version="5.0.0" />
21-
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
22-
<PackageReference Update="xunit" Version="2.4.1" />
23-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
24-
25-
<!-- note that it is only the tests that have a dependency on this; the main lib takes the
26-
transitive dependency from Pipelines.Sockets.Unofficial; this is for testing some binding
27-
redirect problems (something new and different for us!) -->
28-
<PackageReference Update="System.IO.Pipelines" Version="5.0.1" />
29-
</ItemGroup>
305
</Project>

‎Directory.Packages.props

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<ItemGroup>
3+
<!-- Packages we depend on for StackExchange.Redis, upgrades can create binding redirect pain! -->
4+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
5+
<PackageVersion Include="Pipelines.Sockets.Unofficial" Version="2.2.2" />
6+
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="5.0.0" />
7+
<PackageVersion Include="System.Threading.Channels" Version="5.0.0" />
8+
<PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
9+
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
10+
11+
<!-- Packages only used in the solution, upgrade at will -->
12+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
13+
<PackageVersion Include="GitHubActionsTestLogger" Version="1.3.0" />
14+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
16+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
17+
<PackageVersion Include="Moq" Version="4.17.2" />
18+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.4.255" />
19+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
20+
<PackageVersion Include="NSubstitute" Version="4.3.0" />
21+
<PackageVersion Include="StackExchange.Redis" Version="2.5.43" />
22+
<!-- For binding redirect testing, main package gets this transitively -->
23+
<PackageVersion Include="System.IO.Pipelines" Version="5.0.1" />
24+
<PackageVersion Include="System.Runtime.Caching" Version="5.0.0" />
25+
<PackageVersion Include="xunit" Version="2.4.1" />
26+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
27+
</ItemGroup>
28+
</Project>

‎StackExchange.Redis.sln

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
build.ps1 = build.ps1
1212
Directory.Build.props = Directory.Build.props
1313
Directory.Build.targets = Directory.Build.targets
14+
Directory.Packages.props = Directory.Packages.props
1415
global.json = global.json
1516
NuGet.Config = NuGet.Config
1617
README.md = README.md

‎src/Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<IsPackable>true</IsPackable>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" Condition=" '$(DEVCONTAINER)' != 'true' " />
9-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all"/>
10-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
8+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" Condition=" '$(DEVCONTAINER)' != 'true' " />
9+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all"/>
10+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
1111
</ItemGroup>
1212
</Project>

‎tests/BasicTestBaseline/BasicTestBaseline.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="BenchmarkDotNet" />
19-
<PackageReference Include="StackExchange.Redis" Version="[2.0.558]" />
19+
<PackageReference Include="StackExchange.Redis" />
2020
</ItemGroup>
2121

2222
</Project>

‎tests/ConsoleTestBaseline/ConsoleTestBaseline.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<!--<PackageReference Include="StackExchange.Redis" Version="1.2.6" />-->
16-
<!--<PackageReference Include="StackExchange.Redis" Version="2.2.88" />-->
17-
<PackageReference Include="StackExchange.Redis" Version="2.5.43" />
15+
<PackageReference Include="StackExchange.Redis" />
1816
</ItemGroup>
1917
</Project>

‎toys/StackExchange.Redis.Server/StackExchange.Redis.Server.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\..\src\StackExchange.Redis\StackExchange.Redis.csproj" />
17-
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
17+
<PackageReference Include="System.Runtime.Caching" />
1818
</ItemGroup>
1919
</Project>

‎toys/TestConsoleBaseline/TestConsoleBaseline.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="StackExchange.Redis" Version="[2.0.558]" /> <!-- [1.2.6] for previous major -->
17+
<PackageReference Include="StackExchange.Redis" />
1818
</ItemGroup>
1919
</Project>

0 commit comments

Comments
 (0)