Skip to content

Commit 0d390e5

Browse files
authored
vNext
vNext
1 parent b3d81e5 commit 0d390e5

File tree

150 files changed

+1771
-975
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1771
-975
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,32 @@ concurrency:
1313
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1414
cancel-in-progress: true
1515
jobs:
16+
build-windows:
17+
strategy:
18+
fail-fast: false
19+
runs-on: windows-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
with:
24+
fetch-depth: 0
25+
- name: Setup dotnet
26+
uses: actions/setup-dotnet@v4
27+
with:
28+
dotnet-version: |
29+
8.0.x
30+
9.0.x
31+
- name: Build and Test
32+
run: |
33+
dotnet build --configuration Release
34+
35+
dotnet test --configuration Release --no-build --results-directory ".\artifacts" -l trx .\src\UnitTests
36+
37+
dotnet test --configuration Release --no-build --results-directory ".\artifacts" -l trx .\src\AutoMapper.DI.Tests
38+
39+
shell: pwsh
1640
build:
41+
needs: build-windows
1742
strategy:
1843
fail-fast: false
1944
runs-on: ubuntu-latest
@@ -31,12 +56,12 @@ jobs:
3156
- name: Build and Test
3257
run: ./Build.ps1
3358
shell: pwsh
34-
# - name: Push to MyGet
35-
# env:
36-
# NUGET_URL: https://www.myget.org/F/automapperdev/api/v3/index.json
37-
# NUGET_API_KEY: ${{ secrets.MYGET_CI_API_KEY }}
38-
# run: ./Push.ps1
39-
# shell: pwsh
59+
- name: Push to MyGet
60+
env:
61+
NUGET_URL: https://www.myget.org/F/luckypennysoftware/api/v3/index.json
62+
NUGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
63+
run: ./Push.ps1
64+
shell: pwsh
4065
- name: Artifacts
4166
uses: actions/upload-artifact@v4
4267
with:

.github/workflows/release.yml

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,32 @@ permissions:
88
contents: read
99

1010
jobs:
11+
build-windows:
12+
strategy:
13+
fail-fast: false
14+
runs-on: windows-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
- name: Setup dotnet
21+
uses: actions/setup-dotnet@v4
22+
with:
23+
dotnet-version: |
24+
8.0.x
25+
9.0.x
26+
- name: Build and Test
27+
run: |
28+
dotnet build --configuration Release
29+
30+
dotnet test --configuration Release --no-build --results-directory ".\artifacts" -l trx .\src\UnitTests
31+
32+
dotnet test --configuration Release --no-build --results-directory ".\artifacts" -l trx .\src\AutoMapper.DI.Tests
33+
34+
shell: pwsh
1135
build:
36+
needs: build-windows
1237
strategy:
1338
fail-fast: false
1439
runs-on: ubuntu-latest
@@ -26,16 +51,16 @@ jobs:
2651
- name: Build and Test
2752
run: ./Build.ps1
2853
shell: pwsh
29-
# - name: Push to MyGet
30-
# env:
31-
# NUGET_URL: https://www.myget.org/F/automapperdev/api/v3/index.json
32-
# NUGET_API_KEY: ${{ secrets.MYGET_CI_API_KEY }}
33-
# run: ./Push.ps1
34-
# shell: pwsh
54+
- name: Push to MyGet
55+
env:
56+
NUGET_URL: https://www.myget.org/F/luckypennysoftware/api/v3/index.json
57+
NUGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
58+
run: ./Push.ps1
59+
shell: pwsh
3560
# - name: Push to NuGet
3661
# env:
3762
# NUGET_URL: https://api.nuget.org/v3/index.json
38-
# NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
63+
# NUGET_API_KEY: ${{ secrets.AUTOMAPPER_NUGET_API_KEY }}
3964
# run: ./Push.ps1
4065
# shell: pwsh
4166
- name: Artifacts

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ packages
2424
.nuget
2525
project.lock.json
2626
.vs
27+
.DS_Store
2728

2829
# JetBrains Rider
2930
.idea/

AutoMapper.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
Push.ps1 = Push.ps1
1616
README.md = README.md
1717
.github\workflows\release.yml = .github\workflows\release.yml
18-
Setup.ps1 = Setup.ps1
18+
AutoMapper.snk = AutoMapper.snk
1919
EndProjectSection
2020
EndProject
2121
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmark", "src\Benchmark\Benchmark.csproj", "{B8051389-CB47-46FB-B234-9D49506704AA}"

CONTRIBUTING.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Then we can decide if and how a feature or a change could be implemented and if
66
Also read this first: [Being a good open source citizen](https://hackernoon.com/being-a-good-open-source-citizen-9060d0ab9732#.x3hocgw85)
77

88
## General feedback and discussions
9-
Please start a discussion on the [core repo issue tracker](https://github.com/AutoMapper/AutoMapper/issues).
9+
Please start a discussion on the [core repo issue tracker](https://github.com/LuckyPennySoftware/AutoMapper/issues).
1010

1111
## Platform
1212
AutoMapper is built using the RTM tooling that ships with the latest Visual Studio. This is the only configuration accepted.
@@ -18,14 +18,10 @@ Run the PowerShell script `Build.ps1` from the command line. This builds and run
1818
## Bugs and feature requests?
1919
Please log a new issue in the appropriate GitHub repo:
2020

21-
* [Core](https://github.com/AutoMapper/AutoMapper)
21+
* [Core](https://github.com/LuckyPennySoftware/AutoMapper)
2222
* [EF6 Extensions](https://github.com/AutoMapper/AutoMapper.EF6)
2323
* [IDataReader/Record Extensions](https://github.com/AutoMapper/AutoMapper.Data)
2424
* [Collection Extensions](https://github.com/AutoMapper/AutoMapper.Collection)
25-
* [Microsoft DI Extensions](https://github.com/AutoMapper/AutoMapper.Extensions.Microsoft.DependencyInjection)
26-
27-
## Other discussions
28-
https://gitter.im/AutoMapper/AutoMapper
2925

3026
## Filing issues
3127
The best way to get your bug fixed is to be as detailed as you can be about the problem.
@@ -39,7 +35,6 @@ Here are questions you can answer before you file a bug to make sure you're not
3935
GitHub supports [markdown](https://github.github.com/github-flavored-markdown/), so when filing bugs make sure you check the formatting before clicking submit.
4036

4137
## Contributing code and content
42-
You will need to sign a [Contributor License Agreement](https://cla.dotnetfoundation.org/) before submitting your pull request.
4338

4439
Make sure you can build the code. Familiarize yourself with the project workflow and our coding conventions. If you don't know what a pull request is read this article: https://help.github.com/articles/using-pull-requests.
4540

ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!--
22
33
If you're new to AutoMapper, please ask a question on StackOverflow first and come back here if the people there consider it a bug.
4-
If you've just upgraded, please read the corresponding upgrade guide first. Check https://docs.automapper.org/en/latest.
5-
Try the [MyGet](https://docs.automapper.org/en/latest/The-MyGet-build.html) build.
4+
If you've just upgraded, please read the corresponding upgrade guide first. Check https://docs.automapper.io/en/latest.
5+
Try the [MyGet](https://docs.automapper.io/en/latest/The-MyGet-build.html) build.
66
Try to provide [a minimal, complete, and verifiable example](https://stackoverflow.com/help/mcve), preferably a [gist](https://gist.github.com/lbargaoanu/9c7233441c3a3413cc2b9b9ebb5964a9) that we can execute and see fail. [Here](https://gist.github.com/lbargaoanu/0cbc531306223f7ffc5468becf2642d6) is an example for ProjectTo.
77
For feature requests, just clear out the below.
88
-->

LICENSE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
By accessing code under the [Lucky Penny Software GitHub Organization](https://github.com/LuckyPennySoftware) (Lucky Penny Software) here, you are agreeing to the following licensing terms.
2+
If you do not agree to these terms, do not access Lucky Penny Software code.
3+
4+
Your license to Lucky Penny Software source code and/or binaries is governed by the Reciprocal Public License 1.5 (RPL1.5) license as described here:
5+
6+
https://opensource.org/license/rpl-1-5/
7+
8+
If you do not wish to release the source of software you build using Lucky Penny Software source code and/or binaries under the terms above, you may use Lucky Penny Software source code and/or binaries under the License Agreement described here:
9+
10+
https://luckypennysoftware.com/license

LICENSE.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

README.md

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
![AutoMapper](https://s3.amazonaws.com/automapper/logo.png)
22

3-
[![CI](https://github.com/automapper/automapper/workflows/CI/badge.svg)](https://github.com/AutoMapper/AutoMapper/actions?query=workflow%3ACI)
3+
[![CI](https://github.com/luckypennysoftware/automapper/workflows/CI/badge.svg)](https://github.com/luckypennysoftware/AutoMapper/actions?query=workflow%3ACI)
44
[![NuGet](http://img.shields.io/nuget/vpre/AutoMapper.svg?label=NuGet)](https://www.nuget.org/packages/AutoMapper/)
5-
[![MyGet (dev)](https://img.shields.io/myget/automapperdev/vpre/AutoMapper.svg?label=MyGet)](https://myget.org/feed/automapperdev/package/nuget/AutoMapper)
6-
[![Documentation Status](https://readthedocs.org/projects/automapper/badge/?version=stable)](https://docs.automapper.org/en/stable/?badge=stable)
5+
[![Documentation Status](https://readthedocs.org/projects/automapper/badge/?version=stable)](https://docs.automapper.io/en/stable/?badge=stable)
76

87

98
### What is AutoMapper?
@@ -24,15 +23,23 @@ First, configure AutoMapper to know what types you want to map, in the startup o
2423

2524
```csharp
2625
var configuration = new MapperConfiguration(cfg =>
26+
{
27+
cfg.CreateMap<Foo, FooDto>();
28+
cfg.CreateMap<Bar, BarDto>();
29+
}, loggerFactory);
30+
31+
// or more typically, using IServiceCollection
32+
services.AddAutoMapper(cfg =>
2733
{
2834
cfg.CreateMap<Foo, FooDto>();
2935
cfg.CreateMap<Bar, BarDto>();
3036
});
37+
3138
// only during development, validate your mappings; remove it before release
3239
#if DEBUG
3340
configuration.AssertConfigurationIsValid();
3441
#endif
35-
// use DI (http://docs.automapper.org/en/latest/Dependency-injection.html) or create the mapper yourself
42+
// use DI (http://docs.automapper.io/en/latest/Dependency-injection.html) or create the mapper yourself
3643
var mapper = configuration.CreateMapper();
3744
```
3845
Then in your application code, execute the mappings:
@@ -42,7 +49,7 @@ var fooDto = mapper.Map<FooDto>(foo);
4249
var barDto = mapper.Map<BarDto>(bar);
4350
```
4451

45-
Check out the [getting started guide](https://automapper.readthedocs.io/en/latest/Getting-started.html). When you're done there, the [wiki](https://automapper.readthedocs.io/en/latest/) goes in to the nitty-gritty details. If you have questions, you can post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/automapper) or in our [Gitter](https://gitter.im/AutoMapper/AutoMapper).
52+
Check out the [getting started guide](https://automapper.readthedocs.io/en/latest/Getting-started.html). When you're done there, the [wiki](https://automapper.readthedocs.io/en/latest/) goes in to the nitty-gritty details. If you have questions, you can post them to [Stack Overflow](https://stackoverflow.com/questions/tagged/automapper).
4653

4754
### Where can I get it?
4855

@@ -58,19 +65,21 @@ dotnet add package AutoMapper
5865

5966
### Do you have an issue?
6067

61-
First check if it's already fixed by trying the [MyGet build](https://automapper.readthedocs.io/en/latest/The-MyGet-build.html).
62-
6368
You might want to know exactly what [your mapping does](https://automapper.readthedocs.io/en/latest/Understanding-your-mapping.html) at runtime.
6469

6570
If you're still running into problems, file an issue above.
6671

67-
### License, etc.
72+
If you are a paying customer, you can contact support via your account.
6873

69-
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
70-
For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
74+
### How do I set the license key?
7175

72-
AutoMapper is Copyright &copy; 2009 [Jimmy Bogard](https://jimmybogard.com) and other contributors under the [MIT license](https://github.com/AutoMapper/AutoMapper?tab=MIT-1-ov-file#MIT-1-ov-file).
76+
You can set the license key when registering AutoMapper:
7377

74-
### .NET Foundation
78+
```csharp
79+
services.AddAutoMapper(cfg =>
80+
{
81+
cfg.LicenseKey = "<license key here>";
82+
})
83+
```
7584

76-
This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
85+
You can register for your license key at [AutoMapper.io](https://automapper.io)

docs/source/10.0-Upgrade-Guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# 10.0 Upgrade Guide
22

3-
[Release notes](https://github.com/AutoMapper/AutoMapper/releases/tag/v10.0.0).
3+
[Release notes](https://github.com/luckypennysoftware/AutoMapper/releases/tag/v10.0.0).
44

55
## All collections are mapped by default, even if they have no setter
66

7-
You'll have to explicitly ignore those you don't want mapped. See also [this](https://github.com/AutoMapper/AutoMapper/issues/3449#issuecomment-651522397).
7+
You'll have to explicitly ignore those you don't want mapped. See also [this](https://github.com/luckypennysoftware/AutoMapper/issues/3449#issuecomment-651522397).
88

99
## Matching constructor parameters will be mapped from the source, even if they are optional
1010

0 commit comments

Comments
 (0)