Skip to content

Commit 0089164

Browse files
martincostellomartincostello
committed
Adopt Central Package Management
Adopt Adopt Central Package Management for NuGet packages. Resolves App-vNext#1064.
1 parent 4c1cd6e commit 0089164

File tree

10 files changed

+56
-34
lines changed

10 files changed

+56
-34
lines changed

‎eng/Analyzers.targets‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<Project>
22
<ItemGroup Label="Analyzers" Condition="$(UseDefaultAnalyzers) == 'true'">
3-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" PrivateAssets="All" />
4-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.51.0.59060" PrivateAssets="All" />
5-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
6-
<PrivateAssets>all</PrivateAssets>
7-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8-
</PackageReference>
3+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" />
4+
<PackageReference Include="SonarAnalyzer.CSharp" PrivateAssets="All" />
5+
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
96
<AdditionalFiles Include="$(MsBuildThisFileDirectory)analyzers\Stylecop.json" Visible="false" />
107
<EditorConfigFiles Include="$(MsBuildThisFileDirectory)analyzers\Stylecop.globalconfig" />
118
<EditorConfigFiles Include="$(MsBuildThisFileDirectory)analyzers\$(ProjectType).globalconfig" />

‎eng/Benchmark.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22

33
<Import Project="..\Version.props" />
4-
4+
55
<ItemGroup>
6-
<PackageReference Include="BenchmarkDotNet" Version="0.13.3" />
7-
</ItemGroup>
6+
<PackageReference Include="BenchmarkDotNet" />
7+
</ItemGroup>
88

9-
</Project>
9+
</Project>

‎eng/Library.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup Label="SourceLink">
23-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
23+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
2424
</ItemGroup>
2525

2626
<PropertyGroup Label="SharedNuspecProperties">
@@ -37,4 +37,4 @@
3737
<InternalsVisibleTo Include="%(InternalsVisibleToTest.Identity)$(PollyPublicKeySuffix)" />
3838
</ItemGroup>
3939
</Target>
40-
</Project>
40+
</Project>

‎eng/Test.targets‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="all" />
10-
<PackageReference Include="FluentAssertions" Version="6.10.0" />
11-
<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
13-
<PackageReference Include="Moq" Version="4.18.4" />
14-
<PackageReference Include="ReportGenerator" Version="5.1.19" PrivateAssets="all" />
15-
<PackageReference Include="xunit" Version="2.4.2" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
9+
<PackageReference Include="coverlet.msbuild" PrivateAssets="all" />
10+
<PackageReference Include="FluentAssertions" />
11+
<PackageReference Include="GitHubActionsTestLogger" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13+
<PackageReference Include="Moq" />
14+
<PackageReference Include="ReportGenerator" PrivateAssets="all" />
15+
<PackageReference Include="xunit" />
16+
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
1717
</ItemGroup>
1818

1919
<PropertyGroup Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) != '.NETFramework'">
@@ -36,4 +36,4 @@
3636
<ReportGenerator ReportFiles="@(CoverletReport)" ReportTypes="$(ReportGeneratorReportTypes)" Tag="$(TargetFramework)" TargetDirectory="$(ReportGeneratorTargetDirectory)" Title="$(AssemblyName)" VerbosityLevel="Warning" />
3737
<Exec Condition=" '$(ReportGeneratorOutputMarkdown)' == 'true' " Command="pwsh -Command %22('$(_MarkdownSummaryPrefix)' + [System.Environment]::NewLine + [System.Environment]::NewLine + (Get-Content $([System.IO.Path]::Combine($(ReportGeneratorTargetDirectory), 'SummaryGithub.md')) | Out-String) + [System.Environment]::NewLine + [System.Environment]::NewLine + '$(_MarkdownSummarySuffix)') >> $(GITHUB_STEP_SUMMARY)%22" />
3838
</Target>
39-
</Project>
39+
</Project>

‎src/Directory.Build.props‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
27
<ItemGroup>
38
<Using Include="System.Collections" />
49
<Using Include="System.Collections.Concurrent" />
@@ -42,4 +47,4 @@
4247
<Using Include="BenchmarkDotNet.Jobs" />
4348
<Using Include="BenchmarkDotNet.Running" />
4449
</ItemGroup>
45-
</Project>
50+
</Project>

‎src/Directory.Build.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
22
<Import Project="$(MsBuildThisFileDirectory)../eng/Common.targets" />
33
<Import Project="$(MsBuildThisFileDirectory)../eng/$(ProjectType).targets" Condition="$(ProjectType) != ''" />
4-
5-
</Project>
4+
</Project>

‎src/Directory.Packages.props‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="coverlet.msbuild" Version="3.2.0" />
4+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
5+
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
6+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.0.1" />
7+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1" />
8+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
9+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
10+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
11+
<PackageVersion Include="Moq" Version="4.18.4" />
12+
<PackageVersion Include="ReportGenerator" Version="5.1.19" />
13+
<PackageVersion Include="SonarAnalyzer.CSharp" Version="8.51.0.59060" />
14+
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
15+
<PackageVersion Include="System.ComponentModel.Annotations" Version="4.5.0" />
16+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
17+
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
18+
<PackageVersion Include="xunit" Version="2.4.2" />
19+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
20+
</ItemGroup>
21+
</Project>

‎src/Polly.Benchmarks/Polly.Benchmarks.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
10-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
9+
<PackageReference Include="BenchmarkDotNet" />
10+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
1111
</ItemGroup>
1212
<ItemGroup Condition=" '$(BenchmarkFromNuGet)' != 'True' ">
1313
<ProjectReference Include="..\Polly\Polly.csproj" />
1414
</ItemGroup>
15-
</Project>
15+
</Project>

‎src/Polly.Core/Polly.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))" />
23-
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'" />
24-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))" />
22+
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))" />
23+
<PackageReference Include="System.ValueTuple" Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'" />
24+
<PackageReference Include="System.ComponentModel.Annotations" Condition="!$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'netcoreapp3.1'))" />
2525
</ItemGroup>
26-
26+
2727
</Project>

‎src/Polly/Polly.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
1111
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
1212
</PropertyGroup>
13-
13+
1414
<ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)' == 'netstandard1.1'">
15-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
15+
<PackageReference Include="System.ValueTuple" />
1616
</ItemGroup>
17-
17+
1818
<ItemGroup>
1919
<Using Remove="System.Net.Http" />
2020
<InternalsVisibleToTest Include="Polly.Specs"/>

0 commit comments

Comments
 (0)