diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 41f36c6a7..382108982 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -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"
],
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 668e4ffe1..9d90ee921 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 7a042e35b..c30e1d3c6 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -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}}"
diff --git a/ArchUnitNET.MSTestV4Tests/ArchUnitNET.MSTestV4Tests.csproj b/ArchUnitNET.MSTestV4Tests/ArchUnitNET.MSTestV4Tests.csproj
index 5165a790b..11f8bad2d 100644
--- a/ArchUnitNET.MSTestV4Tests/ArchUnitNET.MSTestV4Tests.csproj
+++ b/ArchUnitNET.MSTestV4Tests/ArchUnitNET.MSTestV4Tests.csproj
@@ -6,7 +6,7 @@
true
-
+
diff --git a/ArchUnitNET.MSTestV4Tests/RuleEvaluationTests.cs b/ArchUnitNET.MSTestV4Tests/RuleEvaluationTests.cs
index 950f3a8cb..6d51bfa56 100644
--- a/ArchUnitNET.MSTestV4Tests/RuleEvaluationTests.cs
+++ b/ArchUnitNET.MSTestV4Tests/RuleEvaluationTests.cs
@@ -34,16 +34,10 @@ public void ArchRuleAssertTest()
Assert.ThrowsExactly(() =>
ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
- Assert.AreEqual(
- _expectedErrorMessage,
- RemoveAssertionText(
- Assert
- .ThrowsExactly(() =>
- ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
- )
- .Message
- )
+ var exception = Assert.ThrowsExactly(() =>
+ ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
+ Assert.EndsWith(_expectedErrorMessage, exception.Message);
}
[TestMethod]
@@ -53,29 +47,10 @@ public void ArchRuleExtensionsTest()
_trueRule.Check(_architecture);
Assert.ThrowsExactly(() => _architecture.CheckRule(_falseRule));
Assert.ThrowsExactly(() => _falseRule.Check(_architecture));
- Assert.AreEqual(
- _expectedErrorMessage,
- RemoveAssertionText(
- Assert
- .ThrowsExactly(() =>
- _architecture.CheckRule(_falseRule)
- )
- .Message
- )
- );
- Assert.AreEqual(
- _expectedErrorMessage,
- RemoveAssertionText(
- Assert
- .ThrowsExactly(() => _falseRule.Check(_architecture))
- .Message
- )
+ var exception = Assert.ThrowsExactly(() =>
+ ArchRuleAssert.FulfilsRule(_architecture, _falseRule)
);
- }
-
- private static string RemoveAssertionText(string exceptionMessage)
- {
- return exceptionMessage.Replace("Assert.Fail failed. ", string.Empty);
+ Assert.EndsWith(_expectedErrorMessage, exception.Message);
}
}
}
diff --git a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
index e999849f8..f6a8e9ffb 100644
--- a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
+++ b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj b/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj
index d88063ccf..e4868ec83 100644
--- a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj
+++ b/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj b/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj
index ea44da529..bd2603059 100644
--- a/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj
+++ b/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/ArchUnitNET/ArchUnitNET.csproj b/ArchUnitNET/ArchUnitNET.csproj
index 8f05ddbfe..69ba495d3 100644
--- a/ArchUnitNET/ArchUnitNET.csproj
+++ b/ArchUnitNET/ArchUnitNET.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/ArchUnitNETTests/ArchUnitNETTests.csproj b/ArchUnitNETTests/ArchUnitNETTests.csproj
index 2d9c53971..8fb6edaf1 100644
--- a/ArchUnitNETTests/ArchUnitNETTests.csproj
+++ b/ArchUnitNETTests/ArchUnitNETTests.csproj
@@ -42,9 +42,9 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
-
+
diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs
index 280b2b46b..a5129e411 100644
--- a/ArchUnitNETTests/Loader/ArchLoaderTests.cs
+++ b/ArchUnitNETTests/Loader/ArchLoaderTests.cs
@@ -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,
diff --git a/ExampleTest/ExampleTest.csproj b/ExampleTest/ExampleTest.csproj
index 870bacf47..31ec509c8 100644
--- a/ExampleTest/ExampleTest.csproj
+++ b/ExampleTest/ExampleTest.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj
index de71f3b0d..59dda3d17 100644
--- a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj
+++ b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj
@@ -10,8 +10,8 @@
1.0.0.0
-
-
+
+