Skip to content

Commit 533d9b0

Browse files
alexanderlinnealexanderlinne
authored
Merge pull request #364 from TNG/renovate/csharpier-1.x
chore(deps): update dependency csharpier to v1
2 parents c3fe88e + 8e5ef6d commit 533d9b0

File tree

79 files changed

+532
-689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+532
-689
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
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
},

‎.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install tools
2626
run: dotnet tool restore
2727
- name: Check formatting
28-
run: dotnet csharpier --check .
28+
run: dotnet csharpier check .
2929
coverage:
3030
name: Check code coverage
3131
runs-on: ubuntu-latest

‎ArchUnitNET.MSTestV2/ArchUnitNET.MSTestV2.csproj

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
6-
<Title>ArchUnit C# MSTestV2 Extension</Title>
7-
<Description>MSTestV2 Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
10-
<PackageTags>test;arch;archunit;mstest;mstestv2</PackageTags>
11-
<IncludeSource>False</IncludeSource>
12-
<Company>TNG Technology Consulting GmbH</Company>
13-
<PackageId>TngTech.ArchUnitNET.MSTestV2</PackageId>
14-
<IsTestProject>false</IsTestProject>
15-
<IncludeSymbols>true</IncludeSymbols>
16-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
<PackageReadmeFile>README.md</PackageReadmeFile>
18-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19-
</PropertyGroup>
20-
21-
<ItemGroup>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
23-
<PackageReference Include="MSTest.TestFramework" Version="2.2.3"/>
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj"/>
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<None Include="../README.md" Pack="true" PackagePath=""/>
32-
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
33-
</ItemGroup>
34-
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
4+
<IsPackable>true</IsPackable>
5+
<Title>ArchUnit C# MSTestV2 Extension</Title>
6+
<Description>MSTestV2 Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
7+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8+
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
9+
<PackageTags>test;arch;archunit;mstest;mstestv2</PackageTags>
10+
<IncludeSource>False</IncludeSource>
11+
<Company>TNG Technology Consulting GmbH</Company>
12+
<PackageId>TngTech.ArchUnitNET.MSTestV2</PackageId>
13+
<IsTestProject>false</IsTestProject>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
</PropertyGroup>
19+
<ItemGroup>
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
21+
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
25+
</ItemGroup>
26+
<ItemGroup>
27+
<None Include="../README.md" Pack="true" PackagePath="" />
28+
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
29+
</ItemGroup>
3530
</Project>

‎ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net9.0</TargetFramework>
54
<IsPackable>false</IsPackable>
65
<Company>TNG Technology Consulting GmbH</Company>
76
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1210
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
1311
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1412
</ItemGroup>
15-
1613
<ItemGroup>
1714
<ProjectReference Include="..\ArchUnitNET.MSTestV2\ArchUnitNET.MSTestV2.csproj" />
1815
</ItemGroup>
19-
2016
</Project>

‎ArchUnitNET.MSTestV2Tests/RuleEvaluationTests.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ public static void Setup(TestContext context)
3131
public void ArchRuleAssertTest()
3232
{
3333
ArchRuleAssert.FulfilsRule(_architecture, _trueRule);
34-
Assert.ThrowsException<AssertFailedException>(
35-
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
34+
Assert.ThrowsException<AssertFailedException>(() =>
35+
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
3636
);
3737
Assert.AreEqual(
3838
_expectedErrorMessage,
3939
RemoveAssertionText(
4040
Assert
41-
.ThrowsException<AssertFailedException>(
42-
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
41+
.ThrowsException<AssertFailedException>(() =>
42+
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
4343
)
4444
.Message
4545
)
@@ -51,16 +51,15 @@ public void ArchRuleExtensionsTest()
5151
{
5252
_architecture.CheckRule(_trueRule);
5353
_trueRule.Check(_architecture);
54-
Assert.ThrowsException<AssertFailedException>(
55-
() => _architecture.CheckRule(_falseRule)
54+
Assert.ThrowsException<AssertFailedException>(() => _architecture.CheckRule(_falseRule)
5655
);
5756
Assert.ThrowsException<AssertFailedException>(() => _falseRule.Check(_architecture));
5857
Assert.AreEqual(
5958
_expectedErrorMessage,
6059
RemoveAssertionText(
6160
Assert
62-
.ThrowsException<AssertFailedException>(
63-
() => _architecture.CheckRule(_falseRule)
61+
.ThrowsException<AssertFailedException>(() =>
62+
_architecture.CheckRule(_falseRule)
6463
)
6564
.Message
6665
)
@@ -69,8 +68,8 @@ public void ArchRuleExtensionsTest()
6968
_expectedErrorMessage,
7069
RemoveAssertionText(
7170
Assert
72-
.ThrowsException<AssertFailedException>(
73-
() => _falseRule.Check(_architecture)
71+
.ThrowsException<AssertFailedException>(() =>
72+
_falseRule.Check(_architecture)
7473
)
7574
.Message
7675
)

‎ArchUnitNET.NUnit/ArchUnitNET.NUnit.csproj

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
6-
<Title>ArchUnit C# NUnit Extension</Title>
7-
<Description>NUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
10-
<PackageTags>test;arch;archunit;nunit</PackageTags>
11-
<IncludeSource>False</IncludeSource>
12-
<Company>TNG Technology Consulting GmbH</Company>
13-
<PackageId>TngTech.ArchUnitNET.NUnit</PackageId>
14-
<IsTestProject>false</IsTestProject>
15-
<IncludeSymbols>true</IncludeSymbols>
16-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
<PackageReadmeFile>README.md</PackageReadmeFile>
18-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19-
</PropertyGroup>
20-
21-
<ItemGroup>
22-
<PackageReference Include="nunit" Version="3.13.2"/>
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj"/>
27-
</ItemGroup>
28-
29-
<ItemGroup>
30-
<None Include="../README.md" Pack="true" PackagePath=""/>
31-
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
32-
</ItemGroup>
33-
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
4+
<IsPackable>true</IsPackable>
5+
<Title>ArchUnit C# NUnit Extension</Title>
6+
<Description>NUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
7+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8+
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
9+
<PackageTags>test;arch;archunit;nunit</PackageTags>
10+
<IncludeSource>False</IncludeSource>
11+
<Company>TNG Technology Consulting GmbH</Company>
12+
<PackageId>TngTech.ArchUnitNET.NUnit</PackageId>
13+
<IsTestProject>false</IsTestProject>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
</PropertyGroup>
19+
<ItemGroup>
20+
<PackageReference Include="nunit" Version="3.13.2" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<None Include="../README.md" Pack="true" PackagePath="" />
27+
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
28+
</ItemGroup>
3429
</Project>

‎ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
<Company>TNG Technology Consulting GmbH</Company>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
12-
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<ProjectReference Include="..\ArchUnitNET.NUnit\ArchUnitNET.NUnit.csproj" />
17-
</ItemGroup>
18-
2+
<PropertyGroup>
3+
<TargetFramework>net9.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<Company>TNG Technology Consulting GmbH</Company>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
10+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
11+
</ItemGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\ArchUnitNET.NUnit\ArchUnitNET.NUnit.csproj" />
14+
</ItemGroup>
1915
</Project>

‎ArchUnitNET.NUnitTests/RuleEvaluationTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public void Setup()
3030
public void ArchRuleAssertTest()
3131
{
3232
ArchRuleAssert.FulfilsRule(_architecture, _trueRule);
33-
Assert.Throws<AssertionException>(
34-
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
33+
Assert.Throws<AssertionException>(() =>
34+
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
3535
);
3636
Assert.AreEqual(
3737
_expectedErrorMessage,
3838
Assert
39-
.Catch<AssertionException>(
40-
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
39+
.Catch<AssertionException>(() =>
40+
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
4141
)
4242
.Message
4343
);

‎ArchUnitNET.xUnit/ArchUnitNET.xUnit.csproj

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
5-
<IsPackable>true</IsPackable>
6-
<Title>ArchUnit C# xUnit Extension</Title>
7-
<Description>xUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
8-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
9-
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
10-
<PackageTags>test;arch;archunit;xunit</PackageTags>
11-
<IncludeSource>False</IncludeSource>
12-
<Company>TNG Technology Consulting GmbH</Company>
13-
<PackageId>TngTech.ArchUnitNET.xUnit</PackageId>
14-
<IsTestProject>false</IsTestProject>
15-
<IncludeSymbols>true</IncludeSymbols>
16-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17-
<PackageReadmeFile>README.md</PackageReadmeFile>
18-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19-
</PropertyGroup>
20-
21-
<ItemGroup>
22-
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj"/>
23-
</ItemGroup>
24-
25-
<ItemGroup>
26-
<PackageReference Include="xunit.assert" Version="2.4.1"/>
27-
<PackageReference Include="System.Net.Http" Version="4.3.4"/>
28-
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
29-
</ItemGroup>
30-
31-
<ItemGroup>
32-
<None Include="../README.md" Pack="true" PackagePath=""/>
33-
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
34-
</ItemGroup>
35-
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
4+
<IsPackable>true</IsPackable>
5+
<Title>ArchUnit C# xUnit Extension</Title>
6+
<Description>xUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
7+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8+
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
9+
<PackageTags>test;arch;archunit;xunit</PackageTags>
10+
<IncludeSource>False</IncludeSource>
11+
<Company>TNG Technology Consulting GmbH</Company>
12+
<PackageId>TngTech.ArchUnitNET.xUnit</PackageId>
13+
<IsTestProject>false</IsTestProject>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
</PropertyGroup>
19+
<ItemGroup>
20+
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<PackageReference Include="xunit.assert" Version="2.4.1" />
24+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
25+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
26+
</ItemGroup>
27+
<ItemGroup>
28+
<None Include="../README.md" Pack="true" PackagePath="" />
29+
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
30+
</ItemGroup>
3631
</Project>

‎ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
6-
<Company>TNG Technology Consulting GmbH</Company>
7-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
</PropertyGroup>
9-
10-
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
12-
<PackageReference Include="xunit" Version="2.9.3" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<ProjectReference Include="..\ArchUnitNET.xUnit\ArchUnitNET.xUnit.csproj" />
18-
</ItemGroup>
19-
2+
<PropertyGroup>
3+
<TargetFramework>net9.0</TargetFramework>
4+
<IsPackable>false</IsPackable>
5+
<Company>TNG Technology Consulting GmbH</Company>
6+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
10+
<PackageReference Include="xunit" Version="2.9.3" />
11+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ProjectReference Include="..\ArchUnitNET.xUnit\ArchUnitNET.xUnit.csproj" />
15+
</ItemGroup>
2016
</Project>

‎ArchUnitNET.xUnitTests/RuleEvaluationTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public RuleEvaluationTests()
2929
public void ArchRuleAssertTest()
3030
{
3131
ArchRuleAssert.CheckRule(_architecture, _trueRule);
32-
Assert.Throws<FailedArchRuleException>(
33-
() => ArchRuleAssert.CheckRule(_architecture, _falseRule)
32+
Assert.Throws<FailedArchRuleException>(() =>
33+
ArchRuleAssert.CheckRule(_architecture, _falseRule)
3434
);
3535
Assert.Equal(
3636
_expectedErrorMessage,
3737
Assert
38-
.Throws<FailedArchRuleException>(
39-
() => ArchRuleAssert.CheckRule(_architecture, _falseRule)
38+
.Throws<FailedArchRuleException>(() =>
39+
ArchRuleAssert.CheckRule(_architecture, _falseRule)
4040
)
4141
.Message
4242
);

0 commit comments

Comments
 (0)