Skip to content

Commit b6385df

Browse files
adrianiftodeadrianiftode
authored
Merge pull request #125 from 0xced/central-package-management
Use Central Package Management
2 parents a01eb4d + 408348a commit b6385df

29 files changed

+142
-157
lines changed

‎Directory.Packages.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageVersion Include="FluentAssertions" Version="6.5.1" />
10+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.4" />
11+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
12+
<PackageVersion Include="System.Text.Json" Version="5.0.2" />
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<PackageVersion Include="FluentAssertions.Analyzers" Version="0.11.4" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
18+
<PackageVersion Include="xunit" Version="2.4.1" />
19+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
20+
</ItemGroup>
21+
22+
</Project>

‎FluentAssertions.Web.sln‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,38 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 17.2.32630.192
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14FDD52D-B83A-445B-BD2F-04B3E7B8033C}"
7+
ProjectSection(SolutionItems) = preProject
8+
src\Directory.Build.props = src\Directory.Build.props
9+
EndProjectSection
710
EndProject
811
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BFF7517A-C9EA-458D-829E-28A10F8D61BF}"
12+
ProjectSection(SolutionItems) = preProject
13+
test\Directory.Build.props = test\Directory.Build.props
14+
EndProjectSection
915
EndProject
1016
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.Web.Tests", "test\FluentAssertions.Web.Tests\FluentAssertions.Web.Tests.csproj", "{313919D0-7CE6-4118-A6A2-8963362A338F}"
1117
EndProject
1218
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.Web", "src\FluentAssertions.Web\FluentAssertions.Web.csproj", "{3C892A67-86B1-491F-8BF6-6E782FE4F689}"
1319
EndProject
1420
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}"
21+
ProjectSection(SolutionItems) = preProject
22+
samples\Directory.Build.props = samples\Directory.Build.props
23+
EndProjectSection
1524
EndProject
1625
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7F2E3E40-CDC2-413A-9527-802DD4973A96}"
1726
ProjectSection(SolutionItems) = preProject
1827
.editorconfig = .editorconfig
1928
.gitignore = .gitignore
2029
appveyor.yml = appveyor.yml
21-
common.dependencies.props = common.dependencies.props
22-
common.package.props = common.package.props
23-
common.props = common.props
24-
common.tests.props = common.tests.props
30+
Directory.Packages.props = Directory.Packages.props
2531
readme.md = readme.md
32+
nuget.config = nuget.config
2633
EndProjectSection
2734
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Net31", "samples\Sample.Api.Net31\Sample.Api.Net31.csproj", "{A62ABBAE-BFB8-467A-9FBC-974172C718E2}"
29-
EndProject
30-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Tests", "samples\Sample.Api.Tests\Sample.Api.Tests.csproj", "{5E7E24A9-A31F-4EBB-A3BA-167B0DD9C37E}"
35+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Tests", "test\Sample.Api.Tests\Sample.Api.Tests.csproj", "{5E7E24A9-A31F-4EBB-A3BA-167B0DD9C37E}"
3136
EndProject
3237
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Net60", "samples\Sample.Api.Net60\Sample.Api.Net60.csproj", "{FACC5AED-9978-441D-A359-DCD83F924BF8}"
3338
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Net50", "samples\Sample.Api.Net50\Sample.Api.Net50.csproj", "{4C9619BF-7ED4-42A3-B25C-15E288264C6F}"
35-
EndProject
3639
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Sample.Api.Shared", "Samples\Sample.Api.Shared\Sample.Api.Shared.shproj", "{815C141D-4504-42B1-A6F7-672C2476A474}"
3740
EndProject
3841
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.Web.Serializers.NewtonsoftJson", "src\FluentAssertions.Web.Serializers.NewtonsoftJson\FluentAssertions.Web.Serializers.NewtonsoftJson.csproj", "{1BDE8312-1789-40EA-86B2-83784E560740}"
@@ -43,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.Web.Fluent
4346
EndProject
4447
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Api.Net70", "samples\Sample.Api.Net70\Sample.Api.Net70.csproj", "{DCC4B007-DCE3-443E-BC9D-635EE367882B}"
4548
EndProject
49+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Api.Net80", "samples\Sample.Api.Net80\Sample.Api.Net80.csproj", "{9B53847C-0D39-46AB-9E39-A2DCA0676D88}"
50+
EndProject
4651
Global
4752
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4853
Debug|Any CPU = Debug|Any CPU
@@ -65,10 +70,6 @@ Global
6570
{FACC5AED-9978-441D-A359-DCD83F924BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
6671
{FACC5AED-9978-441D-A359-DCD83F924BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
6772
{FACC5AED-9978-441D-A359-DCD83F924BF8}.Release|Any CPU.Build.0 = Release|Any CPU
68-
{4C9619BF-7ED4-42A3-B25C-15E288264C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69-
{4C9619BF-7ED4-42A3-B25C-15E288264C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
70-
{4C9619BF-7ED4-42A3-B25C-15E288264C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
71-
{4C9619BF-7ED4-42A3-B25C-15E288264C6F}.Release|Any CPU.Build.0 = Release|Any CPU
7273
{1BDE8312-1789-40EA-86B2-83784E560740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7374
{1BDE8312-1789-40EA-86B2-83784E560740}.Debug|Any CPU.Build.0 = Debug|Any CPU
7475
{1BDE8312-1789-40EA-86B2-83784E560740}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -85,21 +86,25 @@ Global
8586
{DCC4B007-DCE3-443E-BC9D-635EE367882B}.Debug|Any CPU.Build.0 = Debug|Any CPU
8687
{DCC4B007-DCE3-443E-BC9D-635EE367882B}.Release|Any CPU.ActiveCfg = Release|Any CPU
8788
{DCC4B007-DCE3-443E-BC9D-635EE367882B}.Release|Any CPU.Build.0 = Release|Any CPU
89+
{9B53847C-0D39-46AB-9E39-A2DCA0676D88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90+
{9B53847C-0D39-46AB-9E39-A2DCA0676D88}.Debug|Any CPU.Build.0 = Debug|Any CPU
91+
{9B53847C-0D39-46AB-9E39-A2DCA0676D88}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{9B53847C-0D39-46AB-9E39-A2DCA0676D88}.Release|Any CPU.Build.0 = Release|Any CPU
8893
EndGlobalSection
8994
GlobalSection(SolutionProperties) = preSolution
9095
HideSolutionNode = FALSE
9196
EndGlobalSection
9297
GlobalSection(NestedProjects) = preSolution
9398
{313919D0-7CE6-4118-A6A2-8963362A338F} = {BFF7517A-C9EA-458D-829E-28A10F8D61BF}
9499
{3C892A67-86B1-491F-8BF6-6E782FE4F689} = {14FDD52D-B83A-445B-BD2F-04B3E7B8033C}
95-
{5E7E24A9-A31F-4EBB-A3BA-167B0DD9C37E} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
100+
{5E7E24A9-A31F-4EBB-A3BA-167B0DD9C37E} = {BFF7517A-C9EA-458D-829E-28A10F8D61BF}
96101
{FACC5AED-9978-441D-A359-DCD83F924BF8} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
97-
{4C9619BF-7ED4-42A3-B25C-15E288264C6F} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
98102
{815C141D-4504-42B1-A6F7-672C2476A474} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
99103
{1BDE8312-1789-40EA-86B2-83784E560740} = {14FDD52D-B83A-445B-BD2F-04B3E7B8033C}
100104
{F2C0B6F2-4ACE-4688-8F96-9EB1D5718B60} = {BFF7517A-C9EA-458D-829E-28A10F8D61BF}
101105
{538479CE-5922-4FF9-A09D-80C9E91FFFF1} = {BFF7517A-C9EA-458D-829E-28A10F8D61BF}
102106
{DCC4B007-DCE3-443E-BC9D-635EE367882B} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
107+
{9B53847C-0D39-46AB-9E39-A2DCA0676D88} = {B6E9FBF3-AC48-48B0-9CBB-CA260F59CCD9}
103108
EndGlobalSection
104109
GlobalSection(ExtensibilityGlobals) = postSolution
105110
SolutionGuid = {81F41C75-2F8A-4E70-BA17-38146C4BB6E6}

‎common.dependencies.props‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎common.props‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎common.tests.props‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎nuget.config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
</configuration>

‎samples/Directory.Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
5+
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
6+
<IsPackable>false</IsPackable>
7+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
8+
</PropertyGroup>
9+
10+
</Project>

‎samples/Sample.Api.Net50/Sample.Api.Net50.csproj‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎samples/Sample.Api.Net60/Sample.Api.Net60.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
5-
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
6-
<IsPackable>false</IsPackable>
4+
<TargetFramework>net6.0</TargetFramework>
75
</PropertyGroup>
86

97
<Import Project="..\Sample.Api.Shared\Sample.Api.Shared.projitems" Label="Shared" />

‎samples/Sample.Api.Net70/Sample.Api.Net70.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0</TargetFrameworks>
5-
<IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
6-
<IsPackable>false</IsPackable>
4+
<TargetFramework>net7.0</TargetFramework>
75
</PropertyGroup>
86

97
<Import Project="..\Sample.Api.Shared\Sample.Api.Shared.projitems" Label="Shared" />

0 commit comments

Comments
 (0)