Skip to content

Commit 281ebc6

Browse files
authored
Tooling updates (#26)
* Updates tools and packages - Updates packages and dotnet tools to latest versions - Modifies README.MD and commit hook for new CSharpier args - removes deprecated `preprocessorSymbolSets` in CSharpier config * manual linting and formatting run `dotnet format style; dotnet format analyzers; dotnet csharpier format .`
1 parent 2f5a823 commit 281ebc6

File tree

7 files changed

+206
-277
lines changed

7 files changed

+206
-277
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "0.30.6",
6+
"version": "1.0.1",
77
"commands": [
8-
"dotnet-csharpier"
8+
"csharpier"
99
],
1010
"rollForward": false
1111
},
1212
"dotnet-outdated-tool": {
13-
"version": "4.6.7",
13+
"version": "4.6.8",
1414
"commands": [
1515
"dotnet-outdated"
1616
],

.husky/task-runner.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"name": "csharpier",
1919
"group": "pre-commit",
2020
"command": "dotnet",
21-
"args": ["csharpier", "--config-path", ".\\src\\.csharpierrc.json", "${staged}"],
21+
"args": ["csharpier", "format", "--config-path", ".\\src\\.csharpierrc.json", "${staged}"],
2222
"include": ["src/**/*.cs"]
2323
}
2424
]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Per the [Husky.Net instructions](https://alirezanet.github.io/Husky.Net/guide/au
162162
On occasion a manual run is desired it may be done so via the `src` directory and with the command
163163

164164
```shell
165-
dotnet format style; dotnet format analyzers; dotnet csharpier .
165+
dotnet format style; dotnet format analyzers; dotnet csharpier format .
166166
```
167167

168168
These commands may be called independently, but order may matter.

src/.csharpierrc.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"printWidth": 128,
33
"useTabs": false,
4-
"tabWidth": 4,
5-
"preprocessorSymbolSets": ["", "DEBUG", "DEBUG,CODE_STYLE"]
6-
}
4+
"tabWidth": 4
5+
}

src/NetDuid.Tests/NetDuid.Tests.csproj

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
54
<IsPackable>false</IsPackable>
65
<IsTestProject>true</IsTestProject>
76
<OutputType>Exe</OutputType>
87
</PropertyGroup>
9-
108
<PropertyGroup>
119
<OutputPath>bin\</OutputPath>
1210
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
@@ -16,14 +14,12 @@
1614
<Authors>The Production Tools Team</Authors>
1715
<Copyright>Copyright 2025 National Technology &amp;amp; Engineering Solutions of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government retains certain rights in this software.</Copyright>
1816
</PropertyGroup>
19-
2017
<PropertyGroup>
2118
<!-- Allowing usage of unsafe binary formatting for the sake of Duid.ISerializableTests.cs; Allowing as this due for the sake of testing, using ISerializable should likley be avoided -->
2219
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
2320
<!-- Ignoring end of life targets as we want to be sure that targets still pass tests -->
2421
<CheckEolTargetFramework>false</CheckEolTargetFramework>
2522
</PropertyGroup>
26-
2723
<ItemGroup>
2824
<!-- Nest Duid.*Tests.cs under DuidTests.cs -->
2925
<Compile Update="Duid.IComparableTests.cs">
@@ -48,31 +44,26 @@
4844
<DependentUpon>DuidTests.cs</DependentUpon>
4945
</Compile>
5046
</ItemGroup>
51-
5247
<ItemGroup>
5348
<AdditionalFiles Include="..\stylecop.json">
5449
<Link>stylecop.json</Link>
5550
</AdditionalFiles>
5651
</ItemGroup>
57-
5852
<ItemGroup>
5953
<ProjectReference Include="..\NetDuid\NetDuid.csproj" />
6054
</ItemGroup>
61-
6255
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
6356
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
6457
</ItemGroup>
65-
6658
<ItemGroup>
6759
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
6860
<PackageReference Include="coverlet.collector" Version="6.0.4" />
69-
<PackageReference Include="xunit.v3" Version="2.0.0" />
61+
<PackageReference Include="xunit.v3" Version="2.0.1" />
7062
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
7163
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7264
<PrivateAssets>all</PrivateAssets>
7365
</PackageReference>
7466
</ItemGroup>
75-
7667
<ItemGroup>
7768
<PackageReference Include="Roslynator.Analyzers" Version="4.13.1">
7869
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -95,5 +86,4 @@
9586
<PrivateAssets>all</PrivateAssets>
9687
</PackageReference>
9788
</ItemGroup>
98-
9989
</Project>

0 commit comments

Comments
 (0)