Skip to content

Commit 287f880

Browse files
rheonerheone
authored
Tooling updates (#64)
* 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 dd68cd9 commit 287f880

12 files changed

+174
-254
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
@@ -182,7 +182,7 @@ Per the [Husky.Net instructions](https://alirezanet.github.io/Husky.Net/guide/au
182182
On occasion a manual run is desired it may be done so via the `src` directory and with the command
183183

184184
```shell
185-
dotnet format style; dotnet format analyzers; dotnet csharpier .
185+
dotnet format style; dotnet format analyzers; dotnet csharpier format .
186186
```
187187

188188
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/Arcus.DocExamples/Arcus.DocExamples.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Description>Documentation Example package for Arcus</Description>
54
<Authors>The Production Tools Team</Authors>
65
<Company>Sandia National Laboratories</Company>
76
<Copyright>Copyright 2025 National Technology &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>
87
</PropertyGroup>
9-
108
<PropertyGroup>
119
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
1210
<IsPackable>false</IsPackable>
1311
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1412
<OutputPath>bin\</OutputPath>
1513
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1614
</PropertyGroup>
17-
1815
<ItemGroup>
1916
<AdditionalFiles Include="..\stylecop.json">
2017
<Link>stylecop.json</Link>
2118
</AdditionalFiles>
2219
</ItemGroup>
23-
2420
<ItemGroup>
2521
<ProjectReference Include="..\Arcus\Arcus.csproj" />
2622
</ItemGroup>
27-
2823
<ItemGroup>
2924
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
3025
<PackageReference Include="xunit" Version="2.9.3" />
@@ -33,13 +28,12 @@
3328
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3429
</PackageReference>
3530
</ItemGroup>
36-
3731
<ItemGroup>
3832
<PackageReference Include="AsyncFixer" Version="1.6.0">
3933
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4034
<PrivateAssets>all</PrivateAssets>
4135
</PackageReference>
42-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
36+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
4337
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4438
<PrivateAssets>all</PrivateAssets>
4539
</PackageReference>
@@ -64,5 +58,4 @@
6458
<PrivateAssets>all</PrivateAssets>
6559
</PackageReference>
6660
</ItemGroup>
67-
6861
</Project>

‎src/Arcus.DocExamples/packages.lock.json

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,11 @@
1717
"Microsoft.CodeCoverage": "17.13.0"
1818
}
1919
},
20-
"Microsoft.NETFramework.ReferenceAssemblies": {
21-
"type": "Direct",
22-
"requested": "[1.0.3, )",
23-
"resolved": "1.0.3",
24-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
25-
"dependencies": {
26-
"Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
27-
}
28-
},
2920
"Microsoft.VisualStudio.Threading.Analyzers": {
3021
"type": "Direct",
31-
"requested": "[17.13.2, )",
32-
"resolved": "17.13.2",
33-
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
22+
"requested": "[17.13.61, )",
23+
"resolved": "17.13.61",
24+
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
3425
},
3526
"Roslynator.Analyzers": {
3627
"type": "Direct",
@@ -97,11 +88,6 @@
9788
"resolved": "17.13.0",
9889
"contentHash": "9LIUy0y+DvUmEPtbRDw6Bay3rzwqFV8P4efTrK4CZhQle3M/QwLPjISghfcolmEGAPWxuJi6m98ZEfk4VR4Lfg=="
9990
},
100-
"Microsoft.NETFramework.ReferenceAssemblies.net48": {
101-
"type": "Transitive",
102-
"resolved": "1.0.3",
103-
"contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
104-
},
10591
"Microsoft.TestPlatform.ObjectModel": {
10692
"type": "Transitive",
10793
"resolved": "17.12.0",
@@ -190,9 +176,9 @@
190176
},
191177
"Microsoft.VisualStudio.Threading.Analyzers": {
192178
"type": "Direct",
193-
"requested": "[17.13.2, )",
194-
"resolved": "17.13.2",
195-
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
179+
"requested": "[17.13.61, )",
180+
"resolved": "17.13.61",
181+
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
196182
},
197183
"Roslynator.Analyzers": {
198184
"type": "Direct",
@@ -344,9 +330,9 @@
344330
},
345331
"Microsoft.VisualStudio.Threading.Analyzers": {
346332
"type": "Direct",
347-
"requested": "[17.13.2, )",
348-
"resolved": "17.13.2",
349-
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
333+
"requested": "[17.13.61, )",
334+
"resolved": "17.13.61",
335+
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
350336
},
351337
"Roslynator.Analyzers": {
352338
"type": "Direct",

‎src/Arcus.Tests/Arcus.Tests.csproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<Description>Unit test package for Arcus</Description>
54
<Authors>The Production Tools Team</Authors>
65
<Company>Sandia National Laboratories</Company>
76
<Copyright>Copyright 2025 National Technology &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>
87
</PropertyGroup>
9-
108
<PropertyGroup>
119
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
1210
<IsPackable>false</IsPackable>
@@ -15,27 +13,23 @@
1513
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1614
<OutputType>Exe</OutputType>
1715
</PropertyGroup>
18-
1916
<ItemGroup>
2017
<AdditionalFiles Include="..\stylecop.json">
2118
<Link>stylecop.json</Link>
2219
</AdditionalFiles>
2320
</ItemGroup>
24-
2521
<ItemGroup>
2622
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2723
<PackageReference Include="NSubstitute" Version="5.3.0" />
28-
<PackageReference Include="xunit.v3" Version="2.0.0" />
24+
<PackageReference Include="xunit.v3" Version="2.0.1" />
2925
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
3026
<PrivateAssets>all</PrivateAssets>
3127
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3228
</PackageReference>
3329
</ItemGroup>
34-
3530
<ItemGroup>
3631
<ProjectReference Include="..\Arcus\Arcus.csproj" />
3732
</ItemGroup>
38-
3933
<ItemGroup>
4034
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
4135
<PrivateAssets>all</PrivateAssets>
@@ -45,7 +39,7 @@
4539
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4640
<PrivateAssets>all</PrivateAssets>
4741
</PackageReference>
48-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
42+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
4943
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5044
<PrivateAssets>all</PrivateAssets>
5145
</PackageReference>
@@ -70,5 +64,4 @@
7064
<PrivateAssets>all</PrivateAssets>
7165
</PackageReference>
7266
</ItemGroup>
73-
7467
</Project>

‎src/Arcus.Tests/Math/IPAddressMathTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ public void IsBetween_LowGreaterThanHigh_Throws_InvalidOperationException_Test()
465465
// Act
466466
// Assert
467467

468-
Assert.Throws<InvalidOperationException>(
469-
() => IPAddress.Any.IsBetween(IPAddress.Parse("100.1.1.1"), IPAddress.Parse("10.1.1.1"))
468+
Assert.Throws<InvalidOperationException>(() =>
469+
IPAddress.Any.IsBetween(IPAddress.Parse("100.1.1.1"), IPAddress.Parse("10.1.1.1"))
470470
);
471471
}
472472

‎src/Arcus.Tests/Utilities/IPAddressUtilitiesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,8 @@ public void Parse_Bytes_InputTooLong_Throws_ArgumentOutOfRangeException_Test(int
615615
// Arrange
616616
// Assert
617617
// Assert
618-
Assert.Throws<ArgumentOutOfRangeException>(
619-
() => IPAddressUtilities.Parse(Enumerable.Repeat((byte)0x00, count).ToArray(), addressFamily)
618+
Assert.Throws<ArgumentOutOfRangeException>(() =>
619+
IPAddressUtilities.Parse(Enumerable.Repeat((byte)0x00, count).ToArray(), addressFamily)
620620
);
621621
}
622622

0 commit comments

Comments
 (0)