Skip to content
Open
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,21 +3,21 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "1.1.2",
"version": "1.3.0",
"commands": [
"csharpier"
],
"rollForward": false
},
"verify.tool": {
"version": "0.6.0",
"version": "0.8.0",
"commands": [
"dotnet-verify"
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.4.16",
"version": "5.5.11",
"commands": [
"reportgenerator"
],
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup .NET
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
with:
dotnet-version: 10.0.400
- name: Install tools
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup .NET
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
with:
dotnet-version: 10.0.400
- name: Run tests
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup .NET
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
with:
dotnet-version: 10.0.400
- name: Run tests
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Checkout
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup .NET
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
with:
dotnet-version: 10.0.400
- name: Build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Initialize CodeQL
uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion ArchUnitNET.MSTestV4Tests/ArchUnitNET.MSTestV4Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSTest" Version="4.0.0" />
<PackageReference Include="MSTest" Version="4.3.3" />
</ItemGroup>
<ItemGroup>
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
Expand Down
37 changes: 6 additions & 31 deletions ArchUnitNET.MSTestV4Tests/RuleEvaluationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,10 @@ public void ArchRuleAssertTest()
Assert.ThrowsExactly<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
Assert.AreEqual(
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsExactly<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
)
.Message
)
var exception = Assert.ThrowsExactly<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
Assert.EndsWith(_expectedErrorMessage, exception.Message);
}

[TestMethod]
Expand All @@ -53,29 +47,10 @@ public void ArchRuleExtensionsTest()
_trueRule.Check(_architecture);
Assert.ThrowsExactly<AssertFailedException>(() => _architecture.CheckRule(_falseRule));
Assert.ThrowsExactly<AssertFailedException>(() => _falseRule.Check(_architecture));
Assert.AreEqual(
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsExactly<AssertFailedException>(() =>
_architecture.CheckRule(_falseRule)
)
.Message
)
);
Assert.AreEqual(
_expectedErrorMessage,
RemoveAssertionText(
Assert
.ThrowsExactly<AssertFailedException>(() => _falseRule.Check(_architecture))
.Message
)
var exception = Assert.ThrowsExactly<AssertFailedException>(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
}

private static string RemoveAssertionText(string exceptionMessage)
{
return exceptionMessage.Replace("Assert.Fail failed. ", string.Empty);
Assert.EndsWith(_expectedErrorMessage, exception.Message);
}
}
}
2 changes: 1 addition & 1 deletion ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.NUnit\ArchUnitNET.NUnit.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET.TUnitTests/ArchUnitNET.TUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="TUnit" Version="0.61.39" />
<PackageReference Include="TUnit" Version="0.90.45" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.TUnit\ArchUnitNET.TUnit.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.xUnit\ArchUnitNET.xUnit.csproj" />
Expand Down
4 changes: 2 additions & 2 deletions ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit.v3" Version="3.0.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ArchUnitNET.xUnitV3\ArchUnitNET.xUnitV3.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/ArchUnitNET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2026.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.ValueTuple" Version="4.6.1" />
<PackageReference Include="System.ValueTuple" Version="4.6.2" />
</ItemGroup>
<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath="" />
Expand Down
4 changes: 2 additions & 2 deletions ArchUnitNETTests/ArchUnitNETTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Verify.xunit" Version="30.19.0" />
<PackageReference Include="Verify.xunit" Version="30.20.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
<None Update="Domain\PlantUml\zzz_test_version_with_errors.puml">
Expand Down
8 changes: 5 additions & 3 deletions ArchUnitNETTests/Loader/ArchLoaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,11 @@ public void UnavailableTypeTest()
StringComparison.InvariantCulture
)
];
var assemblySearchPath = Path.Combine(
[currentAssemblyPath, "TestAssemblies", "FilteredDirectoryLoaderTestAssembly"]
);
var assemblySearchPath = Path.Combine([
currentAssemblyPath,
"TestAssemblies",
"FilteredDirectoryLoaderTestAssembly",
]);
var architecture = new ArchLoader()
.LoadFilteredDirectory(
assemblySearchPath,
Expand Down
2 changes: 1 addition & 1 deletion ExampleTest/ExampleTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
<ItemGroup>
<None Update="Resources\shopping_example.puml">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<AssemblyVersion>1.0.0.0</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="4.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog" Version="4.4.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FilteredDirectoryUnavailableTypesAssembly\FilteredDirectoryUnavailableTypesAssembly.csproj">
Expand Down
Loading