Fixes #889 and fixes #932 - Add .NET Standard 2.0 target and make Dep…

…endencyResolutionException serializable.
autofac · Sep 10, 2018 · f46fd51 · f46fd51
1 parent 3726ea3
commit f46fd51
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 36 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.300"
+    "version": "2.1.401"
   }
 }
diff --git a/src/Autofac/Autofac.csproj b/src/Autofac/Autofac.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>Autofac is an IoC container for Microsoft .NET. It manages the dependencies between classes so that applications stay easy to change as they grow in size and complexity.</Description>
     <VersionPrefix>4.9.0</VersionPrefix>
-    <TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.1;net45</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -52,11 +52,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
     <PackageReference Include="System.ComponentModel" Version="4.0.1" />
   </ItemGroup>

diff --git a/src/Autofac/Core/DependencyResolutionException.cs b/src/Autofac/Core/DependencyResolutionException.cs
@@ -34,7 +34,7 @@ namespace Autofac.Core
     /// been made during the operation. For example, 'on activated' handlers may have already been
     /// fired, or 'single instance' components partially constructed.
     /// </summary>
-#if NET45
+#if !NETSTANDARD1_1
     [Serializable]
 #endif
     public class DependencyResolutionException : Exception

diff --git a/src/Autofac/Features/LazyDependencies/LazyWithMetadataRegistrationSource.cs b/src/Autofac/Features/LazyDependencies/LazyWithMetadataRegistrationSource.cs
@@ -53,7 +53,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Fun
                 throw new ArgumentNullException(nameof(registrationAccessor));
 
             var swt = service as IServiceWithType;
-#if !NETCOREAPP1_0
+#if NET45
             var lazyType = GetLazyType(swt);
             if (swt == null || lazyType == null || !swt.ServiceType.IsGenericTypeDefinedBy(lazyType))
                 return Enumerable.Empty<IComponentRegistration>();
@@ -104,7 +104,7 @@ public override string ToString()
             return rb.CreateRegistration();
         }
 
-#if !NETCOREAPP1_0
+#if NET45
         private static Type GetLazyType(IServiceWithType serviceWithType)
         {
             return serviceWithType != null

diff --git a/test/Autofac.Test.Scenarios.ScannedAssembly/Autofac.Test.Scenarios.ScannedAssembly.csproj b/test/Autofac.Test.Scenarios.ScannedAssembly/Autofac.Test.Scenarios.ScannedAssembly.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.1;netstandard2.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Autofac.Test.Scenarios.ScannedAssembly</AssemblyName>
     <AssemblyOriginatorKeyFile>../../Autofac.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Autofac.Test.Scenarios.ScannedAssembly</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.1' ">1.6.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <CodeAnalysisRuleSet>../../build/Analyzers.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -20,11 +20,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Autofac\Autofac.csproj" />
   </ItemGroup>

diff --git a/test/Autofac.Test/Autofac.Test.csproj b/test/Autofac.Test/Autofac.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp1.0;net46</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591;SA1602;SA1611</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Autofac.Test</AssemblyName>
@@ -42,10 +42,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System.Data" />
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Autofac.Test/ConcurrentTests.cs b/test/Autofac.Test/ConcurrentTests.cs
@@ -1,5 +1,4 @@
-#if !WINDOWS_UWP
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading;
@@ -136,5 +135,4 @@ public void NoLockWhenResolvingExistingSingleInstance()
             container.Resolve<object>();
         }
     }
-}
-#endif
+}
diff --git a/test/Autofac.Test/Features/LazyDependencies/LazyWithMetadata_WhenMetadataIsSupplied.cs b/test/Autofac.Test/Features/LazyDependencies/LazyWithMetadata_WhenMetadataIsSupplied.cs
@@ -1,7 +1,4 @@
-#if !NET451
-using System;
-using Autofac.Core;
-using Autofac.Test.Features.Metadata;
+using System;
 using Autofac.Test.Features.Metadata.TestTypes;
 using Xunit;
 
@@ -56,4 +53,3 @@ public void ValuesBubbleUpThroughAdapters()
         }
     }
 }
-#endif
diff --git a/...tofac.Test/Features/LazyDependencies/LazyWithMetadata_WhenNoMatchingMetadataIsSupplied.cs b/...tofac.Test/Features/LazyDependencies/LazyWithMetadata_WhenNoMatchingMetadataIsSupplied.cs
@@ -1,7 +1,5 @@
-#if !NET451
 using System;
 using Autofac.Core;
-using Autofac.Test.Features.Metadata;
 using Autofac.Test.Features.Metadata.TestTypes;
 using Xunit;
 
@@ -31,5 +29,4 @@ public void ResolvingStronglyTypedMetadataWithDefaultValueProvidesDefault()
             Assert.Equal(42, m.Metadata.TheInt);
         }
     }
-}
-#endif
+}
diff --git a/test/Autofac.Test/ModuleRegistrationExtensionsTests.cs b/test/Autofac.Test/ModuleRegistrationExtensionsTests.cs
@@ -44,7 +44,6 @@ public void RegisterAssemblyModulesChainedToRegisterModule()
             Assert.True(container.IsRegistered<object>());
         }
 
-#if !NET451
         [Fact]
         public void RegisterAssemblyModulesOfGenericType()
         {
@@ -68,7 +67,6 @@ public void RegisterAssemblyModulesOfBaseGenericType()
             Assert.True(container.IsRegistered<AComponent>());
             Assert.True(container.IsRegistered<BComponent>());
         }
-#endif
 
         [Fact]
         public void RegisterAssemblyModulesOfType()