diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 01d032e9..0c8a0cfe 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.28.2", + "version": "0.29.2", "commands": [ "dotnet-csharpier" ], @@ -17,7 +17,7 @@ "rollForward": false }, "dotnet-reportgenerator-globaltool": { - "version": "5.3.8", + "version": "5.3.10", "commands": [ "reportgenerator" ], diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 4eb2688a..36826618 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1 +1,2 @@ -60e7aa44819edda932026dc2254db2876e70ead3 \ No newline at end of file +60e7aa44819edda932026dc2254db2876e70ead3 +dce4f8e835aea7f610b6cdda6f89b62a711df35b \ No newline at end of file diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 475b9756..8a984007 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Setup .NET uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Setup .NET uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: @@ -39,7 +39,7 @@ jobs: - 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@v4.5.0 + uses: codecov/codecov-action@v4.6.0 with: token: ${{ secrets.CODECOV_TOKEN }} run-tests: @@ -50,7 +50,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Setup .NET uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: @@ -68,7 +68,7 @@ jobs: contents: write steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Setup doxygen run: sudo apt-get install doxygen graphviz - name: Create temporary directory @@ -88,7 +88,7 @@ jobs: fi fi - name: Checkout gh-pages branch - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: ref: gh-pages path: ${{ env.DOCS_TEMP_DIR }} @@ -136,7 +136,7 @@ jobs: - run-tests steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Setup .NET uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e92a0dc9..ae771088 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: Initialize CodeQL - uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0 + uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11 with: category: "/language:${{matrix.language}}" diff --git a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj index 0e9da0e8..cc59b648 100644 --- a/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj +++ b/ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj index 6444aa3d..03da77d7 100644 --- a/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj +++ b/ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj @@ -8,7 +8,7 @@ - + diff --git a/ArchUnitNET/ArchUnitNET.csproj b/ArchUnitNET/ArchUnitNET.csproj index ed709ed7..9332f264 100644 --- a/ArchUnitNET/ArchUnitNET.csproj +++ b/ArchUnitNET/ArchUnitNET.csproj @@ -22,7 +22,7 @@ - + diff --git a/ArchUnitNET/Domain/GenericParameter.cs b/ArchUnitNET/Domain/GenericParameter.cs index 337e6a8a..ab183583 100644 --- a/ArchUnitNET/Domain/GenericParameter.cs +++ b/ArchUnitNET/Domain/GenericParameter.cs @@ -150,6 +150,6 @@ public enum GenericParameterVariance { NonVariant, Covariant, - Contravariant + Contravariant, } } diff --git a/ArchUnitNET/Domain/MethodForm.cs b/ArchUnitNET/Domain/MethodForm.cs index 1ac82123..301fe199 100644 --- a/ArchUnitNET/Domain/MethodForm.cs +++ b/ArchUnitNET/Domain/MethodForm.cs @@ -11,6 +11,6 @@ public enum MethodForm Constructor, Getter, Setter, - Normal + Normal, } } diff --git a/ArchUnitNET/Domain/PlantUml/Export/PlantUmlDependency.cs b/ArchUnitNET/Domain/PlantUml/Export/PlantUmlDependency.cs index ae0a366a..50530a95 100644 --- a/ArchUnitNET/Domain/PlantUml/Export/PlantUmlDependency.cs +++ b/ArchUnitNET/Domain/PlantUml/Export/PlantUmlDependency.cs @@ -198,6 +198,6 @@ public enum DependencyType PackageToPackageIfSameParentNamespace, OneToOneCompact, Circle, - NoDependency + NoDependency, } } diff --git a/ArchUnitNET/Domain/PlantUml/Export/PlantUmlNameChecker.cs b/ArchUnitNET/Domain/PlantUml/Export/PlantUmlNameChecker.cs index b986c33f..0f1fad5b 100644 --- a/ArchUnitNET/Domain/PlantUml/Export/PlantUmlNameChecker.cs +++ b/ArchUnitNET/Domain/PlantUml/Export/PlantUmlNameChecker.cs @@ -23,7 +23,7 @@ public static class PlantUmlNameChecker "\f", "\a", "\b", - "\v" + "\v", }; public static bool ContainsForbiddenCharacters([CanBeNull] string name) diff --git a/ArchUnitNET/Domain/Visibility.cs b/ArchUnitNET/Domain/Visibility.cs index 721391de..0bd12081 100644 --- a/ArchUnitNET/Domain/Visibility.cs +++ b/ArchUnitNET/Domain/Visibility.cs @@ -14,7 +14,9 @@ public enum Visibility Protected = 3, PrivateProtected = 4, Private = 5, - NotAccessible = 6 //should only be used for Getters/Setters or as default instead of null + NotAccessible = + 6 //should only be used for Getters/Setters or as default instead of null + , } public static class VisibilityStrings @@ -27,7 +29,7 @@ public static class VisibilityStrings "Protected", "Private Protected", "Private", - "Not Accessible" + "Not Accessible", }; private static readonly string[] LowerCase = @@ -38,7 +40,7 @@ public static class VisibilityStrings "protected", "private protected", "private", - "not accessible" + "not accessible", }; public static string ToString(this Visibility visibility, bool useCapitalLetters = false) diff --git a/ArchUnitNET/Domain/Writability.cs b/ArchUnitNET/Domain/Writability.cs index abc6d58f..e6abcf6f 100644 --- a/ArchUnitNET/Domain/Writability.cs +++ b/ArchUnitNET/Domain/Writability.cs @@ -4,7 +4,7 @@ public enum Writability { ReadOnly, InitOnly, - Writable + Writable, } public static class WritabilityExtensions diff --git a/ArchUnitNET/Fluent/ConditionManager.cs b/ArchUnitNET/Fluent/ConditionManager.cs index ba056db5..091f21af 100644 --- a/ArchUnitNET/Fluent/ConditionManager.cs +++ b/ArchUnitNET/Fluent/ConditionManager.cs @@ -28,7 +28,7 @@ public ConditionManager() { _conditionElements = new List> { - new ConditionElement(LogicalConjunctionDefinition.ForwardSecondValue) + new ConditionElement(LogicalConjunctionDefinition.ForwardSecondValue), }; } diff --git a/ArchUnitNET/Fluent/Freeze/XmlViolationStore.cs b/ArchUnitNET/Fluent/Freeze/XmlViolationStore.cs index 7dc3c219..ae58ee2a 100644 --- a/ArchUnitNET/Fluent/Freeze/XmlViolationStore.cs +++ b/ArchUnitNET/Fluent/Freeze/XmlViolationStore.cs @@ -25,7 +25,7 @@ public class XmlViolationStore : IViolationStore private static readonly XmlWriterSettings WriterSettings = new XmlWriterSettings { Indent = true, - Encoding = Encoding.UTF8 + Encoding = Encoding.UTF8, }; public XmlViolationStore(string storagePath = DefaultStoragePath) diff --git a/ArchUnitNET/Fluent/PredicateManager.PredicateManager.cs b/ArchUnitNET/Fluent/PredicateManager.PredicateManager.cs index 310d0087..a7f4ac33 100644 --- a/ArchUnitNET/Fluent/PredicateManager.PredicateManager.cs +++ b/ArchUnitNET/Fluent/PredicateManager.PredicateManager.cs @@ -30,7 +30,7 @@ public PredicateManager(BasicObjectProvider basicObjectProvider) new PredicateElement( LogicalConjunctionDefinition.ForwardSecondValue, new SimplePredicate(t => true, NotSet) - ) + ), }; _hasCustomDescription = false; } @@ -42,15 +42,14 @@ public PredicateManager(BasicObjectProvider basicObjectProvider) (current, objectFilterElement) => current + " " + objectFilterElement.Description ) - : _predicateElements.First().Description == NotSet - ? _basicObjectProvider.Description - : _basicObjectProvider.Description - + " that" - + _predicateElements.Aggregate( - "", - (current, objectFilterElement) => - current + " " + objectFilterElement.Description - ); + : _predicateElements.First().Description == NotSet ? _basicObjectProvider.Description + : _basicObjectProvider.Description + + " that" + + _predicateElements.Aggregate( + "", + (current, objectFilterElement) => + current + " " + objectFilterElement.Description + ); public IEnumerable GetObjects(Architecture architecture) { diff --git a/ArchUnitNET/Fluent/Slices/SlicesShould.cs b/ArchUnitNET/Fluent/Slices/SlicesShould.cs index 9e77d931..78caa522 100644 --- a/ArchUnitNET/Fluent/Slices/SlicesShould.cs +++ b/ArchUnitNET/Fluent/Slices/SlicesShould.cs @@ -74,7 +74,7 @@ Architecture architecture { var depsFromThisSliceToOtherSlice = new List { - slice.Description + " -> " + otherSlice.Description + slice.Description + " -> " + otherSlice.Description, }; depsFromThisSliceToOtherSlice.AddRange( depsToSlice.Select(dependency => diff --git a/ArchUnitNET/Loader/ArchBuilder.cs b/ArchUnitNET/Loader/ArchBuilder.cs index 3a037783..eecf9549 100644 --- a/ArchUnitNET/Loader/ArchBuilder.cs +++ b/ArchUnitNET/Loader/ArchBuilder.cs @@ -150,7 +150,7 @@ private void UpdateTypeDefinitions() typeof(AddGenericArgumentDependencies), typeof(AddClassDependencies), typeof(AddBackwardsDependencies), - typeof(AddTypesToNamespace) + typeof(AddTypesToNamespace), } ); } diff --git a/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs b/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs index a50c7720..37275210 100644 --- a/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs +++ b/ArchUnitNET/Loader/MonoCecilMemberExtensions.cs @@ -31,7 +31,7 @@ internal static class MonoCecilMemberExtensions OpCodes.Ldobj, OpCodes.Stelem_Any, OpCodes.Ldelema, - OpCodes.Stobj + OpCodes.Stobj, }; //maybe not complete internal static string BuildFullName(this MethodReference methodReference) diff --git a/ArchUnitNETTests/ArchUnitNETTests.csproj b/ArchUnitNETTests/ArchUnitNETTests.csproj index 0d79e0aa..4f4c6969 100644 --- a/ArchUnitNETTests/ArchUnitNETTests.csproj +++ b/ArchUnitNETTests/ArchUnitNETTests.csproj @@ -20,14 +20,14 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + diff --git a/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeDependencyTests.cs b/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeDependencyTests.cs index 0d587455..f3af0076 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeDependencyTests.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeDependencyTests.cs @@ -100,7 +100,7 @@ public void MemberAttributeInnerDependencyAssignedToOriginClass() _class1, _class2, _classWithAttribute, - _classWithBodyTypeA + _classWithBodyTypeA, }; //Assert diff --git a/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeTestsBuild.cs b/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeTestsBuild.cs index 2cc1366a..141191e4 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeTestsBuild.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Attributes/AttributeTestsBuild.cs @@ -78,7 +78,7 @@ public class TypeAttributesAreFoundData : IEnumerable BuildTypeAttributeTestData( typeof(StructWithAttribute), typeof(ExampleStructAttribute) - ) + ), }; public IEnumerator GetEnumerator() @@ -133,7 +133,7 @@ public class MemberAttributesAreFoundData : IEnumerable typeof(ClassWithExampleAttribute), nameof(ClassWithExampleAttribute.FieldWithAbstractAttributeImplemented), typeof(ChildOfAbstractAttribute) - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/Dependencies/Attributes/TestAttributes.cs b/ArchUnitNETTests/Domain/Dependencies/Attributes/TestAttributes.cs index 714ed8a4..212fd6c3 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Attributes/TestAttributes.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Attributes/TestAttributes.cs @@ -169,7 +169,7 @@ public enum EnumWithAttribute Enum1, Enum2, Enum3, - Enum4 + Enum4, } [ExampleInterface] diff --git a/ArchUnitNETTests/Domain/Dependencies/Members/ClassDependenciesIncludeMemberDependencies.cs b/ArchUnitNETTests/Domain/Dependencies/Members/ClassDependenciesIncludeMemberDependencies.cs index 0b34f90a..054ade02 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Members/ClassDependenciesIncludeMemberDependencies.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Members/ClassDependenciesIncludeMemberDependencies.cs @@ -48,7 +48,7 @@ public class MethodDependenciesWithClassTestData : IEnumerable BuildClassTestData(typeof(ClassWithConstructors)), BuildClassTestData(typeof(ClassWithMethodSignatureA)), BuildClassTestData(typeof(ClassWithMethodSignatureB)), - BuildClassTestData(typeof(ClassWithMethodSignatureC)) + BuildClassTestData(typeof(ClassWithMethodSignatureC)), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/Dependencies/Members/GetterSetterTestsBuild.cs b/ArchUnitNETTests/Domain/Dependencies/Members/GetterSetterTestsBuild.cs index 9b94503c..669e846c 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Members/GetterSetterTestsBuild.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Members/GetterSetterTestsBuild.cs @@ -100,7 +100,7 @@ MethodMember expectedTargetMember { accessedProperty, expectedFieldDependencyTarget, - expectedDependency + expectedDependency, }; } @@ -184,7 +184,7 @@ public class SetterTestData : IEnumerable typeof(SetterMethodDependencyExamples), nameof(SetterMethodDependencyExamples.MethodLambdaPair), typeof(PropertyType) - ) + ), }; public IEnumerator GetEnumerator() @@ -219,7 +219,7 @@ public class GetterTestData : IEnumerable nameof(GetterMethodDependencyExamples.SecondUnacceptedCase), MockGuidStruct, MockNewGuid - ) + ), }; public IEnumerator GetEnumerator() @@ -281,7 +281,7 @@ public class AccessMethodDependenciesByPropertyTestData : IEnumerable typeof(GetterMethodDependencyExamples), nameof(GetterMethodDependencyExamples.SecondUnacceptedCase), MethodForm.Getter - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/Dependencies/Members/MemberDependencyTestBuild.cs b/ArchUnitNETTests/Domain/Dependencies/Members/MemberDependencyTestBuild.cs index 9bef205f..374d0e45 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Members/MemberDependencyTestBuild.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Members/MemberDependencyTestBuild.cs @@ -54,7 +54,7 @@ Type targetType memberTypeDependency, duplicateMemberTypeDependency, dependencyReferenceDuplicate, - objectReferenceDuplicate + objectReferenceDuplicate, }; } @@ -85,7 +85,7 @@ Type targetType memberTypeDependency, duplicateMemberTypeDependency, dependencyReferenceDuplicate, - objectReferenceDuplicate + objectReferenceDuplicate, }; } @@ -132,7 +132,7 @@ string targetMemberName memberTypeDependency, duplicateMemberTypeDependency, dependencyReferenceDuplicate, - objectReferenceDuplicate + objectReferenceDuplicate, }; } @@ -168,7 +168,7 @@ Type targetType memberTypeDependency, duplicateMemberTypeDependency, dependencyReferenceDuplicate, - objectReferenceDuplicate + objectReferenceDuplicate, }; } @@ -198,7 +198,7 @@ Type targetType memberTypeDependency, duplicateMemberTypeDependency, dependencyReferenceDuplicate, - objectReferenceDuplicate + objectReferenceDuplicate, }; } @@ -246,7 +246,7 @@ public class MemberDependencyModelingTestData : IEnumerable typeof(ClassWithMethodSignatureA), nameof(ClassWithMethodSignatureA.MethodA).BuildMethodMemberName(), typeof(ClassWithMethodSignatureB) - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/Dependencies/Members/MethodDependencyTestBuild.cs b/ArchUnitNETTests/Domain/Dependencies/Members/MethodDependencyTestBuild.cs index 6703d48b..6bfd9ab8 100644 --- a/ArchUnitNETTests/Domain/Dependencies/Members/MethodDependencyTestBuild.cs +++ b/ArchUnitNETTests/Domain/Dependencies/Members/MethodDependencyTestBuild.cs @@ -86,7 +86,7 @@ public class MethodCallDependencyTestData : IEnumerable nameof(ClassWithMethodB.MethodB).BuildMethodMemberName(), typeof(ClassWithMethodA), nameof(ClassWithMethodA.MethodA).BuildMethodMemberName() - ) + ), }; public IEnumerator GetEnumerator() @@ -127,7 +127,7 @@ public class MethodCallDependencyInAsyncMethodTestData : IEnumerable nameof(ClassWithMethodB.MethodB).BuildMethodMemberName(), typeof(ClassWithMethodA), nameof(ClassWithMethodA.MethodA).BuildMethodMemberName() - ) + ), }; public IEnumerator GetEnumerator() @@ -163,7 +163,7 @@ public class MethodSignatureDependencyTestData : IEnumerable typeof(ClassWithMethodSignatureB) ), typeof(ClassWithMethodSignatureB) - ) + ), }; public IEnumerator GetEnumerator() @@ -189,7 +189,7 @@ public class ConstructorTestData : IEnumerable ), ClassDependenciesIncludeMemberDependenciesBuild.BuildClassTestData( typeof(ClassWithConstructors) - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/MemberTestBuild.cs b/ArchUnitNETTests/Domain/MemberTestBuild.cs index 281b838c..76e04696 100644 --- a/ArchUnitNETTests/Domain/MemberTestBuild.cs +++ b/ArchUnitNETTests/Domain/MemberTestBuild.cs @@ -27,7 +27,7 @@ private static object[] BuildOriginMemberTestData(Type originType, string member Architecture .GetClassOfType(originType) .GetMembersWithName(memberName) - .SingleOrDefault() + .SingleOrDefault(), }; } @@ -43,7 +43,7 @@ public class OriginMemberTestData : IEnumerable BuildOriginMemberTestData( typeof(ClassWithPropertyA), nameof(ClassWithPropertyA.PropertyA) - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Domain/PlantUml/PlantUmlFileBuilderTest.cs b/ArchUnitNETTests/Domain/PlantUml/PlantUmlFileBuilderTest.cs index d0ecbbf6..18410422 100644 --- a/ArchUnitNETTests/Domain/PlantUml/PlantUmlFileBuilderTest.cs +++ b/ArchUnitNETTests/Domain/PlantUml/PlantUmlFileBuilderTest.cs @@ -28,7 +28,7 @@ public class PlantUmlFileBuilderTest { new PlantUmlDependency("a", "b", DependencyType.OneToOne), new PlantUmlDependency("b", "c", DependencyType.OneToOne), - new PlantUmlDependency("c", "a", DependencyType.OneToOne) + new PlantUmlDependency("c", "a", DependencyType.OneToOne), }; [Fact] @@ -165,11 +165,11 @@ public void SpecialCharactersInComponentNamesTest() { new PlantUmlDependency("!\"§´`", "$%&/()=?", DependencyType.OneToOne), new PlantUmlDependency("\\\t%", "äöüß", DependencyType.OneToOne), - new PlantUmlDependency("^°-*+.,;:", "<>|@€", DependencyType.OneToOne) + new PlantUmlDependency("^°-*+.,;:", "<>|@€", DependencyType.OneToOne), }; var classesWithSpecialCharacters = new[] { - new PlantUmlClass("!§´`$%&/()=?\\\täöüß^°-*+,-.,;:<>|@€") + new PlantUmlClass("!§´`$%&/()=?\\\täöüß^°-*+,-.,;:<>|@€"), }; var builder = new PlantUmlFileBuilder().WithElements( dependenciesWithSpecialCharacters.Concat(classesWithSpecialCharacters) diff --git a/ArchUnitNETTests/Domain/PlantUml/PlantUmlParserTest.cs b/ArchUnitNETTests/Domain/PlantUml/PlantUmlParserTest.cs index ede765b3..2492745b 100644 --- a/ArchUnitNETTests/Domain/PlantUml/PlantUmlParserTest.cs +++ b/ArchUnitNETTests/Domain/PlantUml/PlantUmlParserTest.cs @@ -268,7 +268,7 @@ public void ParsesComponentDiagramWithMultipleStereotypes() { new Stereotype("FirstNamespace.*"), new Stereotype("SecondNamespace.*"), - new Stereotype("ThirdNamespace.*") + new Stereotype("ThirdNamespace.*"), }, component.Stereotypes.OrderBy(st => st.AsString()) ); diff --git a/ArchUnitNETTests/Fluent/PlantUml/PlantUmlFluentComponentDiagramTests.cs b/ArchUnitNETTests/Fluent/PlantUml/PlantUmlFluentComponentDiagramTests.cs index b7723b34..f44fc3bf 100644 --- a/ArchUnitNETTests/Fluent/PlantUml/PlantUmlFluentComponentDiagramTests.cs +++ b/ArchUnitNETTests/Fluent/PlantUml/PlantUmlFluentComponentDiagramTests.cs @@ -35,7 +35,7 @@ public class PlantUmlFluentComponentDiagramTests new PlantUmlDependency("f", "g", DependencyType.PackageToOne), new PlantUmlDependency("g", "h", DependencyType.PackageToPackage), new PlantUmlDependency("h", "i", DependencyType.OneToOneCompact), - new PlantUmlDependency("i", "a", DependencyType.OneToOneIfSameParentNamespace) + new PlantUmlDependency("i", "a", DependencyType.OneToOneIfSameParentNamespace), }; [Fact] @@ -185,7 +185,7 @@ public void ComponentDiagramWriteToFileTest() "g -[#green]> h", "[h] --> [i]", "i --|> a", - "@enduml" + "@enduml", }; ComponentDiagram() .WithElements(Dependencies.Concat(classesWithoutDependencies)) diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/MemberSyntaxElementsTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/MemberSyntaxElementsTests.cs index 4f6a5fbd..3b267ab3 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/MemberSyntaxElementsTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/MemberSyntaxElementsTests.cs @@ -29,25 +29,25 @@ public MemberSyntaxElementsTests() private readonly List _falseTypes1 = new List { StaticTestTypes.PublicTestClass, - StaticTestTypes.InternalTestClass + StaticTestTypes.InternalTestClass, }; private readonly List _falseTypes2 = new List { typeof(PublicTestClass), - typeof(InternalTestClass) + typeof(InternalTestClass), }; private readonly List _falseTypesPattern = new List { StaticTestTypes.PublicTestClass.FullName, - StaticTestTypes.InternalTestClass.FullName + StaticTestTypes.InternalTestClass.FullName, }; private readonly List _falseTypeConstructors = new List { PublicTestClassConstructor, - InternalTestClassConstructor + InternalTestClassConstructor, }; private const string PublicTestClassConstructor = diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectSyntaxElementsTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectSyntaxElementsTests.cs index 1ca9ee89..bf9fd665 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectSyntaxElementsTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectSyntaxElementsTests.cs @@ -27,7 +27,7 @@ public class ObjectSyntaxElementsTests private readonly IEnumerable _falseDependencies = new List { typeof(ClassWithNoDependencies1), - typeof(ClassWithNoDependencies2) + typeof(ClassWithNoDependencies2), }; private readonly IEnumerable _types = Architecture.Types; @@ -174,7 +174,7 @@ public void AreTest() var list = new List { StaticTestTypes.PublicTestClass, - StaticTestTypes.InternalTestClass + StaticTestTypes.InternalTestClass, }; var listPublicTestClassAndInternalTestClassIsPublicOrInternal = Types() .That() @@ -204,7 +204,7 @@ public void AreTest() var patternList = new List { StaticTestTypes.PublicTestClass.FullName, - StaticTestTypes.InternalTestClass.FullName + StaticTestTypes.InternalTestClass.FullName, }; var publicTestClassAndInternalTestClassIsPublicOrInternalPattern = Types() .That() @@ -1082,7 +1082,7 @@ public void VisibilityTest() Types().That().Are(NestedProtectedTestClass).Should().BeProtected(), Types().That().Are(NestedInternalTestClass).Should().BeInternal(), Types().That().Are(NestedProtectedInternalTestClass).Should().BeProtectedInternal(), - Types().That().Are(NestedPrivateProtectedTestClass).Should().BePrivateProtected() + Types().That().Are(NestedPrivateProtectedTestClass).Should().BePrivateProtected(), }; foreach (var visibilityRule in visibilityRules) diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectsShouldTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectsShouldTests.cs index 6b82179b..d11a8b2b 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectsShouldTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/ObjectsShouldTests.cs @@ -520,7 +520,7 @@ public async Task CallAnyTest() .CallAny( [ helper.MethodWithoutDependencies.FullName, - helper.MethodWithMultipleDependencies.FullName + helper.MethodWithMultipleDependencies.FullName, ] ) .AssertOnlyViolations(helper); @@ -1018,7 +1018,7 @@ public async Task HaveAnyAttributesWithNamedArguments() .HaveAnyAttributesWithNamedArguments( [ helper.Attribute1NamedParameter1Pair, - helper.Attribute1NamedParameter2InvalidValuePair + helper.Attribute1NamedParameter2InvalidValuePair, ] ) .AssertOnlyViolations(helper); @@ -1773,7 +1773,7 @@ public async Task NotCallAnyTest() [ helper.MethodWithoutDependencies.FullName, helper.CalledMethod1.FullName, - helper.CalledMethod2.FullName + helper.CalledMethod2.FullName, ] ) .AssertOnlyViolations(helper); diff --git a/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs b/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs index 4fe45783..a2bc5db9 100644 --- a/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs +++ b/ArchUnitNETTests/Fluent/Syntax/Elements/TypeSyntaxElementsTests.cs @@ -144,17 +144,17 @@ public void AssignableToTest() var falseTypeList1 = new List { typeof(PublicTestClass), - typeof(InternalTestClass) + typeof(InternalTestClass), }; var falseTypeList2 = new List { StaticTestTypes.PublicTestClass, - StaticTestTypes.InternalTestClass + StaticTestTypes.InternalTestClass, }; var falseTypeListPattern = new List { StaticTestTypes.PublicTestClass.FullName, - StaticTestTypes.InternalTestClass.FullName + StaticTestTypes.InternalTestClass.FullName, }; foreach (var type in _types) { @@ -354,7 +354,7 @@ public void NestedInTest() var typeList2 = new List { StaticTestTypes.PublicTestClass, - StaticTestTypes.InternalTestClass + StaticTestTypes.InternalTestClass, }; Classes() diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs index ca4cdc1c..a18d12be 100644 --- a/ArchUnitNETTests/Loader/ArchLoaderTests.cs +++ b/ArchUnitNETTests/Loader/ArchLoaderTests.cs @@ -34,10 +34,8 @@ public void SameFullNameInMultipleAssemblies() type.Namespace.FullName == "DuplicateClassAcrossAssemblies" ); Assert.Equal(2, types.Count()); - Assert.Single(types.Where(type => type.Assembly.Name.StartsWith("LoaderTestAssembly"))); - Assert.Single( - types.Where(type => type.Assembly.Name.StartsWith("OtherLoaderTestAssembly")) - ); + Assert.Single(types, type => type.Assembly.Name.StartsWith("LoaderTestAssembly")); + Assert.Single(types, type => type.Assembly.Name.StartsWith("OtherLoaderTestAssembly")); } [Fact] diff --git a/ArchUnitNETTests/Loader/InstructionExtensionTests.cs b/ArchUnitNETTests/Loader/InstructionExtensionTests.cs index c7114c61..7c4d8cf0 100644 --- a/ArchUnitNETTests/Loader/InstructionExtensionTests.cs +++ b/ArchUnitNETTests/Loader/InstructionExtensionTests.cs @@ -115,7 +115,7 @@ public class InstructionExtensionTestData : IEnumerable BuildInstructionExtensionTestData(InstructionExtensions.IsSetFieldOp), BuildInstructionExtensionTestData( InstructionExtensions.IsNewObjectToSetBackingField - ) + ), }; public IEnumerator GetEnumerator() diff --git a/ArchUnitNETTests/Loader/TypeTestBuild.cs b/ArchUnitNETTests/Loader/TypeTestBuild.cs index 51412310..cf9d2093 100644 --- a/ArchUnitNETTests/Loader/TypeTestBuild.cs +++ b/ArchUnitNETTests/Loader/TypeTestBuild.cs @@ -81,7 +81,7 @@ public class TypeModelingTestData : IEnumerable BuildTypeTestData(typeof(ClassWithFieldA)), BuildTypeTestData(typeof(ClassWithPropertyA)), BuildTypeTestData(typeof(ClassWithMethodA)), - BuildTypeTestData(typeof(ClassWithExampleAttribute)) + BuildTypeTestData(typeof(ClassWithExampleAttribute)), }; public IEnumerator GetEnumerator() @@ -102,7 +102,7 @@ public class TypeEquivalencyModelingTestData : IEnumerable BuildTypeEquivalenceTestData(typeof(ClassWithFieldA)), BuildTypeEquivalenceTestData(typeof(ClassWithPropertyA)), BuildTypeEquivalenceTestData(typeof(ClassWithMethodA)), - BuildTypeEquivalenceTestData(typeof(ClassWithExampleAttribute)) + BuildTypeEquivalenceTestData(typeof(ClassWithExampleAttribute)), }; public IEnumerator GetEnumerator() diff --git a/ExampleTest/ExampleTest.csproj b/ExampleTest/ExampleTest.csproj index 8bd71b32..a54914a9 100644 --- a/ExampleTest/ExampleTest.csproj +++ b/ExampleTest/ExampleTest.csproj @@ -11,9 +11,9 @@ - - - + + +