Skip to content

Commit 2ac01b1

Browse files
CornielCorniel
committed
Use CPM
1 parent b0c0450 commit 2ac01b1

File tree

8 files changed

+68
-28
lines changed

8 files changed

+68
-28
lines changed

‎.globalconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
is_global = true
2+
3+
dotnet_diagnostic.CS1591.severity = none # Missing XML comment for public visible member
4+
15
dotnet_diagnostic.Proj0003.severity = none # Define usings explicit

‎.net.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
55
<SignAssembly>false</SignAssembly>
6-
<NoWarn>$(NoWarn);NU1504</NoWarn>
76
</PropertyGroup>
87

98
<ItemGroup>
@@ -15,7 +14,7 @@
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="DotNetProjectFile.Analyzers.Sdk" Version="1.5.3" PrivateAssets="all" />
17+
<PackageReference Include="DotNetProjectFile.Analyzers.Sdk" PrivateAssets="all" />
1918
</ItemGroup>
2019

2120
</Project>

‎Directory.Build.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2727
<PackageProjectUrl>https://github.com/destructurama/attributed</PackageProjectUrl>
2828
<PackageIcon>icon.png</PackageIcon>
29+
<PackageIconUrl>https://github.com/destructurama/attributed/tree/master/assets/icon.png</PackageIconUrl>
2930
<PackageTags>serilog;attributed</PackageTags>
3031
<PackageReadmeFile>README.md</PackageReadmeFile>
3132
<RepositoryUrl>https://github.com/destructurama/attributed</RepositoryUrl>
@@ -43,7 +44,8 @@
4344
</PropertyGroup>
4445

4546
<ItemGroup Label="Analyzers">
46-
<PackageReference Include="DotNetProjectFile.Analyzers" Version="1.5.3" PrivateAssets="all" />
47+
<PackageReference Include="DotNetProjectFile.Analyzers" PrivateAssets="all" />
48+
<PackageReference Include="SerilogAnalyzer" PrivateAssets="all" />
4749
</ItemGroup>
4850

4951
<ItemGroup>
@@ -58,8 +60,8 @@
5860
</ItemGroup>
5961

6062
<ItemGroup>
61-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
62-
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
63+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
64+
<PackageReference Include="MinVer" PrivateAssets="All" />
6365
</ItemGroup>
6466
</When>
6567
</Choose>

‎Directory.Packages.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
<CentralPackageVersionOverrideEnabled>true</CentralPackageVersionOverrideEnabled>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
10+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
11+
<PackageVersion Include="DotNetProjectFile.Analyzers" Version="1.5.5" />
12+
<PackageVersion Include="DotNetProjectFile.Analyzers.Sdk" Version="1.5.5" />
13+
<PackageVersion Include="MarkdownSnippets.MsBuild" Version="27.0.2" />
14+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
15+
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="[9.0.0]" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="MinVer" Version="6.0.0" />
19+
<PackageVersion Include="NUnit" Version="4.3.2" />
20+
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
21+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
22+
<PackageVersion Include="PolySharp" Version="1.15.0" />
23+
<PackageVersion Include="PublicApiGenerator" Version="11.4.0" />
24+
<PackageVersion Include="Serilog" Version="4.2.0" />
25+
<PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
26+
<PackageVersion Include="Shouldly" Version="4.3.0" />
27+
</ItemGroup>
28+
</Project>

‎src/Benchmarks/Benchmarks.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
10+
<PackageReference Include="BenchmarkDotNet" />
11+
</ItemGroup>
12+
13+
<ItemGroup Label="Analyzers">
14+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
1115
</ItemGroup>
1216

1317
<ItemGroup>

‎src/Destructurama.Attributed.Tests/Destructurama.Attributed.Tests.csproj‎

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

3-
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
4-
<TargetFrameworks >net9.0;net462</TargetFrameworks>
5-
</PropertyGroup>
6-
7-
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
8-
<TargetFramework >net9.0</TargetFramework>
9-
</PropertyGroup>
10-
113
<PropertyGroup>
12-
<NoWarn>$(NoWarn);1591</NoWarn>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net9.0;net462</TargetFrameworks>
5+
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">net9.0</TargetFramework>
6+
<NoWarn>$(NoWarn);Proj0028</NoWarn>
7+
<IsTestProject>true</IsTestProject>
138
<!--Test with LogPropertyIgnoreAttribute requires it.-->
149
<DefineConstants>$(DefineConstants);CODE_GENERATION_ATTRIBUTES</DefineConstants>
1510
</PropertyGroup>
1611

1712
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" Version="9.0.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" PrivateAssets="all" />
20-
<PackageReference Include="NUnit" Version="4.3.1" />
21-
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" PrivateAssets="all" />
22-
<PackageReference Include="Serilog" Version="4.2.0" />
23-
<PackageReference Include="Shouldly" Version="4.3.0" />
24-
<PackageReference Include="PublicApiGenerator" Version="11.3.0" />
25-
<PackageReference Include="coverlet.msbuild" Version="6.0.2" PrivateAssets="all" />
26-
<PackageReference Include="MarkdownSnippets.MsBuild" Version="27.0.2" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.Extensions.Telemetry.Abstractions" />
14+
<PackageReference Include="NUnit" />
15+
<PackageReference Include="PublicApiGenerator" />
16+
<PackageReference Include="Serilog" />
17+
<PackageReference Include="Shouldly" />
18+
</ItemGroup>
19+
20+
<ItemGroup Label="Build tools">
21+
<PackageReference Include="coverlet.msbuild" PrivateAssets="all" />
22+
<PackageReference Include="MarkdownSnippets.MsBuild" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
24+
<PackageReference Include="NUnit3TestAdapter" PrivateAssets="all" />
25+
</ItemGroup>
26+
27+
<ItemGroup Label="Analyzers">
28+
<PackageReference Include="NUnit.Analyzers" PrivateAssets="all" />
2729
</ItemGroup>
2830

2931
<ItemGroup>

‎src/Destructurama.Attributed.Tests/LogWithNameAttributeTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class LogWithNameAttributeTests
1010
{
1111
[TestCase("John Doe")]
1212
[TestCase(null)]
13-
public void AttributesAreConsultedWhenDestructuring(string name)
13+
public void AttributesAreConsultedWhenDestructuring(string? name)
1414
{
1515
var customized = new PersonalData
1616
{

‎src/Destructurama.Attributed/Destructurama.Attributed.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
<PackageId>Destructurama.Attributed</PackageId>
1010
<PackageReleaseNotes>
1111
<![CDATA[
12-
# To Be released.
12+
v1.0
13+
- Migrated from Serilog.Extras.Attributed at serilog/serilog.
1314
]]>
1415
</PackageReleaseNotes>
1516
</PropertyGroup>
1617

1718
<ItemGroup>
18-
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="All" />
19-
<PackageReference Include="Serilog" Version="4.2.0" />
19+
<PackageReference Include="PolySharp" PrivateAssets="All" />
20+
<PackageReference Include="Serilog" />
2021
</ItemGroup>
2122

2223
<ItemGroup>

0 commit comments

Comments
 (0)