Skip to content

Restore netstandard2.0 support for Mapster #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asp2286 wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Restore netstandard2.0 support for Mapster #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Benchmark.Development/Benchmark.Development.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AssemblyOriginatorKeyFile>Benchmark.Development.snk</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<SciVersion Condition="'$(SciVersion)' == ''">7.4.0</SciVersion>
<LangVersion>12.0</LangVersion>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Benchmark/Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<CopyLocalLockFileAssemblies Condition=" '$(Configuration)'=='Debug' ">true</CopyLocalLockFileAssemblies>
<DefaultItemExcludes>**/*.g.cs</DefaultItemExcludes>
</PropertyGroup>
Expand All @@ -19,11 +19,11 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
<PackageReference Include="ExpressionDebugger" Version="2.2.1" />
<PackageReference Include="ExpressionTranslator" Version="2.5.0" />
<PackageReference Include="AutoMapper" Version="13.0.1" />
<PackageReference Include="FastExpressionCompiler" Version="5.0.0" />
<PackageReference Include="FastExpressionCompiler" Version="5.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
<PackageTags>Mapper;AutoMapper;Fast;Mapping</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<IsPackable>false</IsPackable>
<LangVersion>10</LangVersion>
<LangVersion>12</LangVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net48</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Chaowlert Chaisrichalermpol</Authors>
<Description>Step into debugging from linq expressions</Description>
Expand All @@ -14,12 +14,12 @@
<AssemblyOriginatorKeyFile>ExpressionDebugger.snk</AssemblyOriginatorKeyFile>
<Version>10.0.0-pre01</Version>
<PackageLicenseUrl>https://github.com/chaowlert/ExpressionDebugger/blob/master/LICENSE</PackageLicenseUrl>
<LangVersion>8.0</LangVersion>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;net48</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Chaowlert Chaisrichalermpol</Authors>
<Description>Translate from linq expressions to C# code</Description>
Expand All @@ -17,15 +17,15 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>icon.png</PackageIcon>
<PackageLicenseUrl></PackageLicenseUrl>
<LangVersion>8.0</LangVersion>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>

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

<ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net48'">
<PackageReference Include="System.Runtime.Experimental" Version="6.0.2" />
</ItemGroup>
</Project>
5 changes: 2 additions & 3 deletions src/Mapster.Async.Tests/AsyncTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,14 @@ 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
9 changes: 5 additions & 4 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net48</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</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
View file
Open in desktop
Original file line number Diff line number Diff 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
12 changes: 7 additions & 5 deletions src/Mapster.DependencyInjection.Tests/InjectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ public void Injection()
}
}

[TestMethod, ExpectedException(typeof(InvalidOperationException))]
[TestMethod]
public void NoServiceAdapter_InjectionError()
{
var expectedValue = MapContext.Current.GetService<IMockService>().GetName();
var config = ConfigureMapping(expectedValue);
var config = new TypeAdapterConfig();
config.NewConfig<Poco, Dto>()
.Map(dto => dto.Name, _ => MapContext.Current.GetService<IMockService>().GetName());

IServiceCollection sc = new ServiceCollection();
sc.AddScoped<IMockService, MockService>();
Expand All @@ -46,8 +47,9 @@ public void NoServiceAdapter_InjectionError()

var sp = sc.BuildServiceProvider();
using var scope = sp.CreateScope();
var mapper = scope.ServiceProvider.GetService<IMapper>();
MapToDto(mapper, expectedValue);
var mapper = scope.ServiceProvider.GetRequiredService<IMapper>();
var ex = Should.Throw<InvalidOperationException>(() => mapper.Map<Poco, Dto>(new Poco { Id = "bar" }));
ex.Message.ShouldBe("Mapping must be called using ServiceAdapter");
}

private static TypeAdapterConfig ConfigureMapping(string expectedValue)
Expand Down
11 changes: 6 additions & 5 deletions src/Mapster.DependencyInjection.Tests/Mapster.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net48</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</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.Extensions.DependencyInjection" Version="10.0.2" />
<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
4 changes: 2 additions & 2 deletions src/Mapster.DependencyInjection/Mapster.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff 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 All @@ -13,7 +13,7 @@
<None Include="icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mapster\Mapster.csproj" />
Expand Down
8 changes: 4 additions & 4 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

<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="coverlet.collector" Version="6.0.2">
<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.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
11 changes: 6 additions & 5 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net48</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</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="coverlet.collector" Version="6.0.2">
<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.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Immutable/Mapster.Immutable.csproj
View file
Open in desktop
Original file line number Diff line number Diff 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 All @@ -14,7 +14,7 @@
<None Include="icon.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="10.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mapster\Mapster.csproj" />
Expand Down
9 changes: 5 additions & 4 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net48</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</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
4 changes: 2 additions & 2 deletions src/Mapster.JsonNet/Mapster.JsonNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff 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 All @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
</ItemGroup>

Expand Down
21 changes: 13 additions & 8 deletions src/Mapster.Tests/Mapster.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
<?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>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net48</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
<AssemblyName>Mapster.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>Mapster.Tests.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<LangVersion>11.0</LangVersion>
<LangVersion>12</LangVersion>
</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="Newtonsoft.Json" Version="13.0.3" />
<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.4" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" />
<ProjectReference Include="..\Mapster\Mapster.csproj" />
<ProjectReference Include="..\ExpressionDebugger\ExpressionDebugger.csproj" Condition="'$(TargetFramework)' != 'net48'" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
<Compile Remove="WhenUsingIMapFrom.cs" />
<Compile Remove="WhenUsingIMapFromWrong.cs" />
</ItemGroup>
<ItemGroup>
<None Remove="packages.config" />
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
View file
Open in desktop
Original file line number Diff line number Diff 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
Loading
Loading