Merge pull request #17 from alistairjevans/develop

Autofac v5 Upgrade
autofac · Jan 30, 2020 · 457b5ec · 457b5ec
2 parents fc67aca + 25006c1
commit 457b5ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ version: 5.0.0.{build}
 
 configuration: Release
 
-os: Visual Studio 2017
+os: Visual Studio 2019
 
 environment:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.101"
+    "version": "3.1.100"
   }
 }
diff --git a/src/Autofac.Integration.Mef/Autofac.Integration.Mef.csproj b/src/Autofac.Integration.Mef/Autofac.Integration.Mef.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="5.0.0-develop-00634" />
+    <PackageReference Include="Autofac" Version="5.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.4">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
@@ -97,4 +97,4 @@
     </AssemblyAttribute>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Autofac.Integration.Mef/RegistrationExtensions.cs b/src/Autofac.Integration.Mef/RegistrationExtensions.cs
@@ -68,7 +68,7 @@ public static IRegistrationBuilder<TLimit, TActivatorData, TSingleRegistrationSt
 
             var configuration = new ExportConfigurationBuilder();
             configurationAction(configuration);
-            registration.OnRegistered(e => AttachExport(e.ComponentRegistry, e.ComponentRegistration, configuration));
+            registration.OnRegistered(e => AttachExport(e.ComponentRegistryBuilder, e.ComponentRegistration, configuration));
 
             return registration;
         }
@@ -236,7 +236,7 @@ public static IEnumerable<Export> ResolveExports<T>(this IComponentContext conte
         }
 
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The component registry is responsible for disposal of contained registrations.")]
-        private static void AttachExport(IComponentRegistry registry, IComponentRegistration registration, ExportConfigurationBuilder exportConfiguration)
+        private static void AttachExport(IComponentRegistryBuilder registry, IComponentRegistration registration, ExportConfigurationBuilder exportConfiguration)
         {
             var contractService = new ContractBasedService(exportConfiguration.ContractName, exportConfiguration.ExportTypeIdentity);