Skip to content

Modernize Solution #198

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.

Sign up for GitHub

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

Closed
bbt-mop wants to merge 2 commits into from
Closed

Modernize Solution #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ead222
Modernize Solution
bbt-mop Nov 4, 2026
5c5f08f
Fix Warnings
bbt-mop Nov 4, 2026
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
1,662 changes: 1,662 additions & 0 deletions src/.editorconfig
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 9 additions & 15 deletions src/BBT.StructureTools.Extensions/BBT.StructureTools.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net10.0</TargetFrameworks>
<AssemblyTitle>BBT.StructureTools.Extensions</AssemblyTitle>
<CodeAnalysisRuleSet>..\BBT.StructureTools.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\$(Configuration)\BBT.StructureTools.xml</DocumentationFile>
<OutputPath>bin\$(Configuration)\</OutputPath>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<PropertyGroup>
<Title>BBT StructureTools Extensions</Title>
<Description>Extensions to BBT.StructureTools (e.g. implementations of ICreateConvertHelper and IConvertHelperFactory interfaces).</Description>
<Product>BBT.StructureTools</Product>
<Company>BBT Software AG</Company>
<Authors>BBT Software AG</Authors>
<Copyright>Copyright © BBT Software AG</Copyright>
<PackageId>BBT.StructureTools.Extensions</PackageId>
<PackageTags>StructureTools Functional</PackageTags>
<PackageIcon>icon.png</PackageIcon>
Expand All @@ -28,20 +23,19 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\BBT.StructureTools\BBT.StructureTools.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
12 changes: 0 additions & 12 deletions src/BBT.StructureTools.Tests.ruleset
View file
Open in desktop

This file was deleted.

37 changes: 13 additions & 24 deletions src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyTitle>BBT.StructureTools.Tests</AssemblyTitle>
<Company>BBT Software AG</Company>
<Product>BBT.StructureTools</Product>
<Description>Tests for BBT.StructureTools</Description>
<Copyright>Copyright © BBT Software AG</Copyright>
<CodeAnalysisRuleSet>..\BBT.StructureTools.Tests.ruleset</CodeAnalysisRuleSet>
<OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BBT.StrategyPattern" Version="1.1.0" />
<PackageReference Include="coverlet.collector" Version="10.0.1">
<PackageReference Include="BBT.StrategyPattern" />
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Ninject" Version="3.3.6" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="8.8.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="Ninject" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
<PackageReference Include="Shouldly">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
21 changes: 8 additions & 13 deletions src/BBT.StructureTools.Tests/Compare/ComparerWithObjectAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using BBT.StructureTools.Compare.Helper;
using BBT.StructureTools.Tests.Compare.Intention;
using BBT.StructureTools.Tests.TestTools;
using FluentAssertions;
using Shouldly;
using Ninject;
using Xunit;

Expand All @@ -15,7 +15,6 @@
/// </summary>
public class ComparerWithObjectAttributeTests
{
#region Members, Setup
private readonly IComparer<TestClass, ITestCompareIntention> testCandidate;

public ComparerWithObjectAttributeTests()
Expand All @@ -27,8 +26,6 @@ public ComparerWithObjectAttributeTests()
this.testCandidate = kernel.Get<IComparer<TestClass, ITestCompareIntention>>();
}

#endregion

[Fact]
public void Equals_WhenSameInstance_MustReturnTrue()
{
Expand All @@ -43,7 +40,7 @@ public void Equals_WhenSameInstance_MustReturnTrue()
var result = this.testCandidate.Equals(testClass, testClass);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

[Fact]
Expand All @@ -60,7 +57,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue()
var result = this.testCandidate.Equals(testClass, testClass);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

[Fact]
Expand All @@ -75,7 +72,7 @@ public void Equals_WhenAttributeObjectsEqual_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

[Fact]
Expand All @@ -91,7 +88,7 @@ public void Equals_WhenAttributeObjectsNotEqual_MustReturnFalse()
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeFalse();
result.ShouldBeFalse();
}

[Fact]
Expand All @@ -106,7 +103,7 @@ public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

[Fact]
Expand All @@ -127,10 +124,9 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB, System.Array.Empty<IBaseAdditionalProcessing>(), comparerExclusions);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

#region private test classes and test class helpers
private class TestClass
{
public TestAttribute TestAttribute1 { get; set; }
Expand All @@ -146,11 +142,10 @@ private class TestClassCompareRegistrations : ICompareRegistrations<TestClass, I
{
public void DoRegistrations(IEqualityComparerHelperRegistration<TestClass> registrations)
{
registrations.Should().NotBeNull();
registrations.ShouldNotBeNull();

registrations.RegisterAttribute(x => x.TestAttribute1);
}
}
#endregion
}
}
27 changes: 10 additions & 17 deletions ...uctureTools.Tests/Compare/ComparerWithObjectAttributeWithDistinguishedComparerIntTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
using BBT.StructureTools.Compare.Helper;
using BBT.StructureTools.Tests.Compare.Intention;
using BBT.StructureTools.Tests.TestTools;
using FluentAssertions;
using Shouldly;
using Ninject;
using Xunit;

public class ComparerWithObjectAttributeWithDistinguishedComparerIntTests
{
#region Members, Setup

private static IComparer<TestAttribute, ITestCompareIntention> distinguishedComparer;
private readonly IComparer<TestClass, ITestCompareIntention> testCandidate;

Expand All @@ -29,7 +27,6 @@ public ComparerWithObjectAttributeWithDistinguishedComparerIntTests()
this.testCandidate = kernel.Get<IComparer<TestClass, ITestCompareIntention>>();
}

#endregion

/// <summary>
/// Tests IComparer.Equals.
Expand All @@ -48,7 +45,7 @@ public void Equals_WhenSameInstance_MustReturnTrue()
var result = this.testCandidate.Equals(testClass, testClass);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

/// <summary>
Expand All @@ -68,7 +65,7 @@ public void Equals_WhenSameInstanceAndObjectAttributeNull_MustReturnTrue()
var result = this.testCandidate.Equals(testClass, testClass);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

/// <summary>
Expand All @@ -86,7 +83,7 @@ public void Equals_WhenAttributeObjectsEqual_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

/// <summary>
Expand All @@ -105,7 +102,7 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualButHaveSameValue_MustRet
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

/// <summary>
Expand All @@ -124,7 +121,7 @@ public void Equals_WhenBaseModelAttributeObjectsNotEqualAndHaveDifferentValue_Mu
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeFalse();
result.ShouldBeFalse();
}

/// <summary>
Expand All @@ -143,7 +140,7 @@ public void Equals_WhenAttributeObjectsNotEqualButNotRegistered_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

/// <summary>
Expand All @@ -167,11 +164,9 @@ public void Equals_WhenAttributeObjectsNotEqualButExcluded_MustReturnTrue()
var result = this.testCandidate.Equals(testClassA, testClassB, Array.Empty<IBaseAdditionalProcessing>(), comparerExclusions);

// Assert
result.Should().BeTrue();
result.ShouldBeTrue();
}

#region private test classes and test class helpers

private class TestClass
{
public TestAttribute TestAttribute { get; set; }
Expand All @@ -188,7 +183,7 @@ private class TestAttributeCompareRegistrations : ICompareRegistrations<TestAttr
{
public void DoRegistrations(IEqualityComparerHelperRegistration<TestAttribute> registrations)
{
registrations.Should().NotBeNull();
registrations.ShouldNotBeNull();

registrations.RegisterAttribute(x => x.TestValue1);
}
Expand All @@ -198,14 +193,12 @@ private class TestClassCompareRegistrations : ICompareRegistrations<TestClass, I
{
public void DoRegistrations(IEqualityComparerHelperRegistration<TestClass> registrations)
{
registrations.Should().NotBeNull();
registrations.ShouldNotBeNull();

registrations.RegisterAttributeWithDistinguishedComparer(
x => x.TestAttribute,
ComparerWithObjectAttributeWithDistinguishedComparerIntTests.distinguishedComparer);
}
}

#endregion
}
}
Loading
Loading