Skip to content

Commit ed6ad29

Browse files
i4004i4004
committed
Merge branch 'develop' into feature/#279
# Conflicts: # .vscode/launch.json # .vscode/tasks.json
2 parents f271a50 + 24d0b59 commit ed6ad29

File tree

53 files changed

+231
-111
lines changed

Some content is hidden

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

53 files changed

+231
-111
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
# Prefix the list here with "+" to use these queries and those in the config file.
5252
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5353

54+
- name: Setup .NET
55+
uses: actions/setup-dotnet@v1
56+
with:
57+
dotnet-version: 6.0.x
58+
5459
# Build
5560
- run: dotnet build src/Simplify.sln -v minimal
5661

‎.vscode/launch.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "Build Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester",
9-
"program": "${workspaceFolder}/src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/bin/Debug/net5.0/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester.dll",
10-
"cwd": "${workspaceFolder}/src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/bin/Debug/net5.0/",
9+
"program": "${workspaceFolder}/src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/bin/Debug/net6.0/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester.dll",
10+
"cwd": "${workspaceFolder}/src/Simplify.DI.Integration.Microsoft.Extensions.DependencyInjection.Tester/bin/Debug/net6.0/",
1111
"internalConsoleOptions": "openOnSessionStart",
1212
"serverReadyAction":
1313
{
@@ -33,5 +33,17 @@
3333
{
3434
"ASPNETCORE_ENVIRONMENT": "Development"
3535
}
36+
},
37+
{
38+
"name": "Simplify.Scheduler.IntegrationTester Launch",
39+
"type": "coreclr",
40+
"request": "launch",
41+
"preLaunchTask": "Build Simplify.Scheduler.IntegrationTester",
42+
"program": "${workspaceFolder}/src/Simplify.Scheduler.IntegrationTester/bin/Debug/net6.0/Simplify.Scheduler.IntegrationTester.dll",
43+
"cwd": "${workspaceFolder}/src/Simplify.Scheduler.IntegrationTester/bin/Debug/net6.0/",
44+
"env":
45+
{
46+
"ASPNETCORE_ENVIRONMENT": "Development"
47+
}
3648
}]
3749
}

‎.vscode/tasks.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@
3636
],
3737
"problemMatcher": "$msCompile"
3838
},
39+
{
40+
"label": "Build Simplify.Scheduler.IntegrationTester",
41+
"command": "dotnet",
42+
"type": "process",
43+
"args": [
44+
"build",
45+
"${workspaceFolder}/src/Simplify.Scheduler.IntegrationTester/Simplify.Scheduler.IntegrationTester.csproj"
46+
],
47+
"problemMatcher": "$msCompile"
48+
},
3949
{
4050
"label": "Test with coverage",
4151
"command": "dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info ${workspaceFolder}/src/Simplify.sln --filter TestCategory!=Integration ",

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: '{build}'
1+
version: "{build}"
22

3-
image: Visual Studio 2019
3+
image: Visual Studio 2022
44

55
skip_tags: true
66
clone_depth: 1
@@ -24,4 +24,4 @@ test:
2424
- Integration
2525

2626
deploy_script:
27-
- ps: .\MakeSourcePackages.ps1
27+
- ps: .\MakeSourcePackages.ps1

‎global.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk":
3+
{
4+
"version": "6.0.100",
5+
"rollForward": "latestMajor"
6+
}
7+
}

‎src/Examples/Simplify.Examples.Repository.FluentNHibernate.App/Simplify.Examples.Repository.FluentNHibernate.App.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Include="..\Simplify.Examples.Repository.FluentNHibernate\Simplify.Examples.Repository.FluentNHibernate.csproj" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.*" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
2020
<PackageReference Include="Simplify.DI.Provider.SimpleInjector" Version="1.10.*" />
2121
<PackageReference Include="System.Data.SqlClient" Version="4.8.*" />
2222
</ItemGroup>

‎src/Examples/Simplify.Examples.Repository.FluentNHibernate.SchemaUpdater/Simplify.Examples.Repository.FluentNHibernate.SchemaUpdater.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55

66
<Authors>Alexander Krylkov</Authors>
@@ -9,9 +9,9 @@
99
<Copyright>Licensed under LGPL</Copyright>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.*" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.*" />
1414
<PackageReference Include="NUnit" Version="3.13.*" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.*" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
1616
</ItemGroup>
1717
</Project>

‎src/Examples/Simplify.Scheduler.SimpleApp/Simplify.Scheduler.SimpleApp.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<IsPackable>false</IsPackable>
66

@@ -12,8 +12,8 @@
1212
<Copyright>Licensed under LGPL</Copyright>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
16-
<PackageReference Include="Simplify.Scheduler" Version="1.2.0" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
16+
<PackageReference Include="Simplify.Scheduler" Version="1.3.0" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<None Update="appsettings.json">

‎src/Simplify.AutoMapper.Tests/Extensions/IMappingExpressionExtensionsTests.cs‎ renamed to ‎src/Simplify.AutoMapper.Tests/Extensions/MappingExpressionExtensionsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Simplify.AutoMapper.Tests.Extensions
99
{
1010
[TestFixture]
11-
public class IMappingExpressionExtensionsTests
11+
public class MappingExpressionExtensionsTests
1212
{
1313
#region SetUp
1414

@@ -100,7 +100,7 @@ public void MapTo_NullDestinationMemberExpression_ThrowsAutoMapperConfigurationE
100100
Assert.Throws<AutoMapperConfigurationException>(() => new MapperConfiguration(c => c.CreateMap<FoodSource, FoodDto>()
101101
.MapTo(nullDestinationExpression!, "Category")));
102102

103-
Assert.Throws<AutoMapperConfigurationException>(() => new MapperConfiguration(c => c.CreateMap<FoodSource, FoodDto>()
103+
Assert.Throws<ArgumentException>(() => new MapperConfiguration(c => c.CreateMap<FoodSource, FoodDto>()
104104
.MapTo(d => null, s => s.Category)));
105105
}
106106

‎src/Simplify.AutoMapper.Tests/Extensions/IProfileExpressionExtensionsTests.cs‎ renamed to ‎src/Simplify.AutoMapper.Tests/Extensions/ProfileExpressionExtensionsTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Simplify.AutoMapper.Tests.Extensions
77
{
88
[TestFixture]
9-
public class IProfileExpressionExtensionsTests
9+
public class ProfileExpressionExtensionsTests
1010
{
1111
#region SetUp
1212

0 commit comments

Comments
 (0)