Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update all non-major dependencies #307

Merged
merged 5 commits into from
Oct 11, 2024
Merged
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
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.28.2",
"version": "0.29.2",
"commands": [
"dotnet-csharpier"
],
Expand All @@ -17,7 +17,7 @@
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.3.8",
"version": "5.3.10",
"commands": [
"reportgenerator"
],
Expand Down
3 changes: 2 additions & 1 deletion .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
60e7aa44819edda932026dc2254db2876e70ead3
60e7aa44819edda932026dc2254db2876e70ead3
dce4f8e835aea7f610b6cdda6f89b62a711df35b
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -31,15 +31,15 @@ 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:
dotnet-version: 8.0.303
- 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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}"
6 changes: 3 additions & 3 deletions ArchUnitNET.MSTestV2Tests/ArchUnitNET.MSTestV2Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET.NUnitTests/ArchUnitNET.NUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/ArchUnitNET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="CycleDetection" Version="2.0.0"/>
<PackageReference Include="JetBrains.Annotations" Version="2020.3.0"/>
<PackageReference Include="Mono.Cecil" Version="0.11.5"/>
<PackageReference Include="Mono.Cecil" Version="0.11.6"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="System.ValueTuple" Version="4.5.0"/>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/GenericParameter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,6 @@ public enum GenericParameterVariance
{
NonVariant,
Covariant,
Contravariant
Contravariant,
}
}
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/MethodForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public enum MethodForm
Constructor,
Getter,
Setter,
Normal
Normal,
}
}
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/PlantUml/Export/PlantUmlDependency.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,6 @@ public enum DependencyType
PackageToPackageIfSameParentNamespace,
OneToOneCompact,
Circle,
NoDependency
NoDependency,
}
}
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/PlantUml/Export/PlantUmlNameChecker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static class PlantUmlNameChecker
"\f",
"\a",
"\b",
"\v"
"\v",
};

public static bool ContainsForbiddenCharacters([CanBeNull] string name)
Expand Down
8 changes: 5 additions & 3 deletions ArchUnitNET/Domain/Visibility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +29,7 @@ public static class VisibilityStrings
"Protected",
"Private Protected",
"Private",
"Not Accessible"
"Not Accessible",
};

private static readonly string[] LowerCase =
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Domain/Writability.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public enum Writability
{
ReadOnly,
InitOnly,
Writable
Writable,
}

public static class WritabilityExtensions
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Fluent/ConditionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public ConditionManager()
{
_conditionElements = new List<ConditionElement<T>>
{
new ConditionElement<T>(LogicalConjunctionDefinition.ForwardSecondValue)
new ConditionElement<T>(LogicalConjunctionDefinition.ForwardSecondValue),
};
}

Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Fluent/Freeze/XmlViolationStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
19 changes: 9 additions & 10 deletions ArchUnitNET/Fluent/PredicateManager.PredicateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public PredicateManager(BasicObjectProvider<T> basicObjectProvider)
new PredicateElement<T>(
LogicalConjunctionDefinition.ForwardSecondValue,
new SimplePredicate<T>(t => true, NotSet)
)
),
};
_hasCustomDescription = false;
}
Expand All @@ -42,15 +42,14 @@ public PredicateManager(BasicObjectProvider<T> 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<T> GetObjects(Architecture architecture)
{
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Fluent/Slices/SlicesShould.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Architecture architecture
{
var depsFromThisSliceToOtherSlice = new List<string>
{
slice.Description + " -> " + otherSlice.Description
slice.Description + " -> " + otherSlice.Description,
};
depsFromThisSliceToOtherSlice.AddRange(
depsToSlice.Select(dependency =>
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Loader/ArchBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private void UpdateTypeDefinitions()
typeof(AddGenericArgumentDependencies),
typeof(AddClassDependencies),
typeof(AddBackwardsDependencies),
typeof(AddTypesToNamespace)
typeof(AddTypesToNamespace),
}
);
}
Expand Down
2 changes: 1 addition & 1 deletion ArchUnitNET/Loader/MonoCecilMemberExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ArchUnitNETTests/ArchUnitNETTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Verify.xunit" Version="26.1.6" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Verify.xunit" Version="26.6.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void MemberAttributeInnerDependencyAssignedToOriginClass()
_class1,
_class2,
_classWithAttribute,
_classWithBodyTypeA
_classWithBodyTypeA,
};

//Assert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class TypeAttributesAreFoundData : IEnumerable<object[]>
BuildTypeAttributeTestData(
typeof(StructWithAttribute),
typeof(ExampleStructAttribute)
)
),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down Expand Up @@ -133,7 +133,7 @@ public class MemberAttributesAreFoundData : IEnumerable<object[]>
typeof(ClassWithExampleAttribute),
nameof(ClassWithExampleAttribute.FieldWithAbstractAttributeImplemented),
typeof(ChildOfAbstractAttribute)
)
),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public enum EnumWithAttribute
Enum1,
Enum2,
Enum3,
Enum4
Enum4,
}

[ExampleInterface]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class MethodDependenciesWithClassTestData : IEnumerable<object[]>
BuildClassTestData(typeof(ClassWithConstructors)),
BuildClassTestData(typeof(ClassWithMethodSignatureA)),
BuildClassTestData(typeof(ClassWithMethodSignatureB)),
BuildClassTestData(typeof(ClassWithMethodSignatureC))
BuildClassTestData(typeof(ClassWithMethodSignatureC)),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ MethodMember expectedTargetMember
{
accessedProperty,
expectedFieldDependencyTarget,
expectedDependency
expectedDependency,
};
}

Expand Down Expand Up @@ -184,7 +184,7 @@ public class SetterTestData : IEnumerable<object[]>
typeof(SetterMethodDependencyExamples),
nameof(SetterMethodDependencyExamples.MethodLambdaPair),
typeof(PropertyType)
)
),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down Expand Up @@ -219,7 +219,7 @@ public class GetterTestData : IEnumerable<object[]>
nameof(GetterMethodDependencyExamples.SecondUnacceptedCase),
MockGuidStruct,
MockNewGuid
)
),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down Expand Up @@ -281,7 +281,7 @@ public class AccessMethodDependenciesByPropertyTestData : IEnumerable<object[]>
typeof(GetterMethodDependencyExamples),
nameof(GetterMethodDependencyExamples.SecondUnacceptedCase),
MethodForm.Getter
)
),
};

public IEnumerator<object[]> GetEnumerator()
Expand Down
Loading