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
3 changes: 2 additions & 1 deletion .github/workflows/dotnet-buildandtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ jobs:
dotnet-version: |
8.x
9.x
10.x
- name: Show dotnet version
run: |
dotnet --list-sdks
dotnet --list-runtimes
- name: Build with dotnet
run: dotnet build ./src/Mapster.sln
- name: Run tests on .NET 9.0
- name: Run tests on .NET 10.0
run: dotnet test --verbosity normal ./src/Mapster.sln
4 changes: 2 additions & 2 deletions src/ExpressionDebugger/ExpressionDebugger.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Authors>Chaowlert Chaisrichalermpol</Authors>
<Description>Step into debugging from linq expressions</Description>
Expand All @@ -12,7 +12,7 @@
<SignAssembly>True</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>ExpressionDebugger.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<PackageLicenseUrl>https://github.com/chaowlert/ExpressionDebugger/blob/master/LICENSE</PackageLicenseUrl>
<LangVersion>8.0</LangVersion>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DocSvartz @andrerav Is there a specific reason to use a LangVersion in here?

<Nullable>enable</Nullable>
Expand Down
4 changes: 2 additions & 2 deletions src/ExpressionTranslator/ExpressionTranslator.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>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 @@ -12,7 +12,7 @@
<SignAssembly>True</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>ExpressionTranslator.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<RootNamespace>ExpressionDebugger</RootNamespace>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>icon.png</PackageIcon>
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Async.Tests/Mapster.Async.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>

<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Async/Mapster.Async.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>Async supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Async</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.Async.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster.Core/Mapster.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Lightweight library for Mapster and Mapster CodeGen</Description>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Mapster.Core</AssemblyName>
<PackageTags>mapster</PackageTags>
<Version>9.0.0-pre01</Version>
<PackageTags>Mapster</PackageTags>
<Version>10.0.0-pre01</Version>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<SignAssembly>true</SignAssembly>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>

<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>Dependency Injection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;DependencyInjection</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.DependencyInjection.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
</PropertyGroup>
<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="\" />
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.EF6/Mapster.EF6.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>EF6 plugin for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;EF6</PackageTags>
<SignAssembly>True</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>Mapster.EF6.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EntityFramework" Version="6.5.1" />
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.EFCore.Tests/Mapster.EFCore.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>

<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.EFCore/Mapster.EFCore.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>EFCore plugin for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;EFCore</PackageTags>
<SignAssembly>True</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>Mapster.EFCore.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Immutable.Tests/Mapster.Immutable.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>

<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Immutable/Mapster.Immutable.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>Immutable collection supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Immutable</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.Immutable.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.JsonNet.Tests/Mapster.JsonNet.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>

<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.JsonNet/Mapster.JsonNet.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Description>Json.net conversion supports for Mapster</Description>
<IsPackable>true</IsPackable>
<PackageTags>Mapster;Json.net</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.JsonNet.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Mapster.SourceGenerator/Mapster.SourceGenerator.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Source generator to generate mapping using Mapster</Description>
<PackageTags>source-generator;mapster</PackageTags>
<PackageTags>Mapster;source-generator</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.SourceGenerator.snk</AssemblyOriginatorKeyFile>
<RestoreAdditionalProjectSources>https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json ;$(RestoreAdditionalProjectSources)</RestoreAdditionalProjectSources>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<Nullable>enable</Nullable>
<IncludeBuildOutput>false</IncludeBuildOutput>
</PropertyGroup>
Expand All @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Mapster\Mapster.csproj" />
<ProjectReference Include="..\Mapster.Core\Mapster.Core.csproj" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Mapster.Tests/Mapster.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
<AssemblyName>Mapster.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>Mapster.Tests.snk</AssemblyOriginatorKeyFile>
Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Tool.Tests/Mapster.Tool.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster.Tool/Mapster.Tool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<ToolCommandName>dotnet-mapster</ToolCommandName>
<Description>Tool to generate object mapping using Mapster</Description>
<PackageTags>Mapster;Tool</PackageTags>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.Tool.snk</AssemblyOriginatorKeyFile>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Mapster/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project >
<PropertyGroup>
<!-- Properties related to benchmark builds -->
<IsPackable>false</IsPackable>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Mapster.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='nuget-bench'">
<Optimize>true</Optimize>
Expand Down
6 changes: 3 additions & 3 deletions src/Mapster/Mapster.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
<Description>A fast, fun and stimulating object to object mapper. Kind of like AutoMapper, just simpler and way, way faster.</Description>
<Copyright>Copyright (c) 2016 Chaowlert Chaisrichalermpol, Eric Swann</Copyright>
<Authors>chaowlert;eric_swann</Authors>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<AssemblyName>Mapster</AssemblyName>
<Description>A fast, fun and stimulating object to object mapper. Kind of like AutoMapper, just simpler and way, way faster.</Description>
<PackageId>Mapster</PackageId>
<PackageTags>Mapper;AutoMapper;Fast;Mapping</PackageTags>
<PackageTags>Mapster;Mapper;AutoMapper;Fast;Mapping</PackageTags>
<PackageIcon>icon.png</PackageIcon>
<PackageIconUrl>https://cloud.githubusercontent.com/assets/5763993/26522718/d16f3e42-4330-11e7-9b78-f8c7402624e7.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/MapsterMapper/Mapster</PackageProjectUrl>
<RepositoryUrl>https://github.com/MapsterMapper/Mapster</RepositoryUrl>
<PackageLicenseUrl></PackageLicenseUrl>
<IsPackable>true</IsPackable>
<RootNamespace>Mapster</RootNamespace>
<Version>9.0.0-pre01</Version>
<Version>10.0.0-pre01</Version>
<Nullable>enable</Nullable>
<NoWarn>1701;1702;8618</NoWarn>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Sample.AspNetCore/Sample.AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Sample.CodeGen/Sample.CodeGen.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/TemplateTest/TemplateTest.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<Nullable>enable</Nullable>

<IsTestProject>true</IsTestProject>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Loading