Merge Development to Master - Release v10.0.0

README.md

@@ -26,7 +26,6 @@ Writing mapping methods is a machine job. Do not waste your time, let Mapster do
 |------|--------|-------------|
 | **Mapster.Tool** | [![Mapster.Tool](https://img.shields.io/nuget/v/Mapster.Tool.svg?label=Mapster.Tool&color=informational)](https://www.nuget.org/packages/Mapster.Tool/latest) | [![Mapster.Tool](https://img.shields.io/nuget/vpre/Mapster.Tool.svg?label=Mapster.Tool&color=orange)](https://www.nuget.org/packages/Mapster.Tool) |
 
-_Badges zeigen die jeweils aktuellste Stable-Version und die aktuellste Pre-Release-Version._
 
 ## Installation
 
@@ -105,7 +104,7 @@ using (MyDbContext context = new MyDbContext())
 
 ### Generating models & mappers
 
-No need to write your own DTO classes. Mapster provides [Mapster.Tool](https://github.com/MapsterMapper/Mapster/wiki/Mapster.Tool) to help you generating models. And if you would like to have explicit mapping, Mapster also generates mapper class for you.
+No need to write your own DTO classes. Mapster provides [Mapster.Tool](https://mapstermapper.github.io/Mapster/articles/tools/mapster-tool/Mapster-Tool-Overview.html) to help you generating models. And if you would like to have explicit mapping, Mapster also generates mapper class for you.
 
 ```csharp
 [AdaptTo("[name]Dto"), GenerateMapper]
@@ -129,14 +128,14 @@ public static class StudentMapper {
 
 ## What's new
 
-- [Fluent API for code generation](https://github.com/MapsterMapper/Mapster/wiki/Fluent-API-Code-generation)
-- [Automatically generate mapping code on build](https://github.com/MapsterMapper/Mapster/wiki/Mapster.Tool)
-- [Define setting to nested mapping](https://github.com/MapsterMapper/Mapster/wiki/Config-for-nested-mapping)
-- [`ISet`, `IDictionary`, `IReadOnlyDictionary` support](https://github.com/MapsterMapper/Mapster/wiki/Data-types#collections)
-- [`EmptyCollectionIfNull`, `CreateNewIfNull` DestinationTransform](https://github.com/MapsterMapper/Mapster/wiki/Setting-values#transform-value)
+- [Fluent API for code generation](https://mapstermapper.github.io/Mapster/articles/tools/mapster-tool/Fluent-API-Code-generation.html)
+- [Automatically generate mapping code on build](https://mapstermapper.github.io/Mapster/articles/tools/mapster-tool/Mapster-Tool-Overview.html)
+- [Define setting to nested mapping](https://mapstermapper.github.io/Mapster/articles/configuration/Config-for-nested-mapping.html)
+- [`ISet`, `IDictionary`, `IReadOnlyDictionary` support](https://mapstermapper.github.io/Mapster/articles/mapping/Data-types.html#collections)
+- [`EmptyCollectionIfNull`, `CreateNewIfNull` DestinationTransform](https://mapstermapper.github.io/Mapster/articles/settings/Setting-values.html#transform-value)
 - [Several fixes](https://github.com/MapsterMapper/Mapster/releases/)
 - New plugins
-  - [Immutable collection support](https://github.com/MapsterMapper/Mapster/wiki/Immutable)
+  - [Immutable collection support](https://mapstermapper.github.io/Mapster/articles/packages/Immutable.html)
 
 ## Why Mapster?
 
@@ -145,8 +144,8 @@ public static class StudentMapper {
 Mapster was designed to be efficient on both speed and memory. You could gain a 4x performance improvement whilst using only 1/3 of memory.
 And you could gain up to 12x faster performance with:
 
-- [Roslyn Compiler](https://github.com/MapsterMapper/Mapster/wiki/Debugging)
-- [FEC](https://github.com/MapsterMapper/Mapster/wiki/FastExpressionCompiler)
+- [Roslyn Compiler](https://mapstermapper.github.io/Mapster/articles/packages/ExpressionDebugging.html)
+- [FEC](https://mapstermapper.github.io/Mapster/articles/packages/FastExpressionCompiler.html)
 - Code generation
 
 |                    Method |      Mean |    StdDev |     Error |      Gen 0 | Gen 1 | Gen 2 | Allocated |
@@ -175,8 +174,8 @@ Code generation allows you to
 
 There are currently two tools which you can choose based on your preferences.
 
-- [Mapster.Tool](https://github.com/MapsterMapper/Mapster/wiki/Mapster.Tool) _**NEW!**_
-- [TextTemplate](https://github.com/MapsterMapper/Mapster/wiki/TextTemplate)
+- [Mapster.Tool](https://mapstermapper.github.io/Mapster/articles/tools/mapster-tool/Mapster-Tool-Overview.html) _**NEW!**_
+- [TextTemplate](https://mapstermapper.github.io/Mapster/articles/tools/TextTemplate.html)
 
 ## Change logs
 

docs/Clean-and-Build-Docs.ps1

@@ -30,7 +30,7 @@ Write-Information "Cleaning obsolete API documentation..." -InformationAction Co
 # Step 3: Build documentation
 Write-Information "Building documentation..." -InformationAction Continue
 
-& .\Build-Docs.ps1 -LogLevel $LogLevel -serve $true -open-browser $true
+& .\Build-Docs.ps1 -LogLevel $LogLevel -serve $true -openbrowser $true
 
 if ($LASTEXITCODE -ne 0) {
     Write-Error "Documentation build failed"

src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj

@@ -6,6 +6,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>$(TargetFrameworks);net48</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />

src/ExpressionDebugger/ExpressionCompiler.cs

@@ -125,10 +125,10 @@ from n in t.TypeNames
             assemblyStream.Seek(0, SeekOrigin.Begin);
             symbolsStream.Seek(0, SeekOrigin.Begin);
 
-#if NETSTANDARD2_0 || NET6_0_OR_GREATER
+#if NET6_0_OR_GREATER
             return System.Runtime.Loader.AssemblyLoadContext.Default.LoadFromStream(assemblyStream, symbolsStream);
 #else
-                return Assembly.Load(assemblyStream.ToArray(), symbolsStream.ToArray());
+            return Assembly.Load(assemblyStream.ToArray(), symbolsStream.ToArray());
 #endif
         }
 

src/ExpressionDebugger/ExpressionDebugger.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0;net9.0;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Chaowlert Chaisrichalermpol</Authors>
     <Description>Step into debugging from linq expressions</Description>
@@ -12,7 +12,7 @@
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>ExpressionDebugger.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
     <PackageLicenseUrl>https://github.com/chaowlert/ExpressionDebugger/blob/master/LICENSE</PackageLicenseUrl>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
@@ -25,4 +25,4 @@
   <ItemGroup>
     <ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
   </ItemGroup>
-</Project>
+</Project>

src/ExpressionTranslator/ExpressionTranslator.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0;net9.0;net8.0</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Chaowlert Chaisrichalermpol</Authors>
     <Description>Translate from linq expressions to C# code</Description>
@@ -12,7 +12,7 @@
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>ExpressionTranslator.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
     <RootNamespace>ExpressionDebugger</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
@@ -25,7 +25,7 @@
     <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
     <PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
   </ItemGroup>
 </Project>

src/Mapster.Async.Tests/AsyncTest.cs

@@ -45,15 +45,15 @@ public async Task AsyncError()
             }
         }
 
-        [TestMethod, ExpectedException(typeof(InvalidOperationException))]
+        [TestMethod]
         public void Sync()
         {
             TypeAdapterConfig<Poco, Dto>.NewConfig()
                 .AfterMappingAsync(async dest => { dest.Name = await GetName(); });
 
             var poco = new Poco {Id = "foo"};
-            var dto = poco.Adapt<Dto>();
-            dto.Name.ShouldBe("bar");
+
+            Should.Throw<InvalidOperationException>(() => poco.Adapt<Dto>());
         }
 
         [TestMethod]

src/Mapster.Async.Tests/Mapster.Async.Tests.csproj

@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
 	<IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>$(TargetFrameworks);net48</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>
 

src/Mapster.Async/Mapster.Async.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0;net9.0;net8.0</TargetFrameworks>
     <Description>Async supports for Mapster</Description>
     <IsPackable>true</IsPackable>
     <PackageTags>Mapster;Async</PackageTags>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Mapster.Async.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Mapster.Core/Mapster.Core.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Mapster.Core</AssemblyName>
     <PackageTags>Mapster</PackageTags>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
     <Nullable>enable</Nullable>
 	<IsPackable>true</IsPackable>
 	<SignAssembly>true</SignAssembly>

src/Mapster.DependencyInjection.Tests/InjectionTest.cs

@@ -31,23 +31,26 @@ public void Injection()
             }
         }
 
-        [TestMethod, ExpectedException(typeof(InvalidOperationException))]
+        [TestMethod]
         public void NoServiceAdapter_InjectionError()
         {
-            var expectedValue = MapContext.Current.GetService<IMockService>().GetName();
-            var config = ConfigureMapping(expectedValue);
+            Should.Throw<InvalidOperationException>(() =>
+            {
+                var expectedValue = MapContext.Current.GetService<IMockService>().GetName();
+                var config = ConfigureMapping(expectedValue);
 
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddScoped<IMockService, MockService>();
-            sc.AddSingleton(config);
-            // We should use ServiceMapper in normal code
-            // but for this test we want to be sure the code will generate the InvalidOperationException
-            sc.AddScoped<IMapper, Mapper>();
+                IServiceCollection sc = new ServiceCollection();
+                sc.AddScoped<IMockService, MockService>();
+                sc.AddSingleton(config);
+                // We should use ServiceMapper in normal code
+                // but for this test we want to be sure the code will generate the InvalidOperationException
+                sc.AddScoped<IMapper, Mapper>();
 
-            var sp = sc.BuildServiceProvider();
-            using var scope = sp.CreateScope();
-            var mapper = scope.ServiceProvider.GetService<IMapper>();
-            MapToDto(mapper, expectedValue);
+                var sp = sc.BuildServiceProvider();
+                using var scope = sp.CreateScope();
+                var mapper = scope.ServiceProvider.GetService<IMapper>();
+                MapToDto(mapper, expectedValue);
+            });
         }
 
         private static TypeAdapterConfig ConfigureMapping(string expectedValue)
@@ -103,4 +106,4 @@ public class Dto
         public string Id { get; set; }
         public string Name { get; set; }
     }
-}
+}

src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj

@@ -1,16 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
 	<IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>$(TargetFrameworks);net48</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>
 

src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0;net9.0;net8.0</TargetFrameworks>
     <Description>Dependency Injection supports for Mapster</Description>
     <IsPackable>true</IsPackable>
     <PackageTags>Mapster;DependencyInjection</PackageTags>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Mapster.DependencyInjection.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />

src/Mapster.EF6/Mapster.EF6.csproj

@@ -8,7 +8,7 @@
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>Mapster.EF6.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.5.1" />

src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj

@@ -8,9 +8,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Mapster.EFCore/Mapster.EFCore.csproj

@@ -8,7 +8,7 @@
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>Mapster.EFCore.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj

@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
 	<IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>$(TargetFrameworks);net48</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Mapster.Immutable/Mapster.Immutable.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net10.0;net9.0;net8.0</TargetFrameworks>
     <Description>Immutable collection supports for Mapster</Description>
     <IsPackable>true</IsPackable>
     <PackageTags>Mapster;Immutable</PackageTags>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Mapster.Immutable.snk</AssemblyOriginatorKeyFile>
-    <Version>10.0.0-pre01</Version>
+    <Version>10.0.0</Version>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>

src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj

@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
 	<IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFrameworks>$(TargetFrameworks);net48</TargetFrameworks>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
   </ItemGroup>