From b5911a89b9bc17d6a3956a6e57cf23eef67994a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 10:57:04 +0000 Subject: [PATCH 1/3] Update all non-major dependencies --- .config/dotnet-tools.json | 6 ++--- .github/workflows/build.yaml | 22 +++++++++---------- .github/workflows/codeql.yml | 8 +++---- .../ArchUnitNET.MSTestV2Tests.csproj | 4 ++-- .../ArchUnitNET.NUnitTests.csproj | 2 +- .../ArchUnitNET.TUnitTests.csproj | 2 +- .../ArchUnitNET.xUnitTests.csproj | 2 +- .../ArchUnitNET.xUnitV3Tests.csproj | 4 ++-- ArchUnitNET/ArchUnitNET.csproj | 2 +- ArchUnitNETTests/ArchUnitNETTests.csproj | 4 ++-- ExampleTest/ExampleTest.csproj | 2 +- ...FilteredDirectoryLoaderTestAssembly.csproj | 2 +- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 41f36c6a7..5c5a10c06 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.2.5", "commands": [ "csharpier" ], "rollForward": false }, "verify.tool": { - "version": "0.6.0", + "version": "0.7.0", "commands": [ "dotnet-verify" ], "rollForward": false }, "dotnet-reportgenerator-globaltool": { - "version": "5.4.16", + "version": "5.5.1", "commands": [ "reportgenerator" ], diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7b964ecb9..e56d9e73c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -16,9 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup .NET - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 + uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1 with: dotnet-version: 10.0.100 - name: Install tools @@ -30,15 +30,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup .NET - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 + uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1 with: dotnet-version: 10.0.100 - name: Run tests run: dotnet test -c Debug --collect:"XPlat Code Coverage" --settings coverlet.runsettings ArchUnitNETTests/ - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v5.5.1 + uses: codecov/codecov-action@v5.5.2 with: token: ${{ secrets.CODECOV_TOKEN }} run-tests: @@ -49,9 +49,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup .NET - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 + uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1 with: dotnet-version: 10.0.100 - name: Run tests @@ -67,11 +67,11 @@ jobs: contents: write steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: path: ./current - name: Checkout gh-pages branch - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: ref: gh-pages path: ./docs @@ -136,9 +136,9 @@ jobs: - run-tests steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Setup .NET - uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0 + uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1 with: dotnet-version: 10.0.100 - name: Build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8daf24a32..7701b18cd 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -21,14 +21,14 @@ jobs: language: ["csharp"] steps: - name: Checkout repository - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 - name: Initialize CodeQL - uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5 + uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5 + uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5 + uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9 with: category: "/language:${{matrix.language}}" diff --git a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj index 0ac1a52d0..3bfd16aea 100644 --- a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj +++ b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj index 945a5abcc..7830bf379 100644 --- a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj +++ b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj @@ -7,7 +7,7 @@ - + diff --git a/ArchUnitNET.TUnitTests/ArchUnitNET.TUnitTests.csproj b/ArchUnitNET.TUnitTests/ArchUnitNET.TUnitTests.csproj index d6e3c0964..aa2d6c58c 100644 --- a/ArchUnitNET.TUnitTests/ArchUnitNET.TUnitTests.csproj +++ b/ArchUnitNET.TUnitTests/ArchUnitNET.TUnitTests.csproj @@ -7,7 +7,7 @@ - + diff --git a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj b/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj index 29967bcfa..e18b54d0f 100644 --- a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj +++ b/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj @@ -8,7 +8,7 @@ - + diff --git a/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj b/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj index c5aa1c7fc..8c8fa00fe 100644 --- a/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj +++ b/ArchUnitNET.xUnitV3Tests/ArchUnitNET.xUnitV3Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/ArchUnitNET/ArchUnitNET.csproj b/ArchUnitNET/ArchUnitNET.csproj index e854c84ab..7a6acdf21 100644 --- a/ArchUnitNET/ArchUnitNET.csproj +++ b/ArchUnitNET/ArchUnitNET.csproj @@ -18,7 +18,7 @@ - + diff --git a/ArchUnitNETTests/ArchUnitNETTests.csproj b/ArchUnitNETTests/ArchUnitNETTests.csproj index 429c801c1..379287f61 100644 --- a/ArchUnitNETTests/ArchUnitNETTests.csproj +++ b/ArchUnitNETTests/ArchUnitNETTests.csproj @@ -35,9 +35,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + - + diff --git a/ExampleTest/ExampleTest.csproj b/ExampleTest/ExampleTest.csproj index a7201379b..7acabddeb 100644 --- a/ExampleTest/ExampleTest.csproj +++ b/ExampleTest/ExampleTest.csproj @@ -10,7 +10,7 @@ - + diff --git a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj index b0e7c9e8c..95fcc6b5f 100644 --- a/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj +++ b/TestAssemblies/FilteredDirectoryLoaderTestAssembly/FilteredDirectoryLoaderTestAssembly.csproj @@ -8,7 +8,7 @@ - + From 169a0a09997dd2cd2a0e60fd6d10c7edf8c608fc Mon Sep 17 00:00:00 2001 From: Alexander Linne Date: Fri, 9 Jan 2026 12:37:27 +0100 Subject: [PATCH 2/3] Fix Formatting Signed-off-by: Alexander Linne --- ArchUnitNET/Loader/MonoCecilMemberExtensions.cs | 3 ++- ArchUnitNETTests/Loader/ArchLoaderTests.cs | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs b/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs index 2adca2969..0fd0da91f 100644 --- a/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs +++ b/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs @@ -181,7 +181,8 @@ TypeFactory typeFactory return typeFactory.GetOrCreateStubTypeInstanceFromTypeReference( variableTypeReference ); - }) ?? Enumerable.Empty>() + }) + ?? Enumerable.Empty>() ) .Distinct(); diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs index 5d9408025..aeadfc2cb 100644 --- a/ArchUnitNETTests/Loader/ArchLoaderTests.cs +++ b/ArchUnitNETTests/Loader/ArchLoaderTests.cs @@ -139,9 +139,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, From 0c9907699a3759c98ccbffe23b59480a47b10a87 Mon Sep 17 00:00:00 2001 From: Alexander Linne Date: Fri, 9 Jan 2026 14:07:41 +0100 Subject: [PATCH 3/3] Use Microsoft Testing Platform Signed-off-by: Alexander Linne --- .github/workflows/build.yaml | 2 +- ArchUnit.sln | 9 +-- .../ArchUnitNET.MSTestV2Tests.csproj | 2 + .../ArchUnitNET.NUnitTests.csproj | 2 + .../ArchUnitNET.xUnitTests.csproj | 16 ----- ArchUnitNET.xUnitTests/RuleEvaluationTests.cs | 66 ------------------- ArchUnitNETTests/ArchUnitNETTests.csproj | 7 +- .../ArchUnitArchitectureTests.cs | 2 +- .../Domain/AttributeArgumentTests.cs | 2 +- .../Domain/NullableReferenceTypeTests.cs | 2 +- .../PlantUml/PlantUmlErrorMessagesCheck.cs | 2 +- ArchUnitNETTests/Fluent/FreezeTests.cs | 2 +- ...encingOfTypesOutsideOfArchitectureTests.cs | 2 +- .../Fluent/RuleEvaluationTests.cs | 2 +- ArchUnitNETTests/Fluent/Slices/SlicesTests.cs | 2 +- .../DependenciesToOtherAssembliesTests.cs | 2 +- .../Elements/CustomSyntaxElementsTests.cs | 2 +- .../Elements/MatchGenericReturnTypesTests.cs | 2 +- .../Elements/TypeSyntaxElementsTests.cs | 2 +- ArchUnitNETTests/Loader/ArchLoaderTests.cs | 2 +- ArchUnitNETTests/Loader/NestedTypesTests.cs | 2 +- ArchUnitNETTests/SkipInReleaseBuild.cs | 16 ++++- ArchUnitNETTests/StaticTestArchitectures.cs | 2 +- ExampleTest/ExampleArchUnitTest.cs | 2 +- ExampleTest/ExampleArchUnitTestPuml.cs | 2 +- ExampleTest/ExampleTest.csproj | 4 +- ExampleTest/LimitationsOnReleaseTest.cs | 2 +- global.json | 3 + 28 files changed, 47 insertions(+), 116 deletions(-) delete mode 100644 ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj delete mode 100644 ArchUnitNET.xUnitTests/RuleEvaluationTests.cs diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e56d9e73c..66a62808a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,7 +36,7 @@ jobs: with: dotnet-version: 10.0.100 - name: Run tests - run: dotnet test -c Debug --collect:"XPlat Code Coverage" --settings coverlet.runsettings ArchUnitNETTests/ + run: dotnet test -c Debug --collect:"XPlat Code Coverage" --settings coverlet.runsettings --project ArchUnitNETTests/ - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v5.5.2 with: diff --git a/ArchUnit.sln b/ArchUnit.sln index abcde8c42..2c8115a38 100644 --- a/ArchUnit.sln +++ b/ArchUnit.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 @@ -36,8 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilteredDirectoryLoaderTest EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitV3", "ArchUnitNET.xUnitV3\ArchUnitNET.xUnitV3.csproj", "{5DE11135-0C27-41B4-BC34-9CB17BF335A7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitTests", "ArchUnitNET.xUnitTests\ArchUnitNET.xUnitTests.csproj", "{E226D0D5-E50A-4E9C-A30F-F4747299D614}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitV3Tests", "ArchUnitNET.xUnitV3Tests\ArchUnitNET.xUnitV3Tests.csproj", "{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.TUnit", "ArchUnitNET.TUnit\ArchUnitNET.TUnit.csproj", "{AD4D9490-F6F1-47DC-9F52-FD15497CDE55}" @@ -118,10 +117,6 @@ Global {5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Release|Any CPU.Build.0 = Release|Any CPU - {E226D0D5-E50A-4E9C-A30F-F4747299D614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E226D0D5-E50A-4E9C-A30F-F4747299D614}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E226D0D5-E50A-4E9C-A30F-F4747299D614}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E226D0D5-E50A-4E9C-A30F-F4747299D614}.Release|Any CPU.Build.0 = Release|Any CPU {439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj index 3bfd16aea..a121b5c26 100644 --- a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj +++ b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj @@ -4,6 +4,8 @@ false TNG Technology Consulting GmbH true + true + Exe diff --git a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj index 7830bf379..2e9f53a74 100644 --- a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj +++ b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj @@ -4,6 +4,8 @@ false TNG Technology Consulting GmbH true + true + Exe diff --git a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj b/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj deleted file mode 100644 index e18b54d0f..000000000 --- a/ArchUnitNET.xUnitTests/ArchUnitNET.xUnitTests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - net10.0 - false - TNG Technology Consulting GmbH - true - - - - - - - - - - diff --git a/ArchUnitNET.xUnitTests/RuleEvaluationTests.cs b/ArchUnitNET.xUnitTests/RuleEvaluationTests.cs deleted file mode 100644 index 226636898..000000000 --- a/ArchUnitNET.xUnitTests/RuleEvaluationTests.cs +++ /dev/null @@ -1,66 +0,0 @@ -using ArchUnitNET.Domain; -using ArchUnitNET.Fluent; -using ArchUnitNET.Fluent.Extensions; -using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; -using Xunit; -using static ArchUnitNET.Fluent.ArchRuleDefinition; - -namespace ArchUnitNET.xUnitTests -{ - public class RuleEvaluationTests - { - private readonly Architecture _architecture; - private readonly string _expectedErrorMessage; - private readonly IArchRule _falseRule; - private readonly IArchRule _trueRule; - - public RuleEvaluationTests() - { - _architecture = new ArchLoader() - .LoadAssemblies(System.Reflection.Assembly.Load("ArchUnitNET.xUnitTests")) - .Build(); - _trueRule = Classes().That().Are(typeof(RuleEvaluationTests)).Should().Exist(); - _falseRule = Classes().That().Are(typeof(RuleEvaluationTests)).Should().NotExist(); - _expectedErrorMessage = _falseRule.Evaluate(_architecture).ToErrorMessage(); - } - - [Fact] - public void ArchRuleAssertTest() - { - ArchRuleAssert.CheckRule(_architecture, _trueRule); - Assert.Throws(() => - ArchRuleAssert.CheckRule(_architecture, _falseRule) - ); - Assert.Equal( - _expectedErrorMessage, - Assert - .Throws(() => - ArchRuleAssert.CheckRule(_architecture, _falseRule) - ) - .Message - ); - } - - [Fact] - public void ArchRuleExtensionsTest() - { - _architecture.CheckRule(_trueRule); - _trueRule.Check(_architecture); - Assert.Throws(() => _architecture.CheckRule(_falseRule)); - Assert.Throws(() => _falseRule.Check(_architecture)); - Assert.Equal( - _expectedErrorMessage, - Assert - .Throws(() => _architecture.CheckRule(_falseRule)) - .Message - ); - Assert.Equal( - _expectedErrorMessage, - Assert - .Throws(() => _falseRule.Check(_architecture)) - .Message - ); - } - } -} diff --git a/ArchUnitNETTests/ArchUnitNETTests.csproj b/ArchUnitNETTests/ArchUnitNETTests.csproj index 379287f61..fe547f27f 100644 --- a/ArchUnitNETTests/ArchUnitNETTests.csproj +++ b/ArchUnitNETTests/ArchUnitNETTests.csproj @@ -5,12 +5,13 @@ TNG Technology Consulting GmbH true true + Exe $(DefineConstants);WINDOWS - + @@ -35,8 +36,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/ArchUnitNETTests/ArchitectureTests/ArchUnitArchitectureTests.cs b/ArchUnitNETTests/ArchitectureTests/ArchUnitArchitectureTests.cs index df12379e0..49b7b9296 100644 --- a/ArchUnitNETTests/ArchitectureTests/ArchUnitArchitectureTests.cs +++ b/ArchUnitNETTests/ArchitectureTests/ArchUnitArchitectureTests.cs @@ -2,7 +2,7 @@ using ArchUnitNET.Fluent; using ArchUnitNET.Fluent.Slices; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Domain/AttributeArgumentTests.cs b/ArchUnitNETTests/Domain/AttributeArgumentTests.cs index ef4ecc5db..03f5d444b 100644 --- a/ArchUnitNETTests/Domain/AttributeArgumentTests.cs +++ b/ArchUnitNETTests/Domain/AttributeArgumentTests.cs @@ -3,7 +3,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; using Attribute = System.Attribute; diff --git a/ArchUnitNETTests/Domain/NullableReferenceTypeTests.cs b/ArchUnitNETTests/Domain/NullableReferenceTypeTests.cs index 6d6ca687e..fe95b4488 100644 --- a/ArchUnitNETTests/Domain/NullableReferenceTypeTests.cs +++ b/ArchUnitNETTests/Domain/NullableReferenceTypeTests.cs @@ -1,5 +1,5 @@ using ArchUnitNET.Domain; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using TestAssembly; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Domain/PlantUml/PlantUmlErrorMessagesCheck.cs b/ArchUnitNETTests/Domain/PlantUml/PlantUmlErrorMessagesCheck.cs index a2f6199f2..29e5fa778 100644 --- a/ArchUnitNETTests/Domain/PlantUml/PlantUmlErrorMessagesCheck.cs +++ b/ArchUnitNETTests/Domain/PlantUml/PlantUmlErrorMessagesCheck.cs @@ -4,7 +4,7 @@ using System.Linq; using ArchUnitNET.Domain; using ArchUnitNET.Fluent; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Fluent/FreezeTests.cs b/ArchUnitNETTests/Fluent/FreezeTests.cs index 968856cb3..b1206cdbf 100644 --- a/ArchUnitNETTests/Fluent/FreezeTests.cs +++ b/ArchUnitNETTests/Fluent/FreezeTests.cs @@ -3,7 +3,7 @@ using ArchUnitNET.Fluent.Freeze; using ArchUnitNET.Fluent.Slices; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; using static ArchUnitNET.Fluent.Freeze.FreezingArchRule; diff --git a/ArchUnitNETTests/Fluent/NoErrorReferencingOfTypesOutsideOfArchitectureTests.cs b/ArchUnitNETTests/Fluent/NoErrorReferencingOfTypesOutsideOfArchitectureTests.cs index 634f30025..3d779d38e 100644 --- a/ArchUnitNETTests/Fluent/NoErrorReferencingOfTypesOutsideOfArchitectureTests.cs +++ b/ArchUnitNETTests/Fluent/NoErrorReferencingOfTypesOutsideOfArchitectureTests.cs @@ -4,7 +4,7 @@ using ArchUnitNET.Domain.Exceptions; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using TestAssembly; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Fluent/RuleEvaluationTests.cs b/ArchUnitNETTests/Fluent/RuleEvaluationTests.cs index 20b022ca1..e894fc2d8 100644 --- a/ArchUnitNETTests/Fluent/RuleEvaluationTests.cs +++ b/ArchUnitNETTests/Fluent/RuleEvaluationTests.cs @@ -1,7 +1,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Fluent; using ArchUnitNET.Fluent.Extensions; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using ArchUnitNETTests.Domain; using Xunit; using static System.Environment; diff --git a/ArchUnitNETTests/Fluent/Slices/SlicesTests.cs b/ArchUnitNETTests/Fluent/Slices/SlicesTests.cs index 8fa7c0dc2..e7fbc8916 100644 --- a/ArchUnitNETTests/Fluent/Slices/SlicesTests.cs +++ b/ArchUnitNETTests/Fluent/Slices/SlicesTests.cs @@ -1,6 +1,6 @@ using System.Linq; using ArchUnitNET.Fluent.Slices; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; namespace ArchUnitNETTests.Fluent.Slices diff --git a/ArchUnitNETTests/Fluent/Syntax/DependenciesToOtherAssembliesTests.cs b/ArchUnitNETTests/Fluent/Syntax/DependenciesToOtherAssembliesTests.cs index 287cf8e89..7d3a39efb 100644 --- a/ArchUnitNETTests/Fluent/Syntax/DependenciesToOtherAssembliesTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/DependenciesToOtherAssembliesTests.cs @@ -1,7 +1,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using TestAssembly.DependencyTargets; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/CustomSyntaxElementsTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/CustomSyntaxElementsTests.cs index 6fb3e2970..75a637d66 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/CustomSyntaxElementsTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/CustomSyntaxElementsTests.cs @@ -2,7 +2,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/MatchGenericReturnTypesTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/MatchGenericReturnTypesTests.cs index 84001555c..f3308e070 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/MatchGenericReturnTypesTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/MatchGenericReturnTypesTests.cs @@ -1,6 +1,6 @@ using ArchUnitNET.Domain; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs index b941bba42..ed9198b2d 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using ArchUnitNETTests.AssemblyTestHelper; using ArchUnitNETTests.Domain; using Xunit; diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs index aeadfc2cb..91b7195f4 100644 --- a/ArchUnitNETTests/Loader/ArchLoaderTests.cs +++ b/ArchUnitNETTests/Loader/ArchLoaderTests.cs @@ -7,7 +7,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using ArchUnitNETTests.Domain.Dependencies.Members; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/Loader/NestedTypesTests.cs b/ArchUnitNETTests/Loader/NestedTypesTests.cs index bea18226c..ce9b37f40 100644 --- a/ArchUnitNETTests/Loader/NestedTypesTests.cs +++ b/ArchUnitNETTests/Loader/NestedTypesTests.cs @@ -1,6 +1,6 @@ using ArchUnitNET.Domain; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ArchUnitNETTests/SkipInReleaseBuild.cs b/ArchUnitNETTests/SkipInReleaseBuild.cs index de07925c5..29f1fad94 100644 --- a/ArchUnitNETTests/SkipInReleaseBuild.cs +++ b/ArchUnitNETTests/SkipInReleaseBuild.cs @@ -1,10 +1,16 @@ -using Xunit; +using System.Runtime.CompilerServices; +using JetBrains.Annotations; +using Xunit; namespace ArchUnitNETTests { public sealed class SkipInReleaseBuild : FactAttribute { - public SkipInReleaseBuild() + public SkipInReleaseBuild( + [CanBeNull] [CallerFilePath] string sourceFilePath = null, + [CallerLineNumber] int sourceLineNumber = -1 + ) + : base(sourceFilePath, sourceLineNumber) { #if !DEBUG Skip = "This test only works in debug build"; @@ -14,7 +20,11 @@ public SkipInReleaseBuild() public sealed class SkipInReleaseBuildTheory : TheoryAttribute { - public SkipInReleaseBuildTheory() + public SkipInReleaseBuildTheory( + [CanBeNull] [CallerFilePath] string sourceFilePath = null, + [CallerLineNumber] int sourceLineNumber = -1 + ) + : base(sourceFilePath, sourceLineNumber) { #if !DEBUG Skip = "This test only works in debug build"; diff --git a/ArchUnitNETTests/StaticTestArchitectures.cs b/ArchUnitNETTests/StaticTestArchitectures.cs index 28ea6143d..f6165333f 100644 --- a/ArchUnitNETTests/StaticTestArchitectures.cs +++ b/ArchUnitNETTests/StaticTestArchitectures.cs @@ -1,6 +1,6 @@ using ArchUnitNET.Domain; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using ArchUnitNETTests.Domain.Dependencies.Attributes; using ArchUnitNETTests.Domain.Dependencies.Members; using TestAssembly; diff --git a/ExampleTest/ExampleArchUnitTest.cs b/ExampleTest/ExampleArchUnitTest.cs index f3c484055..58bc5e515 100644 --- a/ExampleTest/ExampleArchUnitTest.cs +++ b/ExampleTest/ExampleArchUnitTest.cs @@ -4,7 +4,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Fluent; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ExampleTest/ExampleArchUnitTestPuml.cs b/ExampleTest/ExampleArchUnitTestPuml.cs index f0dddb548..e28de3d72 100644 --- a/ExampleTest/ExampleArchUnitTestPuml.cs +++ b/ExampleTest/ExampleArchUnitTestPuml.cs @@ -4,7 +4,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Fluent; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using ExampleTest.PlantUml.Addresses; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/ExampleTest/ExampleTest.csproj b/ExampleTest/ExampleTest.csproj index 7acabddeb..73f17ec77 100644 --- a/ExampleTest/ExampleTest.csproj +++ b/ExampleTest/ExampleTest.csproj @@ -5,11 +5,11 @@ true - + - + diff --git a/ExampleTest/LimitationsOnReleaseTest.cs b/ExampleTest/LimitationsOnReleaseTest.cs index fa57616ee..ab1eb07d4 100644 --- a/ExampleTest/LimitationsOnReleaseTest.cs +++ b/ExampleTest/LimitationsOnReleaseTest.cs @@ -3,7 +3,7 @@ using ArchUnitNET.Domain; using ArchUnitNET.Domain.Extensions; using ArchUnitNET.Loader; -using ArchUnitNET.xUnit; +using ArchUnitNET.xUnitV3; using Xunit; using static ArchUnitNET.Fluent.ArchRuleDefinition; diff --git a/global.json b/global.json index e69d70fba..946768df0 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,7 @@ { + "test": { + "runner": "Microsoft.Testing.Platform" + }, "sdk": { "version": "10.0.100", "rollForward": "latestMajor",