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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-sonarscanner": {
"version": "9.0.2",
"version": "11.1.0",
"commands": [
"dotnet-sonarscanner"
]
Expand Down
17 changes: 15 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
directory: "/"
schedule:
interval: "weekly"
interval: "monthly"
labels:
- "dependencies"
- "github-actions"

- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "monthly"
ignore:
- dependency-name: "AutoMapper"
- dependency-name: "AutoMapper.Collection"
- dependency-name: "*"
update-types:
- "version-update:semver-patch"
labels:
- "dependencies"
- "nuget"
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:

env:
SOURCE_DIRECTORY: ${{ github.workspace }}
SOLUTION_FILE: "OLT.DataAdapters.AutoMapper.sln"
SOLUTION_FILE: "OLT.DataAdapters.AutoMapper.slnx"
AUTOMAPPER_LICENSE_KEY: ${{ secrets.AUTOMAPPER_LICENSE_KEY }}

jobs:
build:
Expand All @@ -34,6 +35,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Get branch name
id: branch-name
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
PACKAGE_OUTPUT_DIRECTORY: ${{ github.workspace }}/output
SOURCE_DIRECTORY: ${{ github.workspace }}
SOLUTION_FILE: "OLT.DataAdapters.AutoMapper.sln"
SOLUTION_FILE: "OLT.DataAdapters.AutoMapper.slnx"
NUGET_SOURCE_URL: "https://api.nuget.org/v3/index.json"

jobs:
Expand All @@ -23,6 +23,7 @@ jobs:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Get Version
id: get_version
Expand Down
62 changes: 0 additions & 62 deletions OLT.DataAdapters.AutoMapper.sln

This file was deleted.

19 changes: 19 additions & 0 deletions OLT.DataAdapters.AutoMapper.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Solution>
<Folder Name="/.solution/">
<File Path=".config/dotnet-tools.json" />
<File Path="README.md" />
</Folder>
<Folder Name="/.workflow/">
<File Path=".github/dependabot.yml" />
<File Path=".github/workflows/build.yml" />
<File Path=".github/workflows/release.yml" />
</Folder>
<Folder Name="/src/">
<File Path="src/Directory.Build.props" />
<Project Path="src/OLT.DataAdapters.AutoMapper/OLT.DataAdapters.AutoMapper.csproj" />
<Project Path="src/OLT.Extensions.DependencyInjection.AutoMapper/OLT.Extensions.DependencyInjection.AutoMapper.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/OLT.DataAdapters.AutoMapper.Tests/OLT.DataAdapters.AutoMapper.Tests.csproj" />
</Folder>
</Solution>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<RootNamespace>OLT.Core</RootNamespace>
<Description>DataAdapters AutoMapper Library</Description>
<ProjectGuid>07F972FB-E132-4FBF-B52F-DC18A2FFB622</ProjectGuid>
Expand All @@ -9,12 +9,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="[13.0.0, 15.0.0)" />
<PackageReference Include="OLT.DataAdapters" Version="9.0.0" />
<PackageReference Include="AutoMapper" Version="[15.0.0, 16.0.0)" />
<PackageReference Include="OLT.DataAdapters" Version="10.0.0" />
</ItemGroup>


<ItemGroup>
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.103" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<RootNamespace>OLT.Core</RootNamespace>
<Description>Auto Mapper Extensions for Data Adapters</Description>
<ProjectGuid>c956c04f-4523-4f68-961c-8174803aa073</ProjectGuid>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="[14.0.0, 15.0.0)" />
<PackageReference Include="AutoMapper.Collection" Version="[11.0.0, 12.0.0)" />
<PackageReference Include="OLT.Utility.AssemblyScanner" Version="1.0.1" />
<PackageReference Include="AutoMapper" Version="[15.0.1, 16.0.0)" />
<PackageReference Include="AutoMapper.Collection" Version="[12.0.0, 13.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,17 @@ public virtual OltAutoMapperBuilder AddProfiles(params Profile[] profiles)
/// <summary>
/// Builds the AutoMapper configuration and registers the necessary services.
/// </summary>
/// <param name="licenseKey">License key for AutoMapper.</param>
/// <param name="configAction">An optional action to configure the AutoMapper.</param>
public virtual void Build(Action<IMapperConfigurationExpression>? configAction = null)
public virtual void Build(string licenseKey, Action<IMapperConfigurationExpression>? configAction = null)
{
ArgumentException.ThrowIfNullOrEmpty(licenseKey);

_services.AddSingleton<IOltAdapterResolver, OltAdapterResolverAutoMapper>();

_services.AddAutoMapper(cfg =>
{
cfg.LicenseKey = licenseKey;
cfg.AddCollectionMappers();
cfg.AddProfiles(_profiles);
configAction?.Invoke(cfg);
Expand Down
Loading