Skip to content

Commit 1fc7069

Browse files
alexanderlinnealexanderlinne
authored
Merge branch 'main' into referencedAssemblyNames
2 parents 5fb13a9 + ac3c399 commit 1fc7069

File tree

444 files changed

+650
-3035
lines changed

Some content is hidden

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

444 files changed

+650
-3035
lines changed

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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;

‎ArchUnitNET.NUnit/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 NUnit.Framework;

‎ArchUnitNET.NUnit/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.NUnit

‎ArchUnitNET.NUnit/ArchUnitNET.NUnit.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# NUnit Extension</Title>
7-
<Authors>Florian Gather, Fritz Brandhuber</Authors>
87
<Description>NUnit 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>

0 commit comments

Comments
 (0)