Skip to content

Commit 5473f5d

Browse files
brandhufbrandhuf
committed
Merge branch 'main' into remove_string_overloads_from_most_fluent_methods
# Conflicts: # ArchUnitNET/Domain/Extensions/AttributeExtensions.cs # ArchUnitNET/Domain/Extensions/DependencyExtensions.cs # ArchUnitNET/Domain/Extensions/MemberExtensions.cs # ArchUnitNET/Fluent/Syntax/Elements/Types/GivenTypesThat.cs
2 parents 6973c92 + 9c989b2 commit 5473f5d

File tree

456 files changed

+742
-3077
lines changed

Some content is hidden

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

456 files changed

+742
-3077
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"rollForward": false
1818
},
1919
"dotnet-reportgenerator-globaltool": {
20-
"version": "5.4.3",
20+
"version": "5.4.4",
2121
"commands": [
2222
"reportgenerator"
2323
],

‎.github/workflows/build.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
22+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
2323
with:
24-
dotnet-version: 8.0.405
24+
dotnet-version: 9.0.200
2525
- name: Install tools
2626
run: dotnet tool restore
2727
- name: Check formatting
@@ -33,13 +33,13 @@ jobs:
3333
- name: Checkout
3434
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
- name: Setup .NET
36-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
36+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
3737
with:
38-
dotnet-version: 8.0.405
38+
dotnet-version: 9.0.200
3939
- name: Run tests
4040
run: dotnet test -c Debug --collect:"XPlat Code Coverage" --settings coverlet.runsettings ArchUnitNETTests/
4141
- name: Upload coverage reports to Codecov
42-
uses: codecov/codecov-action@v4.6.0
42+
uses: codecov/codecov-action@v5.3.1
4343
with:
4444
token: ${{ secrets.CODECOV_TOKEN }}
4545
run-tests:
@@ -52,9 +52,9 @@ jobs:
5252
- name: Checkout
5353
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454
- name: Setup .NET
55-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
55+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
5656
with:
57-
dotnet-version: 8.0.405
57+
dotnet-version: 9.0.200
5858
- name: Run tests
5959
run: dotnet test -c Debug
6060
publish-docs:
@@ -138,9 +138,9 @@ jobs:
138138
- name: Checkout
139139
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
140140
- name: Setup .NET
141-
uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
141+
uses: actions/setup-dotnet@3951f0dfe7a07e2313ec93c75700083e2005cbab # v4.3.0
142142
with:
143-
dotnet-version: 8.0.405
143+
dotnet-version: 9.0.200
144144
- name: Build
145145
run: dotnet build -c Release
146146
- name: Pack

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
- name: Checkout repository
2424
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
26+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
2727
with:
2828
languages: ${{ matrix.language }}
2929
- name: Autobuild
30-
uses: github/codeql-action/autobuild@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
30+
uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
32+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
3333
with:
3434
category: "/language:${{matrix.language}}"

‎ArchUnit.sln‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OtherLoaderTestAssembly", "
3434
EndProject
3535
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilteredDirectoryLoaderTestAssembly", "TestAssemblies\FilteredDirectoryLoaderTestAssembly\FilteredDirectoryLoaderTestAssembly.csproj", "{E6CB8C69-25F5-4C94-8EA3-D56E444EB46B}"
3636
EndProject
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitV3", "ArchUnitNET.xUnitV3\ArchUnitNET.xUnitV3.csproj", "{5DE11135-0C27-41B4-BC34-9CB17BF335A7}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitTests", "ArchUnitNET.xUnitTests\ArchUnitNET.xUnitTests.csproj", "{E226D0D5-E50A-4E9C-A30F-F4747299D614}"
40+
EndProject
41+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchUnitNET.xUnitV3Tests", "ArchUnitNET.xUnitV3Tests\ArchUnitNET.xUnitV3Tests.csproj", "{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}"
42+
EndProject
3743
Global
3844
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3945
Debug|Any CPU = Debug|Any CPU
@@ -100,6 +106,18 @@ Global
100106
{E6CB8C69-25F5-4C94-8EA3-D56E444EB46B}.Debug|Any CPU.Build.0 = Debug|Any CPU
101107
{E6CB8C69-25F5-4C94-8EA3-D56E444EB46B}.Release|Any CPU.ActiveCfg = Release|Any CPU
102108
{E6CB8C69-25F5-4C94-8EA3-D56E444EB46B}.Release|Any CPU.Build.0 = Release|Any CPU
109+
{5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110+
{5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
111+
{5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
112+
{5DE11135-0C27-41B4-BC34-9CB17BF335A7}.Release|Any CPU.Build.0 = Release|Any CPU
113+
{E226D0D5-E50A-4E9C-A30F-F4747299D614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114+
{E226D0D5-E50A-4E9C-A30F-F4747299D614}.Debug|Any CPU.Build.0 = Debug|Any CPU
115+
{E226D0D5-E50A-4E9C-A30F-F4747299D614}.Release|Any CPU.ActiveCfg = Release|Any CPU
116+
{E226D0D5-E50A-4E9C-A30F-F4747299D614}.Release|Any CPU.Build.0 = Release|Any CPU
117+
{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118+
{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
119+
{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
120+
{439E00CE-5CB8-4474-9A27-3FFC5770DB7C}.Release|Any CPU.Build.0 = Release|Any CPU
103121
EndGlobalSection
104122
GlobalSection(SolutionProperties) = preSolution
105123
HideSolutionNode = FALSE

‎ArchUnit.sln.DotSettings‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
44
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
55
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
6-
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright 2019 Florian Gather &lt;[email protected]&gt;
7-
Copyright 2019 Fritz Brandhuber &lt;[email protected]&gt;
8-
Copyright 2020 Pavel Fischer &lt;[email protected]&gt;
9-
10-
SPDX-License-Identifier: Apache-2.0
11-
</s:String>
6+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"></s:String>
127
<s:Boolean x:Key="/Default/CodeStyle/Naming/CSharpNaming/ApplyAutoDetectedRules/@EntryValue">False</s:Boolean>
138
<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String>
149
<s:Boolean x:Key="/Default/UserDictionary/Words/=archrule/@EntryIndexedValue">True</s:Boolean>

‎ArchUnitNET.MSTestV2/ArchRuleAssert.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
// Copyright 2019 Florian Gather <[email protected]>
2-
// Copyright 2019 Paula Ruiz <[email protected]>
3-
// Copyright 2019 Fritz Brandhuber <[email protected]>
4-
//
5-
// SPDX-License-Identifier: Apache-2.0
6-
7-
using ArchUnitNET.Domain;
1+
using ArchUnitNET.Domain;
82
using ArchUnitNET.Fluent;
93
using ArchUnitNET.Fluent.Extensions;
104
using Microsoft.VisualStudio.TestTools.UnitTesting;

‎ArchUnitNET.MSTestV2/ArchRuleExtensions.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
// Copyright 2019 Florian Gather <[email protected]>
2-
// Copyright 2019 Paula Ruiz <[email protected]>
3-
// Copyright 2019 Fritz Brandhuber <[email protected]>
4-
//
5-
// SPDX-License-Identifier: Apache-2.0
6-
7-
using ArchUnitNET.Domain;
1+
using ArchUnitNET.Domain;
82
using ArchUnitNET.Fluent;
93

104
namespace ArchUnitNET.MSTestV2

‎ArchUnitNET.MSTestV2/ArchUnitNET.MSTestV2.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
55
<IsPackable>true</IsPackable>
66
<Title>ArchUnit C# MSTestV2 Extension</Title>
7-
<Authors>Florian Gather, Fritz Brandhuber</Authors>
87
<Description>MSTestV2 Extension for the C# Version of ArchUnit (see: archunit.org)</Description>
98
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
109
<RepositoryUrl>https://github.com/TNG/ArchUnitNET</RepositoryUrl>

‎ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Company>TNG Technology Consulting GmbH</Company>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
1313
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1414
</ItemGroup>

‎ArchUnitNET.MSTestV2Tests/RuleEvaluationTests.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
// Copyright 2019 Florian Gather <[email protected]>
2-
// Copyright 2019 Paula Ruiz <[email protected]>
3-
// Copyright 2019 Fritz Brandhuber <[email protected]>
4-
//
5-
// SPDX-License-Identifier: Apache-2.0
6-
71
using ArchUnitNET.Domain;
82
using ArchUnitNET.Fluent;
93
using ArchUnitNET.Fluent.Extensions;

0 commit comments

Comments
 (0)