Skip to content

Commit 8eee77a

Browse files
martincostellomartincostello
committed
Refactor project dependencies
- Split dependencies into groups to make management easier. - Remove MSBuild variables for versions. - Fix samples using .NET 8 instead of 9. - Remove redundant properties. - Sort some properties. - Update test behaviour for Microsoft.Extensions.TimeProvider.Testing upgrade due to changes in dotnet/extensions#5783.
1 parent a4b66fb commit 8eee77a

File tree

14 files changed

+45
-60
lines changed

14 files changed

+45
-60
lines changed

‎.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ updates:
1010
- package-ecosystem: nuget
1111
directory: "/"
1212
groups:
13+
polly:
14+
patterns:
15+
- Polly*
1316
xunit:
1417
patterns:
1518
- xunit*

‎Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
34
<UseArtifactsOutput>true</UseArtifactsOutput>
45
</PropertyGroup>
56
<PropertyGroup Condition=" '$(CI)' == 'true' ">

‎Directory.Packages.props

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
<PollyVersion>8.6.2</PollyVersion>
5-
<MicrosoftExtensionsVersion>8.0.0</MicrosoftExtensionsVersion>
6-
</PropertyGroup>
7-
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
8-
<MicrosoftExtensionsVersion>9.0.0</MicrosoftExtensionsVersion>
9-
</PropertyGroup>
102
<ItemGroup>
113
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
124
<PackageVersion Include="Cake.FileHelpers" Version="7.0.0" />
@@ -17,42 +9,53 @@
179
<PackageVersion Include="IcedTasks" Version="0.11.4" />
1810
<PackageVersion Include="JunitXml.TestLogger" Version="6.1.0" />
1911
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
20-
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="$(MicrosoftExtensionsVersion)" />
2112
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
2213
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="4.14.0" />
2314
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
24-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsVersion)" />
25-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
26-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
27-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsVersion)" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsVersion)" />
30-
<PackageVersion Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsVersion)" />
31-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsVersion)" />
32-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
17+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.7.0" />
18+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.8" />
19+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
20+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.7.0" />
3321
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3422
<PackageVersion Include="MinVer" Version="6.0.0" />
3523
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
3624
<PackageVersion Include="NSubstitute" Version="5.3.0" />
37-
<PackageVersion Include="Polly" Version="$(PollyVersion)" />
25+
<PackageVersion Include="Polly" Version="8.6.2" />
3826
<PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
39-
<PackageVersion Include="Polly.Core" Version="$(PollyVersion)" />
40-
<PackageVersion Include="Polly.Extensions" Version="$(PollyVersion)" />
41-
<PackageVersion Include="Polly.RateLimiting" Version="$(PollyVersion)" />
42-
<PackageVersion Include="Polly.Testing" Version="$(PollyVersion)" />
27+
<PackageVersion Include="Polly.Core" Version="8.6.2" />
28+
<PackageVersion Include="Polly.Extensions" Version="8.6.2" />
29+
<PackageVersion Include="Polly.RateLimiting" Version="8.6.2" />
30+
<PackageVersion Include="Polly.Testing" Version="8.6.2" />
4331
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
4432
<PackageVersion Include="ReportGenerator" Version="5.4.8" />
4533
<PackageVersion Include="RestSharp" Version="112.1.0" />
4634
<PackageVersion Include="Shouldly" Version="4.3.0" />
4735
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
4836
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
4937
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
50-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(MicrosoftExtensionsVersion)" />
5138
<PackageVersion Include="System.Text.Json" Version="9.0.7" />
52-
<PackageVersion Include="System.Threading.RateLimiting" Version="$(MicrosoftExtensionsVersion)" />
5339
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
5440
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
5541
<PackageVersion Include="xunit" Version="2.9.3" />
5642
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
5743
</ItemGroup>
44+
<!-- Dependencies below are pinned for the libraries we ship to NuGet.org -->
45+
<ItemGroup>
46+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.0" />
47+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
48+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
49+
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
50+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
51+
<PackageVersion Include="System.Threading.RateLimiting" Version="8.0.0" />
52+
</ItemGroup>
53+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))">
54+
<PackageVersion Update="Microsoft.Bcl.TimeProvider" Version="9.0.0" />
55+
<PackageVersion Update="Microsoft.Extensions.Logging" Version="9.0.0" />
56+
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
57+
<PackageVersion Update="Microsoft.Extensions.Options" Version="9.0.0" />
58+
<PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
59+
<PackageVersion Update="System.Threading.RateLimiting" Version="9.0.0" />
60+
</ItemGroup>
5861
</Project>

‎samples/Chaos/Chaos.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
75
<RootNamespace>Chaos</RootNamespace>
86
</PropertyGroup>
97

‎samples/DependencyInjection/DependencyInjection.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net9.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
129
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1311
<PackageReference Include="Polly.Extensions" />
1412
</ItemGroup>
1513

‎samples/Directory.Build.props

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<Project>
22

33
<PropertyGroup>
4-
<RunAnalyzers>true</RunAnalyzers>
5-
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
6-
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
74
<AnalysisLevel>latest</AnalysisLevel>
8-
<ProjectType>Library</ProjectType>
5+
<EnablePackageValidation>false</EnablePackageValidation>
6+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
7+
<ImplicitUsings>enable</ImplicitUsings>
98
<GenerateDocumentationFile>false</GenerateDocumentationFile>
9+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1010
<NoWarn>$(NoWarn);SA1123;SA1515;CA2000;CA2007;CA1303;IDE0021;RS0037;RS0016;CS1591</NoWarn>
11-
<EnablePackageValidation>false</EnablePackageValidation>
11+
<Nullable>enable</Nullable>
12+
<ProjectType>Library</ProjectType>
13+
<RunAnalyzers>true</RunAnalyzers>
14+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
1215
</PropertyGroup>
1316

1417
<Import Project="$(MsBuildThisFileDirectory)..\eng\Library.targets" />

‎samples/Extensibility/Extensibility.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net9.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
86
</PropertyGroup>
97

108
<ItemGroup>

‎samples/GenericPipelines/GenericPipelines.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net9.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
86
</PropertyGroup>
97

108
<ItemGroup>

‎samples/Intro.FSharp/Intro.FSharp.fsproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
5+
<TargetFramework>net9.0</TargetFramework>
86
</PropertyGroup>
97

108
<ItemGroup>

‎samples/Intro.FSharp/Program.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let demo () =
1818
// and for both void and result-returning user-callbacks.
1919
let pipeline =
2020
ResiliencePipelineBuilder()
21-
.AddTimeout(TimeSpan.FromSeconds(5))
21+
.AddTimeout(TimeSpan.FromSeconds(5.0))
2222
.Build()
2323

2424
let token = CancellationToken.None

0 commit comments

Comments
 (0)