Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Xriuk committed Jul 16, 2024
2 parents 1cebb66 + e40e5fc commit e02f93b
Show file tree
Hide file tree
Showing 116 changed files with 6,317 additions and 1,299 deletions.
10 changes: 0 additions & 10 deletions .editorconfig

This file was deleted.

6 changes: 5 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!-- https://stackoverflow.com/a/73098203 -->
<Project>
<Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
<PropertyGroup>
<GlobalVersion>4.0.0</GlobalVersion>
</PropertyGroup>

<Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
<ItemGroup>
<_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')"
Condition="'%(ProjectReference.PackageVersion)' != ''" />
Expand Down
24 changes: 24 additions & 0 deletions NeatMapper.globalconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
is_global = true

# Use ArgumentNullException throw helper - requires .NET 7+
dotnet_diagnostic.CA1510.severity = none


# Wrong ending tag
dotnet_diagnostic.CS1570.severity = none

# Missing param tag
dotnet_diagnostic.CS1573.severity = none

# Missing comment
dotnet_diagnostic.CS1591.severity = none


# Use primary constructor - requires C# 12+
dotnet_diagnostic.IDE0290.severity = none

# Use pattern matching (not operator) - requires C# 9.0+
dotnet_diagnostic.IDE0083.severity = none

# Simplify new expression - requires C# 9.0+
dotnet_diagnostic.IDE0090.severity = none
18 changes: 17 additions & 1 deletion NeatMapper.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Tests", "tests\N
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51F07181-2F60-4B0C-8C55-5FA86811D861}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.EntityFrameworkCore", "src\NeatMapper.EntityFrameworkCore\NeatMapper.EntityFrameworkCore.csproj", "{451EB7D4-1B8F-4C28-ADFB-9C2CD4D10238}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.EntityFrameworkCore.Tests", "tests\NeatMapper.EntityFrameworkCore.Tests\NeatMapper.EntityFrameworkCore.Tests.csproj", "{82BAA0C8-230A-4A76-8B78-85C7798A8717}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Analyzers", "src\NeatMapper.Analyzers\NeatMapper.Analyzers.csproj", "{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Analyzers.Vsix", "src\NeatMapper.Analyzers.Vsix\NeatMapper.Analyzers.Vsix.csproj", "{F0BEC814-7965-40DB-8CB5-3C832F4BC3D5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NeatMapper.Analyzers.Tests", "tests\NeatMapper.Analyzers.Tests\NeatMapper.Analyzers.Tests.csproj", "{D670753D-AE9E-40FD-8CFE-B3FE6F870231}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -38,6 +44,16 @@ Global
{82BAA0C8-230A-4A76-8B78-85C7798A8717}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82BAA0C8-230A-4A76-8B78-85C7798A8717}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82BAA0C8-230A-4A76-8B78-85C7798A8717}.Release|Any CPU.Build.0 = Release|Any CPU
{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53EE5052-1A80-4CBC-9E68-97A4C5F28B9C}.Release|Any CPU.Build.0 = Release|Any CPU
{F0BEC814-7965-40DB-8CB5-3C832F4BC3D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0BEC814-7965-40DB-8CB5-3C832F4BC3D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D670753D-AE9E-40FD-8CFE-B3FE6F870231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D670753D-AE9E-40FD-8CFE-B3FE6F870231}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D670753D-AE9E-40FD-8CFE-B3FE6F870231}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D670753D-AE9E-40FD-8CFE-B3FE6F870231}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ var myBookDtos = db.Set<Book>()

Find more advanced use cases in the [website](https://www.neatmapper.org/advanced-options/) or in the extended [tests project](https://github.com/Xriuk/NeatMapper/tree/main/tests/NeatMapper.Tests).

## Contributing

You can contribute by creating issues for: bug fixes, feature requests or tests in the [official repository](https://github.com/Xriuk/NeatMapper).

## License

[Read the license here](https://www.neatmapper.org/license)
2 changes: 2 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ favicon_ico: "/assets/images/icon.png"
search_enabled: true

nav_external_links:
- title: NuGet
url: https://www.nuget.org/packages/NeatMapper/
- title: GitHub
url: https://github.com/Xriuk/NeatMapper

Expand Down
2 changes: 1 addition & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
title: "Changelog"
nav_order: 100
nav_order: 101
---

{% include NeatMapperChangelog.md %}
8 changes: 8 additions & 0 deletions docs/contributing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
layout: default
title: "Contributing"
nav_order: 100
description: ".NET Object mapper and projector, with configurable and reusable mappings. Supports collections and generic types. Also supports asynchronous maps and services via Dependency Injection (DI)."
---

You can contribute by creating issues for: bug fixes, feature requests or tests in the [official repository](https://github.com/Xriuk/NeatMapper).
2 changes: 1 addition & 1 deletion docs/license.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
title: "License"
nav_order: 101
nav_order: 102
description: ".NET Object mapper and projector, with configurable and reusable mappings. Supports collections and generic types. Also supports asynchronous maps and services via Dependency Injection (DI)."
---

Expand Down
47 changes: 47 additions & 0 deletions src/NeatMapper.Analyzers.Vsix/NeatMapper.Analyzers.Vsix.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<RootNamespace>NeatMapper.Analyzers.Vsix</RootNamespace>
<AssemblyName>NeatMapper.Analyzers.Vsix</AssemblyName>
</PropertyGroup>

<PropertyGroup>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<VSSDKTargetPlatformRegRootSuffix>Roslyn</VSSDKTargetPlatformRegRootSuffix>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.8.3038" PrivateAssets="all" />
</ItemGroup>

<PropertyGroup>
<StartAction>Program</StartAction>
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix $(VSSDKTargetPlatformRegRootSuffix)</StartArguments>
</PropertyGroup>

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />

<ItemGroup>
<ProjectReference Include="..\NeatMapper.Analyzers\NeatMapper.Analyzers.csproj" />
</ItemGroup>

<ItemGroup>
<!-- https://github.com/dotnet/sdk/issues/433 -->
<ProjectReference Update="@(ProjectReference)" AdditionalProperties="TargetFramework=netstandard2.0" />

<!-- https://github.com/Microsoft/extendvs/issues/57 -->
<ProjectReference Update="@(ProjectReference)" Name="%(Filename)" />
</ItemGroup>

</Project>
22 changes: 22 additions & 0 deletions src/NeatMapper.Analyzers.Vsix/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="NeatMapper.Analyzers.73feabe2-f116-47dd-ae96-e3908c1f56d0" Version="1.0" Language="en-US" Publisher="Xriuk"/>
<DisplayName>NeatMapper.Analyzers</DisplayName>
<Description xml:space="preserve">Internal extension to test NeatMapper analyzers and code fixes.</Description>
</Metadata>
<Installation>
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,)" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="NeatMapper.Analyzers" Path="|NeatMapper.Analyzers|"/>
<Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="NeatMapper.Analyzers" Path="|NeatMapper.Analyzers|"/>
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[15.0,)" DisplayName="Roslyn Language Services" />
</Prerequisites>
</PackageManifest>
Loading

0 comments on commit e02f93b

Please sign in to comment.