Merge pull request #17 from alistairjevans/develop

tillig · web-flow · commit 457b5ec42f74 · 2020-01-30T15:19:07.000-08:00
Autofac v5 Upgrade
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);
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "2.2.101"`
	`3`	`+ "version": "3.1.100"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static IRegistrationBuilder<TLimit, TActivatorData, TSingleRegistrationSt`
`68`	`68`
`69`	`69`	`var configuration = new ExportConfigurationBuilder();`
`70`	`70`	`configurationAction(configuration);`
`71`		`- registration.OnRegistered(e => AttachExport(e.ComponentRegistry, e.ComponentRegistration, configuration));`
	`71`	`+ registration.OnRegistered(e => AttachExport(e.ComponentRegistryBuilder, e.ComponentRegistration, configuration));`
`72`	`72`
`73`	`73`	`return registration;`
`74`	`74`	`}`
`@@ -236,7 +236,7 @@ public static IEnumerable<Export> ResolveExports<T>(this IComponentContext conte`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The component registry is responsible for disposal of contained registrations.")]`
`239`		`- private static void AttachExport(IComponentRegistry registry, IComponentRegistration registration, ExportConfigurationBuilder exportConfiguration)`
	`239`	`+ private static void AttachExport(IComponentRegistryBuilder registry, IComponentRegistration registration, ExportConfigurationBuilder exportConfiguration)`
`240`	`240`	`{`
`241`	`241`	`var contractService = new ContractBasedService(exportConfiguration.ContractName, exportConfiguration.ExportTypeIdentity);`
`242`	`242`