Skip to content
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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.30.6",
"version": "1.0.1",
"commands": [
"dotnet-csharpier"
"csharpier"
],
"rollForward": false
},
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install tools
run: dotnet tool restore
- name: Check formatting
run: dotnet csharpier --check .
run: dotnet csharpier check .
coverage:
name: Check code coverage
runs-on: ubuntu-latest
Expand Down
61 changes: 28 additions & 33 deletions ArchUnitNET.MSTestV2/ArchUnitNET.MSTestV2.csproj
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# MSTestV2 Extension</Title>
<Description>MSTestV2 Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;mstest;mstestv2</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.MSTestV2</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
<PackageReference Include="MSTest.TestFramework" Version="2.2.3"/>
</ItemGroup>

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

<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath=""/>
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# MSTestV2 Extension</Title>
<Description>MSTestV2 Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;mstest;mstestv2</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.MSTestV2</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath="" />
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
</ItemGroup>
</Project>
4 changes: 0 additions & 4 deletions ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<Company>TNG Technology Consulting GmbH</Company>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.MSTestV2\ArchUnitNET.MSTestV2.csproj" />
</ItemGroup>

</Project>
19 changes: 9 additions & 10 deletions ArchUnitNET.MSTestV2Tests/RuleEvaluationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ public static void Setup(TestContext context)
public void ArchRuleAssertTest()
{
ArchRuleAssert.FulfilsRule(_architecture, _trueRule);
Assert.ThrowsException<AssertFailedException>(
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
Assert.ThrowsException<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
Assert.AreEqual(
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsException<AssertFailedException>(
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
.ThrowsException<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
)
.Message
)
Expand All @@ -51,16 +51,15 @@ public void ArchRuleExtensionsTest()
{
_architecture.CheckRule(_trueRule);
_trueRule.Check(_architecture);
Assert.ThrowsException<AssertFailedException>(
() => _architecture.CheckRule(_falseRule)
Assert.ThrowsException<AssertFailedException>(() => _architecture.CheckRule(_falseRule)
);
Assert.ThrowsException<AssertFailedException>(() => _falseRule.Check(_architecture));
Assert.AreEqual(
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsException<AssertFailedException>(
() => _architecture.CheckRule(_falseRule)
.ThrowsException<AssertFailedException>(() =>
_architecture.CheckRule(_falseRule)
)
.Message
)
Expand All @@ -69,8 +68,8 @@ public void ArchRuleExtensionsTest()
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsException<AssertFailedException>(
() => _falseRule.Check(_architecture)
.ThrowsException<AssertFailedException>(() =>
_falseRule.Check(_architecture)
)
.Message
)
Expand Down
59 changes: 27 additions & 32 deletions ArchUnitNET.NUnit/ArchUnitNET.NUnit.csproj
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# NUnit Extension</Title>
<Description>NUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;nunit</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.NUnit</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nunit" Version="3.13.2"/>
</ItemGroup>

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

<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath=""/>
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# NUnit Extension</Title>
<Description>NUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;nunit</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.NUnit</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="nunit" Version="3.13.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath="" />
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
</ItemGroup>
</Project>
30 changes: 13 additions & 17 deletions ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<Company>TNG Technology Consulting GmbH</Company>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.NUnit\ArchUnitNET.NUnit.csproj" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<Company>TNG Technology Consulting GmbH</Company>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.NUnit\ArchUnitNET.NUnit.csproj" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions ArchUnitNET.NUnitTests/RuleEvaluationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ public void Setup()
public void ArchRuleAssertTest()
{
ArchRuleAssert.FulfilsRule(_architecture, _trueRule);
Assert.Throws<AssertionException>(
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
Assert.Throws<AssertionException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
Assert.AreEqual(
_expectedErrorMessage,
Assert
.Catch<AssertionException>(
() => ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
.Catch<AssertionException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
)
.Message
);
Expand Down
63 changes: 29 additions & 34 deletions ArchUnitNET.xUnit/ArchUnitNET.xUnit.csproj
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# xUnit Extension</Title>
<Description>xUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;xunit</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.xUnit</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="xunit.assert" Version="2.4.1"/>
<PackageReference Include="System.Net.Http" Version="4.3.4"/>
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
</ItemGroup>

<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath=""/>
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/"/>
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<IsPackable>true</IsPackable>
<Title>ArchUnit C# xUnit Extension</Title>
<Description>xUnit Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>
<PackageTags>test;arch;archunit;xunit</PackageTags>
<IncludeSource>False</IncludeSource>
<Company>TNG Technology Consulting GmbH</Company>
<PackageId>TngTech.ArchUnitNET.xUnit</PackageId>
<IsTestProject>false</IsTestProject>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET\ArchUnitNET.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit.assert" Version="2.4.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup>
<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath="" />
<None Include="../Logo/ArchUnitNET-Logo.png" Pack="true" PackagePath="/Logo/" />
</ItemGroup>
</Project>
32 changes: 14 additions & 18 deletions ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<Company>TNG Technology Consulting GmbH</Company>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.xUnit\ArchUnitNET.xUnit.csproj" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
<Company>TNG Technology Consulting GmbH</Company>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.xUnit\ArchUnitNET.xUnit.csproj" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions ArchUnitNET.xUnitTests/RuleEvaluationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ public RuleEvaluationTests()
public void ArchRuleAssertTest()
{
ArchRuleAssert.CheckRule(_architecture, _trueRule);
Assert.Throws<FailedArchRuleException>(
() => ArchRuleAssert.CheckRule(_architecture, _falseRule)
Assert.Throws<FailedArchRuleException>(() =>
ArchRuleAssert.CheckRule(_architecture, _falseRule)
);
Assert.Equal(
_expectedErrorMessage,
Assert
.Throws<FailedArchRuleException>(
() => ArchRuleAssert.CheckRule(_architecture, _falseRule)
.Throws<FailedArchRuleException>(() =>
ArchRuleAssert.CheckRule(_architecture, _falseRule)
)
.Message
);
Expand Down
Loading