Skip to content

Commit b521096

Browse files
jbogardjbogard
authored
Merge pull request #4507 from AutoMapper/Net_9
Target .Net 9 in tests
2 parents 10150bb + 0a8dff3 commit b521096

File tree

11 files changed

+24
-24
lines changed

11 files changed

+24
-24
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: windows-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525
- name: Install SQL Local DB

‎.github/workflows/lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write # for dessant/lock-threads to lock PRs
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: dessant/lock-threads@v2
17+
- uses: dessant/lock-threads@v5
1818
with:
1919
github-token: ${{ github.token }}
2020
issue-lock-inactive-days: 31

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: windows-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Install SQL Local DB

‎src/AutoMapper.DI.Tests/AutoMapper.DI.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</AssemblyName>
77
<PackageId>AutoMapper.Extensions.Microsoft.DependencyInjection.Tests</PackageId>
@@ -16,11 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="All" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
2121
<PackageReference Include="Shouldly" Version="4.2.1" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
23-
<PackageReference Include="xunit" Version="2.6.2" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
23+
<PackageReference Include="xunit" Version="2.9.2" />
2424
</ItemGroup>
2525

2626
</Project>

‎src/AutoMapper/ApiCompat/PreBuild.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ if($versionNumbers[1] -eq "0" -AND $versionNumbers[2] -eq "0")
1010
$oldVersion = $oldVersion.ToString() +".0.0"
1111
echo $oldVersion
1212
& ..\..\nuget install AutoMapper -Version $oldVersion -OutputDirectory ..\LastMajorVersionBinary
13-
& copy ..\LastMajorVersionBinary\AutoMapper.$oldVersion\lib\net6.0\AutoMapper.dll ..\LastMajorVersionBinary
13+
& copy ..\LastMajorVersionBinary\AutoMapper.$oldVersion\lib\net*.0\AutoMapper.dll ..\LastMajorVersionBinary

‎src/AutoMapper/AutoMapper.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<Summary>A convention-based object-object mapper.</Summary>
55
<Description>A convention-based object-object mapper.</Description>
6-
<TargetFrameworks>net8.0</TargetFrameworks>
6+
<TargetFramework>net8.0</TargetFramework>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<AssemblyName>AutoMapper</AssemblyName>
99
<AssemblyOriginatorKeyFile>..\..\AutoMapper.snk</AssemblyOriginatorKeyFile>
@@ -39,7 +39,7 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
42-
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
42+
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
4343
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4444
<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22074.1" PrivateAssets="All" />
4545
</ItemGroup>

‎src/AutoMapper/Internal/ReflectionHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static MemberInfo FindProperty(LambdaExpression lambdaExpression)
8888
{
8989
switch (expressionToCheck)
9090
{
91-
case MemberExpression { Member: var member, Expression: { NodeType: ExpressionType.Parameter or ExpressionType.Convert } }:
91+
case MemberExpression { Member: var member, Expression.NodeType: ExpressionType.Parameter or ExpressionType.Convert }:
9292
return member;
9393
case UnaryExpression { Operand: var operand }:
9494
expressionToCheck = operand;

‎src/Benchmark/Benchmark.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

‎src/IntegrationTests/AutoMapper.IntegrationTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<NoWarn>$(NoWarn);618</NoWarn>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<Compile Include="..\UnitTests\AutoMapperSpecBase.cs" Link="AutoMapperSpecBase.cs" />
1010
<ProjectReference Include="..\AutoMapper\AutoMapper.csproj" />
11-
<PackageReference Include="xunit" Version="2.6.2" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
1212
<PackageReference Include="Shouldly" Version="4.2.1" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="All" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1616
</ItemGroup>
1717
<ItemGroup>
1818
<Using Include="Xunit" />

‎src/TestApp/TestApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<AssemblyName>TestApp</AssemblyName>
66
<OutputType>Exe</OutputType>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
1717
<ProjectReference Include="..\AutoMapper\AutoMapper.csproj" />
1818
</ItemGroup>
1919

0 commit comments

Comments
 (0)