Skip to content

Commit f323881

Browse files
EdwardCookeEdwardCooke
authored
Merge pull request #973 from lahma/cpm
Convert to use Central Package Management +semver:fix
2 parents 3d2e577 + cc914f3 commit f323881

File tree

9 files changed

+54
-60
lines changed

9 files changed

+54
-60
lines changed

‎Directory.Packages.props‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
8+
<PackageVersion Include="Bullseye" Version="4.1.1" />
9+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
10+
<PackageVersion Include="FakeItEasy" Version="6.2.1" />
11+
<PackageVersion Include="FluentAssertions" Version="4.19.2" />
12+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
16+
<PackageVersion Include="Nullable" Version="1.3.1" />
17+
<PackageVersion Include="ObjectLayoutInspector" Version="0.1.2" />
18+
<PackageVersion Include="SimpleExec" Version="12.0.0" />
19+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
20+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
21+
<PackageVersion Include="xunit" Version="2.9.0" />
22+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
23+
</ItemGroup>
24+
</Project>

‎YamlDotNet.Analyzers.StaticGenerator/YamlDotNet.Analyzers.StaticGenerator.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
<TargetFramework>netstandard2.0</TargetFramework>
@@ -20,8 +20,8 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
23+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

‎YamlDotNet.Benchmark/YamlDotNet.Benchmark.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net47</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
12-
<PackageReference Include="System.Reflection.Metadata" Version="8.0.0" />
11+
<PackageReference Include="BenchmarkDotNet" />
12+
</ItemGroup>
13+
14+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
15+
<PackageReference Include="System.Collections.Immutable" />
16+
<PackageReference Include="System.Reflection.Metadata" />
1317
</ItemGroup>
1418

1519
<ItemGroup>

‎YamlDotNet.Fsharp.Test/YamlDotNet.Fsharp.Test.fsproj‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,13 @@
1414
<Compile Include="SerializerTests.fs" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="coverlet.collector" Version="6.0.2">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
22-
<PackageReference Include="xunit" Version="2.9.0" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
24-
<PrivateAssets>all</PrivateAssets>
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
</PackageReference>
17+
<PackageReference Include="coverlet.collector" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
19+
<PackageReference Include="xunit" />
20+
<PackageReference Include="xunit.runner.visualstudio" />
2721
</ItemGroup>
2822
<ItemGroup>
2923
<ProjectReference Include="..\YamlDotNet\YamlDotNet.csproj" />
3024
<ProjectReference Include="..\YamlDotNet.Analyzers.StaticGenerator\YamlDotNet.Analyzers.StaticGenerator.csproj" />
3125
</ItemGroup>
32-
<ItemGroup>
33-
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
34-
</ItemGroup>
3526
</Project>

‎YamlDotNet.Samples/YamlDotNet.Samples.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
10-
<PackageReference Include="xunit" Version="2.4.1" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.runner.visualstudio" />
1512
</ItemGroup>
1613
<ItemGroup>
1714
<ProjectReference Include="..\YamlDotNet.Test\YamlDotNet.Test.csproj" />

‎YamlDotNet.Test/YamlDotNet.Test.csproj‎

Lines changed: 6 additions & 22 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
<PropertyGroup>
33
<TargetFrameworks>net8.0;net6.0;net47</TargetFrameworks>
44
<IsPackable>false</IsPackable>
@@ -8,21 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="FluentAssertions" Version="4.19.2" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
13-
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
14-
<PackageReference Include="xunit" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
19-
<PackageReference Include="FakeItEasy" Version="6.2.1" />
20-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
21-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
22-
</ItemGroup>
23-
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
24-
<Reference Include="System.Runtime" />
25-
<Reference Include="System.Threading.Tasks" />
11+
<PackageReference Include="FluentAssertions" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
13+
<PackageReference Include="xunit" />
14+
<PackageReference Include="xunit.runner.visualstudio" />
15+
<PackageReference Include="FakeItEasy" />
2616
</ItemGroup>
2717

2818
<ItemGroup>
@@ -55,10 +45,4 @@
5545
<None Remove="xunit.runner.linux.json" />
5646
</ItemGroup>
5747

58-
<ItemGroup>
59-
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
60-
<PrivateAssets>all</PrivateAssets>
61-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
62-
</PackageReference>
63-
</ItemGroup>
6448
</Project>

‎YamlDotNet.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1919
LICENSE.txt = LICENSE.txt
2020
README.md = README.md
2121
Directory.Build.props = Directory.Build.props
22+
Directory.Packages.props = Directory.Packages.props
2223
EndProjectSection
2324
EndProject
2425
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YamlDotNet.Benchmark", "YamlDotNet.Benchmark\YamlDotNet.Benchmark.csproj", "{52D1E5F3-8337-48FC-AED5-968B51C7DAEB}"

‎YamlDotNet/YamlDotNet.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
40+
<PackageReference Include="Nullable" PrivateAssets="all" />
4141
</ItemGroup>
4242

4343
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -53,13 +53,6 @@
5353
<Message Importance="high" Text="==== Building $(RealTargetFramework) $(Empty.PadRight($([MSBuild]::Subtract(100, $(RealTargetFramework.Length))), '='))" Condition="'$(RealTargetFramework)' != ''" />
5454
</Target>
5555

56-
<ItemGroup>
57-
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
58-
<PrivateAssets>all</PrivateAssets>
59-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
60-
</PackageReference>
61-
</ItemGroup>
62-
6356
<PropertyGroup Label="Code Analysis">
6457
<AnalysisLevel>latest-Recommended</AnalysisLevel>
6558
<NoWarn>$(NoWarn);CA1051</NoWarn> <!-- Do not declare visible instance fields -->

‎tools/build/build.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Bullseye" Version="4.1.1" />
12-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
13-
<PackageReference Include="SimpleExec" Version="12.0.0" />
11+
<PackageReference Include="Bullseye" />
12+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
13+
<PackageReference Include="SimpleExec" />
1414
</ItemGroup>
1515

1616
</Project>

0 commit comments

Comments
 (0)