Merge branch 'release/3.0.0'

bbtsoftware · Mar 21, 2023 · 97236df · 97236df
2 parents d8e990a + ffd94f4
commit 97236df
Show file tree

Hide file tree

Showing 30 changed files with 240 additions and 233 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -53,10 +53,9 @@ jobs:
 
       - name: Package NuGet
         run: |
-          nuget pack ../nuspec/nuget/BBT.StructureTools.nuspec
-          nuget pack ../nuspec/nuget/BBT.StructureTools.Extensions.nuspec
+          dotnet pack -c $BUILD_CONFIG -p:PackageVersion=$BUILD_VERSION
 
       - name: Publish NuGet
         run: |
-          nuget push ./BBT.StructureTools.$BUILD_VERSION.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
-          nuget push ./BBT.StructureTools.Extensions.$BUILD_VERSION.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
+          nuget push ./BBT.StructureTools/bin/Release/BBT.StructureTools.$BUILD_VERSION.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
+          nuget push ./BBT.StructureTools.Extensions/bin/Release/BBT.StructureTools.Extensions.$BUILD_VERSION.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
diff --git a/nuspec/nuget/BBT.StructureTools.Extensions.nuspec b/nuspec/nuget/BBT.StructureTools.Extensions.nuspec
diff --git a/nuspec/nuget/BBT.StructureTools.nuspec b/nuspec/nuget/BBT.StructureTools.nuspec
diff --git a/nuspec/nuget/icon.png b/nuspec/nuget/icon.png
diff --git a/src/BBT.StructureTools.Extensions/BBT.StructureTools.Extensions.csproj b/src/BBT.StructureTools.Extensions/BBT.StructureTools.Extensions.csproj
@@ -4,25 +4,28 @@
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyTitle>BBT.StructureTools.Extensions</AssemblyTitle>
     <CodeAnalysisRuleSet>..\BBT.StructureTools.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\$(Configuration)\BBT.StructureTools.XML</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\BBT.StructureTools.xml</DocumentationFile>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <PropertyGroup>
-    <Title>BBT.StructureTools.Extensions</Title>
+    <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>
-    <PackageTags>copy compare convert</PackageTags>
+    <PackageId>BBT.StructureTools.Extensions</PackageId>
+    <PackageTags>StructureTools Functional</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageProjectUrl>http://bbtsoftware.github.io/BBT.StructureTools/</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/bbtsoftware/BBT.StructureTools/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/bbtsoftware/BBT.StructureTools.git</RepositoryUrl>
-    <PackageReleaseNotes>https://github.com/bbtsoftware/BBT.StructureTools/releases/tag/2.0.1</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/bbtsoftware/BBT.StructureTools/releases/tag/3.0.0</PackageReleaseNotes>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,16 +35,13 @@
   <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</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
 </Project>
diff --git a/...tureTools.Extensions/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelper.cs b/...tureTools.Extensions/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelper.cs
@@ -26,15 +26,18 @@ public CreateConvertFromStrategyHelper(IGenericStrategyProvider<ICreateConvertSt
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(TSource source, ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
-            source.NotNull(nameof(source));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
+            var strategy = this.strategyProvider.GetStrategy(source);
+            strategy.Convert(source, target, additionalProcessings);
+        }
 
+        /// <inheritdoc/>
+        public TTarget Create(TSource source)
+        {
             var strategy = this.strategyProvider.GetStrategy(source);
 
             var concreteTarget = strategy.CreateTarget(source);
-            strategy.Convert(source, concreteTarget, additionalProcessings);
 
             return concreteTarget;
         }

diff --git a/...ls.Extensions/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelperReverse.cs b/...ls.Extensions/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelperReverse.cs
@@ -30,18 +30,19 @@ public CreateConvertFromStrategyHelperReverse(IGenericStrategyProvider<ICreateCo
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            TReverseRelation reverseRelation,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
-            source.NotNull(nameof(source));
-            reverseRelation.NotNull(nameof(reverseRelation));
+            var strategy = this.strategyProvider.GetStrategy(source);
+            strategy.Convert(source, target, additionalProcessings);
+        }
 
+        /// <inheritdoc/>
+        public TTarget Create(TSource source, TReverseRelation reverseRelation)
+        {
             var strategy = this.strategyProvider.GetStrategy(source);
             var concreteTarget = strategy.CreateTarget(source);
             concreteTarget.SetPropertyValue(this.reverseRelationExpr, reverseRelation);
-            strategy.Convert(source, concreteTarget, additionalProcessings);
+
             return concreteTarget;
         }
 

diff --git a/...tureTools.Extensions/Convert/CreateTargetConvertTarget/CreateTargetConvertTargetHelper.cs b/...tureTools.Extensions/Convert/CreateTargetConvertTarget/CreateTargetConvertTargetHelper.cs
@@ -47,20 +47,18 @@ public void SetupReverseRelation(Expression<Func<TTarget, TReverseRelation>> rev
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            TReverseRelation reverseRelation,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public TTarget Create(TSource source, TReverseRelation reverseRelation)
         {
-            source.NotNull(nameof(source));
-            reverseRelation.NotNull(nameof(reverseRelation));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
-
             var target = this.instanceCreator.Create();
             target.SetPropertyValue(this.reverseRelationExpr, reverseRelation);
-            this.convert.Convert(source, target, additionalProcessings);
             return target;
         }
+
+        /// <inheritdoc/>
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        {
+            this.convert.Convert(source, target, additionalProcessings);
+        }
     }
 
     /// <inheritdoc/>
@@ -92,15 +90,15 @@ public CreateTargetConvertTargetHelper(
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
-            source.NotNull(nameof(source));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
+            this.convert.Convert(source, target, additionalProcessings);
+        }
 
+        /// <inheritdoc/>
+        public TTarget Create(TSource source)
+        {
             var target = this.instanceCreator.Create();
-            this.convert.Convert(source, target, additionalProcessings);
             return target;
         }
     }

diff --git a/...s.Extensions/Convert/CreateTargetImplConvertTarget/CreateTargetImplConvertTargetHelper.cs b/...s.Extensions/Convert/CreateTargetImplConvertTarget/CreateTargetImplConvertTargetHelper.cs
@@ -47,20 +47,18 @@ public void SetupReverseRelation(Expression<Func<TTarget, TReverseRelation>> rev
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            TReverseRelation reverseRelation,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public TTarget Create(TSource source, TReverseRelation reverseRelation)
         {
-            source.NotNull(nameof(source));
-            reverseRelation.NotNull(nameof(reverseRelation));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
-
             var target = this.instanceCreator.Create();
             target.SetPropertyValue(this.reverseRelationExpr, reverseRelation);
-            this.convert.Convert(source, target, additionalProcessings);
             return target;
         }
+
+        /// <inheritdoc/>
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        {
+            this.convert.Convert(source, target, additionalProcessings);
+        }
     }
 
     /// <inheritdoc/>
@@ -93,15 +91,15 @@ public CreateTargetImplConvertTargetHelper(
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
-            source.NotNull(nameof(source));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
+            this.convert.Convert(source, target, additionalProcessings);
+        }
 
+        /// <inheritdoc/>
+        public TTarget Create(TSource source)
+        {
             var target = this.instanceCreator.Create();
-            this.convert.Convert(source, target, additionalProcessings);
             return target;
         }
     }

diff --git a/...ions/Convert/CreateTargetImplConvertTargetImpl/CreateTargetImplConvertTargetImplHelper.cs b/...ions/Convert/CreateTargetImplConvertTargetImpl/CreateTargetImplConvertTargetImplHelper.cs
@@ -32,15 +32,15 @@ public CreateTargetImplConvertTargetImplHelper(
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public void Convert(TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
         {
-            source.NotNull(nameof(source));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
+            this.convert.Convert(source, (TTargetImpl)target, additionalProcessings);
+        }
 
+        /// <inheritdoc/>
+        public TTarget Create(TSource source)
+        {
             var target = this.instanceCreator.Create();
-            this.convert.Convert(source, target, additionalProcessings);
 
             return target;
         }

diff --git a/...nvert/CreateTargetImplConvertTargetImpl/CreateTargetImplConvertTargetImplHelperReverse.cs b/...nvert/CreateTargetImplConvertTargetImpl/CreateTargetImplConvertTargetImplHelperReverse.cs
@@ -44,20 +44,19 @@ public void SetupReverseRelation(Expression<Func<TTarget, TReverseRelation>> rev
         }
 
         /// <inheritdoc/>
-        public TTarget CreateTarget(
-            TSource source,
-            TReverseRelation reverseRelation,
-            ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        public TTarget Create(TSource source, TReverseRelation reverseRelation)
         {
-            source.NotNull(nameof(source));
-            reverseRelation.NotNull(nameof(reverseRelation));
-            additionalProcessings.NotNull(nameof(additionalProcessings));
-
             var target = this.instanceCreator.Create();
             target.SetPropertyValue(this.reverseRelationExpr, reverseRelation);
-            this.convert.Convert(source, target, additionalProcessings);
 
             return target;
         }
+
+        /// <inheritdoc/>
+        public void Convert(
+            TSource source, TTarget target, ICollection<IBaseAdditionalProcessing> additionalProcessings)
+        {
+            this.convert.Convert(source, (TTargetImpl)target, additionalProcessings);
+        }
     }
 }
diff --git a/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj b/src/BBT.StructureTools.Tests/BBT.StructureTools.Tests.csproj
@@ -25,14 +25,14 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Ninject" Version="3.3.6" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.9.0">
+    <PackageReference Include="FluentAssertions" Version="6.10.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">

diff --git a/...tureTools.Tests/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelperTests.cs b/...tureTools.Tests/Convert/CreateConvertFromStrategy/CreateConvertFromStrategyHelperTests.cs
@@ -34,7 +34,8 @@ public void CreateTarget_NoReverseRelation_CreateAndConvert()
 
             var processings = new List<IBaseAdditionalProcessing>();
             var source = new SourceDerivedLeaf();
-            var target = testCandidate.CreateTarget(source, processings);
+            var target = testCandidate.Create(source);
+            testCandidate.Convert(source, target, processings);
 
             target.Should().NotBeNull();
             target.Should().BeOfType<TargetDerivedLeaf>();
@@ -55,7 +56,8 @@ public void CreateTarget_WithReverseRelation_CreateAndConvert()
             var processings = new List<IBaseAdditionalProcessing>();
             var source = new SourceDerivedLeaf();
             var reverseRelation = new TargetRoot();
-            var target = testCandidate.CreateTarget(source, reverseRelation, processings);
+            var target = testCandidate.Create(source, reverseRelation);
+            testCandidate.Convert(source, target, processings);
 
             target.Should().NotBeNull();
             target.Should().BeOfType<TargetDerivedLeaf>();

diff --git a/...tureTools.Tests/Convert/CreateTargetConvertTarget/CreateTargetConvertTargetHelperTests.cs b/...tureTools.Tests/Convert/CreateTargetConvertTarget/CreateTargetConvertTargetHelperTests.cs
@@ -30,7 +30,8 @@ public void CreateTarget_NoReverseRelation_CreateAndConvert()
 
             var processings = new List<IBaseAdditionalProcessing>();
             var source = new SourceTreeLeaf();
-            var target = testCandidate.CreateTarget(source, processings);
+            var target = testCandidate.Create(source);
+            testCandidate.Convert(source, target, processings);
 
             target.Should().NotBeNull();
             target.OriginId.Should().Be(source.Id);
@@ -48,7 +49,8 @@ public void CreateTarget_WithReverseRelation_CreateAndConvert()
             var processings = new List<IBaseAdditionalProcessing>();
             var source = new SourceTreeLeaf();
             var reverseRelation = new TargetTree();
-            var target = testCandidate.CreateTarget(source, reverseRelation, processings);
+            var target = testCandidate.Create(source, reverseRelation);
+            testCandidate.Convert(source, target, processings);
 
             target.Should().NotBeNull();
             target.OriginId.Should().Be(source.Id);