Skip to content

Commit 07a2b08

Browse files
BenjaminMichaelisViktorHofer
BenjaminMichaelis
and
ViktorHofer
authored
chore: Centralize Package Management (#2311)
* chore: Centralize Package Management * Map Packages * Feedback from code review * Group updates * Remove Microsoft.NETFramework.ReferenceAssemblies * Minor NoWarn Update * Add Spacing * Remove more references * Update System.CommandLine.Tests.csproj --------- Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent 9b78df1 commit 07a2b08

File tree

16 files changed

+77
-41
lines changed

16 files changed

+77
-41
lines changed

‎Directory.Packages.props‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
6+
<!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
7+
<NoWarn>$(NoWarn);NU1507</NoWarn>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<!-- Roslyn dependencies -->
12+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.0.1" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
16+
<!-- Runtime dependencies -->
17+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
20+
<!-- external dependencies -->
21+
<PackageVersion Include="ApprovalTests" Version="5.4.7" />
22+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
23+
<PackageVersion Include="FluentAssertions" Version="5.10.3" />
24+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
25+
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
26+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
27+
<PackageVersion Include="System.Memory" Version="4.5.4" />
28+
<PackageVersion Include="system.reactive.core" Version="5.0.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(DisableArcade)' == '1'">
32+
<!-- The xunit version should be kept in sync with the one that Arcade promotes -->
33+
<PackageVersion Include="xunit" Version="2.4.1" />
34+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
35+
</ItemGroup>
36+
37+
</Project>

‎System.CommandLine.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
Directory.Build.props = Directory.Build.props
1414
Directory.Build.rsp = Directory.Build.rsp
1515
Directory.Build.targets = Directory.Build.targets
16+
Directory.Packages.props = Directory.Packages.props
1617
global.json = global.json
1718
LICENSE.md = LICENSE.md
1819
README.md = README.md

‎samples/RenderingPlayground/RenderingPlayground.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="system.reactive.core" Version="5.0.0" />
10+
<PackageReference Include="system.reactive.core" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ApprovalTests" Version="5.4.7" />
9+
<PackageReference Include="ApprovalTests" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/System.CommandLine.Benchmarks/System.CommandLine.Benchmarks.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -32,8 +32,8 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
36-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
35+
<PackageReference Include="BenchmarkDotNet" />
36+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

‎src/System.CommandLine.DragonFruit.Tests/System.CommandLine.DragonFruit.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
@@ -8,12 +8,12 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<NoWarn>1701;1702;1591</NoWarn>
11+
<NoWarn>$(NoWarn);1701;1702;1591</NoWarn>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
16-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
15+
<PackageReference Include="FluentAssertions" />
16+
<PackageReference Include="Newtonsoft.Json" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>$(TargetFrameworkForNETSDK);net462</TargetFrameworks>
@@ -14,8 +14,8 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
18-
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
17+
<PackageReference Include="FluentAssertions" />
18+
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
1919
</ItemGroup>
2020

2121
</Project>

‎src/System.CommandLine.Generator/System.CommandLine.Generator.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -10,19 +10,17 @@
1010

1111
<ItemGroup>
1212
<None Include="$(OutputPath)/$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
13-
<None Include="$(OutputPath)/../../../System.CommandLine.Generator.CommandHandler/**/System.CommandLine.Generator.CommandHandler.dll"
14-
Pack="true"
15-
PackagePath="lib/netstandard2.0/System.CommandLine.Generator.CommandHandler.dll" />
13+
<None Include="$(OutputPath)/../../../System.CommandLine.Generator.CommandHandler/**/System.CommandLine.Generator.CommandHandler.dll" Pack="true" PackagePath="lib/netstandard2.0/System.CommandLine.Generator.CommandHandler.dll" />
1614
</ItemGroup>
1715

1816
<ItemGroup>
1917
<Compile Include="..\System.Diagnostics.CodeAnalysis.cs" Link="System.Diagnostics.CodeAnalysis.cs" />
2018
</ItemGroup>
2119

2220
<ItemGroup>
23-
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.1" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
25-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
21+
<PackageReference Include="Microsoft.CodeAnalysis" />
22+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
2624
</ItemGroup>
2725

2826
</Project>

‎src/System.CommandLine.Hosting.Tests/System.CommandLine.Hosting.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>$(TargetFrameworkForNETSDK);net462</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="FluentAssertions" Version="5.10.3" />
10-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
9+
<PackageReference Include="FluentAssertions" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/System.CommandLine.Hosting/System.CommandLine.Hosting.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<IsPackable>true</IsPackable>
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Hosting" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

0 commit comments

Comments
 (0)