Skip to content

Tooling updates #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.30.6",
"version": "1.0.1",
"commands": [
"dotnet-csharpier"
"csharpier"
],
"rollForward": false
},
"dotnet-outdated-tool": {
"version": "4.6.7",
"version": "4.6.8",
"commands": [
"dotnet-outdated"
],
Expand Down
2 changes: 1 addition & 1 deletion .husky/task-runner.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name": "csharpier",
"group": "pre-commit",
"command": "dotnet",
"args": ["csharpier", "--config-path", ".\\src\\.csharpierrc.json", "${staged}"],
"args": ["csharpier", "format", "--config-path", ".\\src\\.csharpierrc.json", "${staged}"],
"include": ["src/**/*.cs"]
}
]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Per the [Husky.Net instructions](https://alirezanet.github.io/Husky.Net/guide/au
On occasion a manual run is desired it may be done so via the `src` directory and with the command

```shell
dotnet format style; dotnet format analyzers; dotnet csharpier .
dotnet format style; dotnet format analyzers; dotnet csharpier format .
```

These commands may be called independently, but order may matter.
Expand Down
5 changes: 2 additions & 3 deletions src/.csharpierrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"printWidth": 128,
"useTabs": false,
"tabWidth": 4,
"preprocessorSymbolSets": ["", "DEBUG", "DEBUG,CODE_STYLE"]
}
"tabWidth": 4
}
9 changes: 1 addition & 8 deletions src/Arcus.DocExamples/Arcus.DocExamples.csproj
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Documentation Example package for Arcus</Description>
<Authors>The Production Tools Team</Authors>
<Company>Sandia National Laboratories</Company>
<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>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<OutputPath>bin\</OutputPath>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="..\stylecop.json">
<Link>stylecop.json</Link>
</AdditionalFiles>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Arcus\Arcus.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit" Version="2.9.3" />
Expand All @@ -33,13 +28,12 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="AsyncFixer" Version="1.6.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -64,5 +58,4 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

</Project>
32 changes: 9 additions & 23 deletions src/Arcus.DocExamples/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,11 @@
"Microsoft.CodeCoverage": "17.13.0"
}
},
"Microsoft.NETFramework.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.0.3, )",
"resolved": "1.0.3",
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
"dependencies": {
"Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
}
},
"Microsoft.VisualStudio.Threading.Analyzers": {
"type": "Direct",
"requested": "[17.13.2, )",
"resolved": "17.13.2",
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
"requested": "[17.13.61, )",
"resolved": "17.13.61",
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -97,11 +88,6 @@
"resolved": "17.13.0",
"contentHash": "9LIUy0y+DvUmEPtbRDw6Bay3rzwqFV8P4efTrK4CZhQle3M/QwLPjISghfcolmEGAPWxuJi6m98ZEfk4VR4Lfg=="
},
"Microsoft.NETFramework.ReferenceAssemblies.net48": {
"type": "Transitive",
"resolved": "1.0.3",
"contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
"resolved": "17.12.0",
Expand Down Expand Up @@ -190,9 +176,9 @@
},
"Microsoft.VisualStudio.Threading.Analyzers": {
"type": "Direct",
"requested": "[17.13.2, )",
"resolved": "17.13.2",
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
"requested": "[17.13.61, )",
"resolved": "17.13.61",
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -344,9 +330,9 @@
},
"Microsoft.VisualStudio.Threading.Analyzers": {
"type": "Direct",
"requested": "[17.13.2, )",
"resolved": "17.13.2",
"contentHash": "Qcd8IlaTXZVq3wolBnzby1P7kWihdWaExtD8riumiKuG1sHa8EgjV/o70TMjTaeUMhomBbhfdC9OPwAHoZfnjQ=="
"requested": "[17.13.61, )",
"resolved": "17.13.61",
"contentHash": "9ysRZR7xkVFsbwWjk0dx5tefySxhNMMwxmIr3G6UaFeugYE+TEghaTsmGiwT39maa2WFvH4zvjnEfDaCLq+Dtw=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down
11 changes: 2 additions & 9 deletions src/Arcus.Tests/Arcus.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Unit test package for Arcus</Description>
<Authors>The Production Tools Team</Authors>
<Company>Sandia National Laboratories</Company>
<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>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
Expand All @@ -15,27 +13,23 @@
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="..\stylecop.json">
<Link>stylecop.json</Link>
</AdditionalFiles>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit.v3" Version="2.0.0" />
<PackageReference Include="xunit.v3" Version="2.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Arcus\Arcus.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -45,7 +39,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -70,5 +64,4 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Arcus.Tests/Math/IPAddressMathTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,8 @@ public void IsBetween_LowGreaterThanHigh_Throws_InvalidOperationException_Test()
// Act
// Assert

Assert.Throws<InvalidOperationException>(
() => IPAddress.Any.IsBetween(IPAddress.Parse("100.1.1.1"), IPAddress.Parse("10.1.1.1"))
Assert.Throws<InvalidOperationException>(() =>
IPAddress.Any.IsBetween(IPAddress.Parse("100.1.1.1"), IPAddress.Parse("10.1.1.1"))
);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Arcus.Tests/Utilities/IPAddressUtilitiesTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@ public void Parse_Bytes_InputTooLong_Throws_ArgumentOutOfRangeException_Test(int
// Arrange
// Assert
// Assert
Assert.Throws<ArgumentOutOfRangeException>(
() => IPAddressUtilities.Parse(Enumerable.Repeat((byte)0x00, count).ToArray(), addressFamily)
Assert.Throws<ArgumentOutOfRangeException>(() =>
IPAddressUtilities.Parse(Enumerable.Repeat((byte)0x00, count).ToArray(), addressFamily)
);
}

Expand Down
Loading
Loading