using JasperFx.Core for type scanning. Bumps to Lamar v12

JasperFx · May 1, 2023 · d5db3ac · d5db3ac
1 parent 159d7e0
commit d5db3ac
Show file tree

Hide file tree

Showing 134 changed files with 6,727 additions and 6,654 deletions.
diff --git a/docs/.vitepress/config.js b/docs/.vitepress/config.js
@@ -42,13 +42,7 @@ module.exports = {
           collapsible: true,
           collapsed: true,
           items: getIOCSideBar()
-        },
-        {
-          text: 'Compilation',
-          collapsible: true,
-          collapsed: true,
-          items: getCompilationSideBar()
-        },
+        }
     ]
   }
 
@@ -230,37 +224,3 @@ function getIOCSideBar() {
   ]
 }
 
-function getCompilationSideBar() {
-  return [
-    {
-      text: 'Compiling code with AssemblyGenerator',
-      link: '/guide/compilation/assembly-generator'
-    },
-    {
-      text: 'Generating code with ISourceWriter',
-      link: '/guide/compilation/source-writer'
-    },
-    {
-      text: 'The "Frame" Model',
-      link: '/guide/compilation/frames/',
-      children: [
-        {
-          text: 'Working with Variables',
-          link: '/guide/compilation/frames/variables'
-        },
-        {
-          text: 'Building custom Frames',
-          link: '/guide/compilation/frames/frame'
-        },
-        {
-          text: 'Extension methods for Names in code',
-          link: '/guide/compilation/frames/extension-methods'
-        },
-        {
-          text: 'Injected Fields',
-          link: '/guide/compilation/frames/injected-fields'
-        },
-      ]
-    }
-  ]
-}
diff --git a/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj b/src/Lamar.AspNetCoreTests/Lamar.AspNetCoreTests.csproj
@@ -10,6 +10,7 @@
 
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+    <PackageReference Include="JasperFx.Core" Version="1.4.0" />
 
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.7" />
@@ -26,11 +27,11 @@
 
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Include="Alba" Version="6.0.0" />
+    <PackageReference Include="Alba" Version="7.4.0" />
     <PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <PackageReference Include="Alba" Version="6.0.0" />
+    <PackageReference Include="Alba" Version="7.4.0" />
     <PackageReference Include=" Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/src/Lamar.AspNetCoreTests/integrating_with_HostBuilder.cs b/src/Lamar.AspNetCoreTests/integrating_with_HostBuilder.cs
@@ -3,9 +3,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Baseline;
+using JasperFx.Core;
 using Lamar.Microsoft.DependencyInjection;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;

diff --git a/src/Lamar.AspNetCoreTests/integration_with_aspnetcore.cs b/src/Lamar.AspNetCoreTests/integration_with_aspnetcore.cs
@@ -6,9 +6,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using App.Metrics.AspNetCore;
-using Baseline;
 using IdentityServer4.Models;
-using JasperFx.CodeGeneration;
+using JasperFx.Core;
+using JasperFx.Core.Reflection;
 using Lamar.IoC.Instances;
 using Lamar.Microsoft.DependencyInjection;
 using Microsoft.AspNetCore.Builder;

diff --git a/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj b/src/Lamar.Diagnostics/Lamar.Diagnostics.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Adds diagnostic checks to the command line of your Lamar-enabled ASP.Net Core app</Description>
-        <Version>11.1.4</Version>
+        <Version>12.0.0</Version>
         <Authors>Jeremy D. Miller</Authors>
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <DebugType>portable</DebugType>

diff --git a/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj b/src/Lamar.Microsoft.DependencyInjection/Lamar.Microsoft.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Lamar Adapter for HostBuilder Integration</Description>
-    <Version>11.1.4</Version>
+    <Version>12.0.0</Version>
     <Authors>Jeremy D. Miller</Authors>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <DebugType>portable</DebugType>

diff --git a/src/Lamar.Testing/Examples/SetterExamples.cs b/src/Lamar.Testing/Examples/SetterExamples.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using JasperFx.TypeDiscovery;
+using JasperFx.Core.TypeScanning;
 using Lamar.Scanning.Conventions;
 using Shouldly;
 using StructureMap.Testing.Widget;

diff --git a/src/Lamar.Testing/IoC/Acceptance/custom_registration_convention.cs b/src/Lamar.Testing/IoC/Acceptance/custom_registration_convention.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using JasperFx.TypeDiscovery;
+using JasperFx.Core.TypeScanning;
 using Lamar.Scanning.Conventions;
 using Microsoft.Extensions.DependencyInjection;
 using Shouldly;

diff --git a/src/Lamar.Testing/IoC/Acceptance/missing_instance_requests.cs b/src/Lamar.Testing/IoC/Acceptance/missing_instance_requests.cs
@@ -1,4 +1,5 @@
 using JasperFx.CodeGeneration;
+using JasperFx.Core.Reflection;
 using Lamar.IoC;
 using Shouldly;
 using StructureMap.Testing.Widget;

diff --git a/src/Lamar/AssemblyInfo.cs b/src/Lamar/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 [assembly: InternalsVisibleTo("Lamar.Testing")]
 [assembly: InternalsVisibleTo("Lamar.Diagnostics")]
-[assembly:IgnoreAssembly]
+[assembly: IgnoreAssembly]