Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Restore netstandard2.0 support for Mapster by asp2286 · Pull Request #849 · MapsterMapper/Mapster · GitHub
Skip to content
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: 4 additions & 0 deletions src/ExpressionDebugger.Tests/ExpressionDebugger.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionCompiler.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -25,4 +25,4 @@
<ItemGroup>
<ProjectReference Include="..\ExpressionTranslator\ExpressionTranslator.csproj" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand All@@ -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>
6 changes: 3 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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]
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Async/Mapster.Async.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
Expand Down
31 changes: 17 additions & 14 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
Expand DownExpand Up@@ -103,4 +106,4 @@ public class Dto
public string Id { get; set; }
public string Name { get; set; }
}
}
}
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line numberDiff line numberDiff line change
Expand Up@@ -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>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
Expand Down
12 changes: 8 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line numberDiff line numberDiff line change
@@ -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>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
Expand Down
15 changes: 10 additions & 5 deletions src/Mapster.Tests/Mapster.Tests.csproj
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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>
<AssemblyName>Mapster.Tests</AssemblyName>
Expand All@@ -10,13 +10,18 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="10.0.2" Condition="'$(TargetFramework)' == 'net48'" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand All@@ -34,4 +39,4 @@
<Compile Remove="Diagnostics\GlobalReference.cs" />
<Compile Remove="Diagnostics\TypeAdapterConfigExtensions.cs" />
</ItemGroup>
</Project>
</Project>
19 changes: 19 additions & 0 deletions src/Mapster.Tests/Polyfills/CompileWithDebugInfo.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
#if NET48
using System;

namespace System.Linq.Expressions
{
internal static class CompileWithDebugInfoPolyfill
{
public static Delegate CompileWithDebugInfo(this LambdaExpression node)
{
return node.Compile();
}

public static T CompileWithDebugInfo<T>(this Expression<T> node)
{
return node.Compile();
}
}
}
#endif
38 changes: 38 additions & 0 deletions src/Mapster.Tests/Polyfills/RequiredMemberAttributes.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
#if NET48
using System;

namespace System.Runtime.CompilerServices
{
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = false)]
internal sealed class RequiredMemberAttribute : Attribute
{
public RequiredMemberAttribute()
{
}
}

[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
internal sealed class CompilerFeatureRequiredAttribute : Attribute
{
public CompilerFeatureRequiredAttribute(string featureName)
{
FeatureName = featureName;
}

public string FeatureName { get; }

public bool IsOptional { get; set; }
}
}

namespace System.Diagnostics.CodeAnalysis
{
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
internal sealed class SetsRequiredMembersAttribute : Attribute
{
public SetsRequiredMembersAttribute()
{
}
}
}
#endif
14 changes: 14 additions & 0 deletions src/Mapster.Tests/Polyfills/TypeGetConstructorOverload.net48.cs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
#if NET48
using System;

namespace System.Reflection
{
internal static class TypeGetConstructorOverloadPolyfill
{
public static ConstructorInfo? GetConstructor(this Type type, BindingFlags bindingAttr, Type[] types)
{
return type.GetConstructor(bindingAttr, binder: null, types: types, modifiers: null);
}
}
}
#endif
Loading
Loading