Skip to content

Commit 73927eb

Browse files
C0nquistadoreC0nquistadore
committed
Simplify central package management
1 parent 78d9d3b commit 73927eb

9 files changed

Lines changed: 36 additions & 86 deletions

File tree

‎Dibix.sln‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ EndProject
2121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{62C58971-8516-42E1-8D2A-70A0CE779FFE}"
2222
ProjectSection(SolutionItems) = preProject
2323
build\build.yml = build\build.yml
24-
build\dependencies.props = build\dependencies.props
2524
Directory.Build.props = Directory.Build.props
2625
Directory.Build.targets = Directory.Build.targets
2726
global.json = global.json
@@ -58,8 +57,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-pipeline-templates",
5857
build\azure-pipelines-template\install-dotnet-sdk.yml = build\azure-pipelines-template\install-dotnet-sdk.yml
5958
build\azure-pipelines-template\pack-dotnet.yml = build\azure-pipelines-template\pack-dotnet.yml
6059
build\azure-pipelines-template\pack.yml = build\azure-pipelines-template\pack.yml
61-
build\azure-pipelines-template\publish-coverage.yml = build\azure-pipelines-template\publish-coverage.yml
6260
build\azure-pipelines-template\publish-artifact.yml = build\azure-pipelines-template\publish-artifact.yml
61+
build\azure-pipelines-template\publish-coverage.yml = build\azure-pipelines-template\publish-coverage.yml
6362
build\azure-pipelines-template\restore.yml = build\azure-pipelines-template\restore.yml
6463
build\azure-pipelines-template\run.yml = build\azure-pipelines-template\run.yml
6564
build\azure-pipelines-template\test-dotnet-cobertura.yml = build\azure-pipelines-template\test-dotnet-cobertura.yml

‎Packages.props‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,35 @@
11
<Project>
2-
<Import Project="$(MSBuildThisFileDirectory)build\dependencies.props" />
3-
42
<ItemGroup>
5-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
3+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
64
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" />
75

8-
<PackageReference Update="coverlet.collector" Version="$(CoverletVersion)" >
9-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
10-
<PrivateAssets>all</PrivateAssets>
11-
</PackageReference>
12-
<PackageReference Update="Dapper.StrongName" Version="$(DapperVersion)" Condition="'$(TargetFramework)' != 'net461'" />
13-
<PackageReference Update="Dapper.StrongName" Version="$(DapperNetFxVersion)" Condition="'$(TargetFramework)' == 'net461'" />
14-
<PackageReference Update="ILRepack" Version="$(ILRepackVersion)" />
15-
<PackageReference Update="Microsoft.AspNet.WebApi.Client" Version="$(AspNetWebApiVersion)" Condition="'$(TargetFramework)' != 'net461'" />
16-
<PackageReference Update="Microsoft.AspNet.WebApi.Client" Version="$(AspNetWebApiNetFxVersion)" Condition="'$(TargetFramework)' == 'net461'" />
17-
<PackageReference Update="Microsoft.AspNet.WebApi.Core" Version="$(AspNetWebApiNetFxVersion)" Condition="'$(TargetFramework)' == 'net461'" />
18-
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="$(MSBuildUtilitiesVersion)" />
19-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
20-
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="$(AnalyzersVersion)" />
21-
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="$(ConfigurationBinderVersion)" />
22-
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(ConfigurationEnvironmentVersion)" />
23-
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="$(ConfigurationJsonVersion)" />
24-
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="$(ConfigurationUserSecretsVersion)" />
25-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="$(MicrosoftTestSdkVersion)" />
26-
<PackageReference Update="Microsoft.OpenApi" Version="$(OpenApiVersion)" />
27-
<PackageReference Update="Microsoft.SqlServer.DacFx" Version="$(DacFxVersion)" />
28-
<PackageReference Update="Moq" Version="$(MoqVersion)" />
29-
<PackageReference Update="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
30-
<PackageReference Update="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
31-
<PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" Condition="'$(TargetFramework)' != 'net461'" />
32-
<PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonNetFxVersion)" Condition="'$(TargetFramework)' == 'net461'" />
33-
<PackageReference Update="Newtonsoft.Json.Schema" Version="$(NewtonsoftJsonSchemaVersion)" />
34-
<PackageReference Update="System.ComponentModel.Annotations" Version="$(DataAnnotationsVersion)" />
35-
<PackageReference Update="System.Data.SqlClient" Version="$(SqlClientVersion)" />
36-
<PackageReference Update="System.Diagnostics.EventLog" Version="$(EventLogVersion)" />
37-
<PackageReference Update="System.IO.Packaging" Version="$(IOPackageVersion)" />
38-
<PackageReference Update="System.Reflection.Emit" Version="$(ReflectionEmitVersion)" />
6+
<PackageReference Update="coverlet.collector" Version="3.1.2" />
7+
<PackageReference Update="Dapper.StrongName" Version="2.0.78" Condition="'$(TargetFramework)' != 'net461'" />
8+
<PackageReference Update="Dapper.StrongName" Version="1.50.5" Condition="'$(TargetFramework)' == 'net461'" />
9+
<PackageReference Update="ILRepack" Version="2.0.18" />
10+
<PackageReference Update="Microsoft.AspNet.WebApi.Client" Version="5.2.7" Condition="'$(TargetFramework)' != 'net461'" />
11+
<PackageReference Update="Microsoft.AspNet.WebApi.Client" Version="5.2.3" Condition="'$(TargetFramework)' == 'net461'" />
12+
<PackageReference Update="Microsoft.AspNet.WebApi.Core" Version="5.2.3" Condition="'$(TargetFramework)' == 'net461'" />
13+
<PackageReference Update="Microsoft.Build.Utilities.Core" Version="16.9.0" />
14+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
15+
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
16+
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
17+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
18+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
19+
<PackageReference Update="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
20+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
21+
<PackageReference Update="Microsoft.OpenApi" Version="1.2.3" />
22+
<PackageReference Update="Microsoft.SqlServer.DacFx" Version="150.5084.2" />
23+
<PackageReference Update="Moq" Version="4.17.2" />
24+
<PackageReference Update="MSTest.TestAdapter" Version="2.2.8" />
25+
<PackageReference Update="MSTest.TestFramework" Version="2.2.8" />
26+
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" Condition="'$(TargetFramework)' != 'net461'" />
27+
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" Condition="'$(TargetFramework)' == 'net461'" />
28+
<PackageReference Update="Newtonsoft.Json.Schema" Version="3.0.14" />
29+
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
30+
<PackageReference Update="System.Data.SqlClient" Version="4.8.2" />
31+
<PackageReference Update="System.Diagnostics.EventLog" Version="6.0.0" />
32+
<PackageReference Update="System.IO.Packaging" Version="6.0.0" />
33+
<PackageReference Update="System.Reflection.Emit" Version="4.7.0" />
3934
</ItemGroup>
4035
</Project>

‎build/dependencies.props‎

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

‎tests/Dibix.Dapper.Tests/Dibix.Dapper.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" />
13+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />

‎tests/Dibix.Generators.Tests/Dibix.Generators.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="coverlet.collector" />
19+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2121
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
2222
<PackageReference Include="MSTest.TestAdapter" />

‎tests/Dibix.Http.Client.Tests/Dibix.Http.Client.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="coverlet.collector" />
14+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1616
<PackageReference Include="Moq" />
1717
<PackageReference Include="MSTest.TestAdapter" />

‎tests/Dibix.Http.Server.Tests/Dibix.Http.Server.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="coverlet.collector" />
20+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2222
<PackageReference Include="Moq" />
2323
<PackageReference Include="MSTest.TestAdapter" />

‎tests/Dibix.Sdk.Tests/Dibix.Sdk.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="coverlet.collector" />
22+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
2323
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2525
<PackageReference Include="Moq" />

‎tests/Dibix.Tests/Dibix.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" />
12+
<PackageReference Include="coverlet.collector" IncludeAssets="runtime;build;native;contentfiles;analyzers;buildtransitive" PrivateAssets="All" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1414
<PackageReference Include="Moq" />
1515
<PackageReference Include="MSTest.TestAdapter" />

0 commit comments

Comments
 (0)