Skip to content

Commit d5db3ac

Browse files
Jeremy D. MillerJeremy D. Miller
Jeremy D. Miller
authored and
Jeremy D. Miller
committed
using JasperFx.Core for type scanning. Bumps to Lamar v12
1 parent 159d7e0 commit d5db3ac

File tree

134 files changed

+6727
-6654
lines changed

Some content is hidden

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

134 files changed

+6727
-6654
lines changed

‎docs/.vitepress/config.js

+1-41
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@ module.exports = {
4242
collapsible: true,
4343
collapsed: true,
4444
items: getIOCSideBar()
45-
},
46-
{
47-
text: 'Compilation',
48-
collapsible: true,
49-
collapsed: true,
50-
items: getCompilationSideBar()
51-
},
45+
}
5246
]
5347
}
5448

@@ -230,37 +224,3 @@ function getIOCSideBar() {
230224
]
231225
}
232226

233-
function getCompilationSideBar() {
234-
return [
235-
{
236-
text: 'Compiling code with AssemblyGenerator',
237-
link: '/guide/compilation/assembly-generator'
238-
},
239-
{
240-
text: 'Generating code with ISourceWriter',
241-
link: '/guide/compilation/source-writer'
242-
},
243-
{
244-
text: 'The "Frame" Model',
245-
link: '/guide/compilation/frames/',
246-
children: [
247-
{
248-
text: 'Working with Variables',
249-
link: '/guide/compilation/frames/variables'
250-
},
251-
{
252-
text: 'Building custom Frames',
253-
link: '/guide/compilation/frames/frame'
254-
},
255-
{
256-
text: 'Extension methods for Names in code',
257-
link: '/guide/compilation/frames/extension-methods'
258-
},
259-
{
260-
text: 'Injected Fields',
261-
link: '/guide/compilation/frames/injected-fields'
262-
},
263-
]
264-
}
265-
]
266-
}

‎src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<PackageReference Include="IdentityServer4" Version="4.1.2" />
1212
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
13+
<PackageReference Include="JasperFx.Core" Version="1.4.0" />
1314

1415
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
1516
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
@@ -26,11 +27,11 @@
2627

2728

2829
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
29-
<PackageReference Include="Alba" Version="6.0.0" />
30+
<PackageReference Include="Alba" Version="7.4.0" />
3031
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
3132
</ItemGroup>
3233
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
33-
<PackageReference Include="Alba" Version="6.0.0" />
34+
<PackageReference Include="Alba" Version="7.4.0" />
3435
<PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
3536
</ItemGroup>
3637

‎src/Lamar.AspNetCoreTests/integrating_with_HostBuilder.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
using System.Linq;
44
using System.Threading;
55
using System.Threading.Tasks;
6-
using Baseline;
6+
using JasperFx.Core;
77
using Lamar.Microsoft.DependencyInjection;
8-
using Microsoft.Extensions.Configuration;
98
using Microsoft.Extensions.DependencyInjection;
109
using Microsoft.Extensions.Hosting;
1110
using Microsoft.Extensions.Logging;

‎src/Lamar.AspNetCoreTests/integration_with_aspnetcore.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88
using App.Metrics.AspNetCore;
9-
using Baseline;
109
using IdentityServer4.Models;
11-
using JasperFx.CodeGeneration;
10+
using JasperFx.Core;
11+
using JasperFx.Core.Reflection;
1212
using Lamar.IoC.Instances;
1313
using Lamar.Microsoft.DependencyInjection;
1414
using Microsoft.AspNetCore.Builder;

‎src/Lamar.Diagnostics/Lamar.Diagnostics.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app</Description>
5-
<Version>11.1.4</Version>
5+
<Version>12.0.0</Version>
66
<Authors>Jeremy D. Miller</Authors>
77
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
88
<DebugType>portable</DebugType>

‎src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Lamar Adapter for HostBuilder Integration</Description>
4-
<Version>11.1.4</Version>
4+
<Version>12.0.0</Version>
55
<Authors>Jeremy D. Miller</Authors>
66
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
77
<DebugType>portable</DebugType>

‎src/Lamar.Testing/Examples/SetterExamples.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Reflection;
3-
using JasperFx.TypeDiscovery;
3+
using JasperFx.Core.TypeScanning;
44
using Lamar.Scanning.Conventions;
55
using Shouldly;
66
using StructureMap.Testing.Widget;

‎src/Lamar.Testing/IoC/Acceptance/custom_registration_convention.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Linq;
2-
using JasperFx.TypeDiscovery;
2+
using JasperFx.Core.TypeScanning;
33
using Lamar.Scanning.Conventions;
44
using Microsoft.Extensions.DependencyInjection;
55
using Shouldly;

‎src/Lamar.Testing/IoC/Acceptance/missing_instance_requests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using JasperFx.CodeGeneration;
2+
using JasperFx.Core.Reflection;
23
using Lamar.IoC;
34
using Shouldly;
45
using StructureMap.Testing.Widget;

‎src/Lamar/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
[assembly: InternalsVisibleTo("Lamar.Testing")]
55
[assembly: InternalsVisibleTo("Lamar.Diagnostics")]
6-
[assembly:IgnoreAssembly]
6+
[assembly: IgnoreAssembly]

0 commit comments

Comments
 (0)