Updated Autofac dependencies.

autofac · Oct 8, 2018 · e82e652 · e82e652
1 parent 034ec64
commit e82e652
Show file tree

Hide file tree

Showing 31 changed files with 205 additions and 329 deletions.
diff --git a/src/AspNetCoreExample/AspNetCoreExample.csproj b/src/AspNetCoreExample/AspNetCoreExample.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.2.1" />
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
+    <PackageReference Include="Autofac" Version="4.8.1" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AttributeMetadataExample/App.config b/src/AttributeMetadataExample/App.config
@@ -7,7 +7,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/AttributeMetadataExample/AttributeMetadataExample.csproj b/src/AttributeMetadataExample/AttributeMetadataExample.csproj
@@ -33,12 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.2.1\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Extras.AttributeMetadata, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Extras.AttributeMetadata.4.0.0\lib\net45\Autofac.Extras.AttributeMetadata.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Autofac.Extras.AttributeMetadata.4.0.1\lib\net45\Autofac.Extras.AttributeMetadata.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.Mef, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Autofac.Mef.4.0.0\lib\net45\Autofac.Integration.Mef.dll</HintPath>

diff --git a/src/AttributeMetadataExample/LogWithFilter.cs b/src/AttributeMetadataExample/LogWithFilter.cs
@@ -1,14 +1,15 @@
 using System;
 using System.Linq;
 using Autofac.Extras.AttributeMetadata;
+using Autofac.Features.AttributeFilters;
 
 namespace AttributeMetadataExample
 {
     public class LogWithFilter
     {
         private readonly ILogAppender _appender;
 
-        public LogWithFilter([WithMetadata("AppenderName", "attributed")]ILogAppender appender)
+        public LogWithFilter([MetadataFilter("AppenderName", "attributed")]ILogAppender appender)
         {
             this._appender = appender;
         }

diff --git a/src/AttributeMetadataExample/Program.cs b/src/AttributeMetadataExample/Program.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Autofac;
 using Autofac.Extras.AttributeMetadata;
+using Autofac.Features.AttributeFilters;
 using Autofac.Integration.Mef;
 
 namespace AttributeMetadataExample
@@ -41,7 +42,7 @@ private static void Main(string[] args)
 
             // Example: Consuming component using metadata filter attribute in constructor.
             builder.RegisterType<LogWithFilter>()
-                .WithAttributeFilter();
+                .WithAttributeFiltering();
 
             using (var container = builder.Build())
             {

diff --git a/src/AttributeMetadataExample/packages.config b/src/AttributeMetadataExample/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.2.1" targetFramework="net452" />
-  <package id="Autofac.Extras.AttributeMetadata" version="4.0.0" targetFramework="net452" />
+  <package id="Autofac" version="4.8.1" targetFramework="net452" />
+  <package id="Autofac.Extras.AttributeMetadata" version="4.0.1" targetFramework="net452" />
   <package id="Autofac.Mef" version="4.0.0" targetFramework="net452" />
 </packages>
diff --git a/src/EnterpriseLibraryExample.MvcApplication/EnterpriseLibraryExample.MvcApplication.csproj b/src/EnterpriseLibraryExample.MvcApplication/EnterpriseLibraryExample.MvcApplication.csproj
@@ -51,8 +51,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.2.1\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Extras.CommonServiceLocator, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Autofac.Extras.CommonServiceLocator.4.0.0\lib\portable40-net40+sl5+win8+wp8+wpa81\Autofac.Extras.CommonServiceLocator.dll</HintPath>
@@ -63,8 +63,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Autofac.Integration.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.4.0.0\lib\net451\Autofac.Integration.Mvc.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.Common, Version=5.0.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35\Microsoft.Practices.EnterpriseLibrary.Common.dll</HintPath>

diff --git a/src/EnterpriseLibraryExample.MvcApplication/Web.config b/src/EnterpriseLibraryExample.MvcApplication/Web.config
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <section name="exceptionHandling"
-                 type="Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.Configuration.ExceptionHandlingSettings, Microsoft.Practices.EnterpriseLibrary.ExceptionHandling, Version=5.0.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-                 requirePermission="true" />
+        <section name="exceptionHandling" type="Microsoft.Practices.EnterpriseLibrary.ExceptionHandling.Configuration.ExceptionHandlingSettings, Microsoft.Practices.EnterpriseLibrary.ExceptionHandling, Version=5.0.505.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="true" />
     </configSections>
     <appSettings>
-        <add key="ClientValidationEnabled"
-             value="true" />
-        <add key="UnobtrusiveJavaScriptEnabled"
-             value="true" />
-        <add key="webpages:Version"
-             value="3.0.0.0" />
-        <add key="PreserveLoginUrl"
-             value="true" />
+        <add key="ClientValidationEnabled" value="true" />
+        <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+        <add key="webpages:Version" value="3.0.0.0" />
+        <add key="PreserveLoginUrl" value="true" />
     </appSettings>
     <exceptionHandling>
         <!--
@@ -24,13 +18,9 @@
         <exceptionPolicies>
             <add name="Global Web Exception Policy">
                 <exceptionTypes>
-                    <add name="All Exceptions"
-                         type="System.Exception, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-                         postHandlingAction="ThrowNewException">
+                    <add name="All Exceptions" type="System.Exception, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" postHandlingAction="ThrowNewException">
                         <exceptionHandlers>
-                            <add name="UrlRedirectHandler"
-                                 type="EnterpriseLibraryExample.MvcApplication.UrlRedirectHandler, EnterpriseLibraryExample.MvcApplication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"
-                                 url="~/Error.html" />
+                            <add name="UrlRedirectHandler" type="EnterpriseLibraryExample.MvcApplication.UrlRedirectHandler, EnterpriseLibraryExample.MvcApplication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" url="~/Error.html" />
                         </exceptionHandlers>
                     </add>
                 </exceptionTypes>
@@ -40,42 +30,29 @@
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Practices.ServiceLocation"
-                                  publicKeyToken="31bf3856ad364e35"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.0.0"
-                                 newVersion="1.3.0.0" />
+                <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Autofac"
-                                  publicKeyToken="17863af14b0044da"
-                                  culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.2.1.0"
-                                 newVersion="4.2.1.0" />
+                <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Helpers"
-                                  publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0"
-                                 newVersion="3.0.0.0" />
+                <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.WebPages"
-                                  publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0"
-                                 newVersion="3.0.0.0" />
+                <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="System.Web.Mvc"
-                                  publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0"
-                                 newVersion="5.2.3.0" />
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <system.web>
-        <compilation debug="true"
-                     targetFramework="4.5.2">
+        <compilation debug="true" targetFramework="4.5.2">
             <assemblies>
                 <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
                 <add assembly="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />

diff --git a/src/EnterpriseLibraryExample.MvcApplication/packages.config b/src/EnterpriseLibraryExample.MvcApplication/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.2.1" targetFramework="net452" />
   <package id="Autofac.Extras.CommonServiceLocator" version="4.0.0" targetFramework="net452" />
+  <package id="Autofac" version="4.8.1" targetFramework="net452" />
   <package id="Autofac.Extras.EnterpriseLibraryConfigurator" version="4.0.0" targetFramework="net452" />
-  <package id="Autofac.Mvc5" version="4.0.0" targetFramework="net452" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
+  <package id="Autofac.Mvc5" version="4.0.2" targetFramework="net452" />
   <package id="EnterpriseLibrary.Common" version="5.0.505.0" targetFramework="net452" />
   <package id="EnterpriseLibrary.ExceptionHandling" version="5.0.505.0" targetFramework="net452" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />

diff --git a/src/GenericHostBuilderExample/GenericHostBuilderExample.csproj b/src/GenericHostBuilderExample/GenericHostBuilderExample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MultitenantExample.ConsoleApplication/MultitenantExample.ConsoleApplication.csproj b/src/MultitenantExample.ConsoleApplication/MultitenantExample.ConsoleApplication.csproj
@@ -71,12 +71,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.2.1\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Autofac.Multitenant, Version=4.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.Multitenant.4.2.0\lib\net451\Autofac.Multitenant.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/MultitenantExample.ConsoleApplication/app.config b/src/MultitenantExample.ConsoleApplication/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.8.1.0" newVersion="4.8.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/MultitenantExample.ConsoleApplication/packages.config b/src/MultitenantExample.ConsoleApplication/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="4.2.1" targetFramework="net452" />
-  <package id="Autofac.Multitenant" version="4.0.0" targetFramework="net452" />
+  <package id="Autofac" version="4.8.1" targetFramework="net452" />
+  <package id="Autofac.Multitenant" version="4.2.0" targetFramework="net452" />
 </packages>
diff --git a/src/MultitenantExample.MvcApplication/MultitenantExample.MvcApplication.csproj b/src/MultitenantExample.MvcApplication/MultitenantExample.MvcApplication.csproj
@@ -51,20 +51,17 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=4.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.4.2.1\lib\net45\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.4.8.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Mvc5.4.0.0\lib\net451\Autofac.Integration.Mvc.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Autofac.Integration.Wcf, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.Wcf.4.1.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
     </Reference>
-    <Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Autofac.Multitenant, Version=4.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Autofac.Multitenant.4.2.0\lib\net451\Autofac.Multitenant.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Multitenant.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Autofac.Multitenant.Wcf.4.0.0\lib\net451\Autofac.Multitenant.Wcf.dll</HintPath>
@@ -83,6 +80,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Activation" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.ApplicationServices" />