diff --git a/src/LightInject.xUnit.sln b/src/LightInject.xUnit.sln
index 1db6f8f..b990b21 100644
--- a/src/LightInject.xUnit.sln
+++ b/src/LightInject.xUnit.sln
@@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31205.134
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2", "LightInject.xUnit2\LightInject.xUnit2.csproj", "{245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2", "LightInject.xUnit2\LightInject.xUnit2.csproj", "{EEA1E6AA-5139-4E48-8752-D61640676D1D}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2.Tests", "LightInject.xUnit2.Tests\LightInject.xUnit2.Tests.csproj", "{633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.xUnit2.Tests", "LightInject.xUnit2.Tests\LightInject.xUnit2.Tests.csproj", "{0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,19 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}.Release|Any CPU.Build.0 = Release|Any CPU
- {633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EEA1E6AA-5139-4E48-8752-D61640676D1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EEA1E6AA-5139-4E48-8752-D61640676D1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EEA1E6AA-5139-4E48-8752-D61640676D1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EEA1E6AA-5139-4E48-8752-D61640676D1D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0A37B8AD-8A2C-4CEA-ADFC-6BF4B40BA4DC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {6E919CE6-7482-4E6C-AF09-305BFB6A221E}
+ EndGlobalSection
EndGlobal
diff --git a/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj b/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj
index 2c72de9..36ee5a5 100644
--- a/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj
+++ b/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj
@@ -1,98 +1,32 @@
-
-
-
-
+
+
- Debug
- AnyCPU
- {633CEBA8-AE04-40C8-86B5-BC5DBE22D0A0}
- Library
- Properties
- LightInject.xUnit2.Tests
- LightInject.xUnit2.Tests
- v4.6
- 512
-
-
+ netcoreapp3.1
+
+ false
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;NET46
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE;NET46
- prompt
- 4
-
-
-
- ..\packages\LightInject.5.0.0\lib\net46\LightInject.dll
- True
-
-
-
-
-
-
-
-
-
-
- ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
- True
-
-
- ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll
- True
-
-
- ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll
- True
-
-
- ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
- True
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- {245abd3a-3fe2-480f-b4ff-6fc72ac11acc}
- LightInject.xUnit2
-
+
+
+ 1.0.0
+
+
+ 6.4.0
+
+
+ 4.8.9
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
-
+
-
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
\ No newline at end of file
+
+
+
diff --git a/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj.DotSettings b/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj.DotSettings
deleted file mode 100644
index 662f956..0000000
--- a/src/LightInject.xUnit2.Tests/LightInject.xUnit2.Tests.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- CSharp50
\ No newline at end of file
diff --git a/src/LightInject.xUnit2.Tests/Properties/AssemblyInfo.cs b/src/LightInject.xUnit2.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 62dc3f1..0000000
--- a/src/LightInject.xUnit2.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("LightInject.xUnit2.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("LightInject.xUnit2.Tests")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("633ceba8-ae04-40c8-86b5-bc5dbe22d0a0")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/LightInject.xUnit2.Tests/packages.config b/src/LightInject.xUnit2.Tests/packages.config
deleted file mode 100644
index 710363d..0000000
--- a/src/LightInject.xUnit2.Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/LightInject.xUnit2/LightInject.xUnit2.cs b/src/LightInject.xUnit2/LightInject.xUnit2.cs
index 7aec0e7..fc2cc4e 100644
--- a/src/LightInject.xUnit2/LightInject.xUnit2.cs
+++ b/src/LightInject.xUnit2/LightInject.xUnit2.cs
@@ -116,7 +116,7 @@ public override IEnumerable GetData(MethodInfo methodUnderTest)
///
/// This method is only executed when the test app domains are unloaded.
///
- [ExcludeFromCodeCoverage]
+ [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
private static void EndAllScopes()
{
foreach (var container in Containers.Values)
diff --git a/src/LightInject.xUnit2/LightInject.xUnit2.csproj b/src/LightInject.xUnit2/LightInject.xUnit2.csproj
index 4481261..ae2cf9f 100644
--- a/src/LightInject.xUnit2/LightInject.xUnit2.csproj
+++ b/src/LightInject.xUnit2/LightInject.xUnit2.csproj
@@ -1,86 +1,21 @@
-
-
-
+
+
- Debug
- AnyCPU
- {245ABD3A-3FE2-480F-B4FF-6FC72AC11ACC}
- Library
- Properties
- LightInject.xUnit2
- LightInject.xUnit2
- v4.6
- 512
+ netstandard2.0
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;NET46
- prompt
- 4
- bin\Debug\LightInject.xUnit2.XML
-
-
- pdbonly
- true
- bin\Release\
- TRACE;NET46
- prompt
- 4
- bin\Release\LightInject.xUnit2.XML
- true
-
-
-
- ..\packages\LightInject.5.0.0\lib\net46\LightInject.dll
- True
-
-
-
-
-
-
-
-
-
-
- ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
- False
- True
-
-
- ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll
- False
- True
-
-
- ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
- False
- True
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+ 6.4.0
+
+
+ 1.1.118
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
+
+ 2.4.1
+
-
-
-
\ No newline at end of file
+
+
diff --git a/src/LightInject.xUnit2/LightInject.xUnit2.csproj.DotSettings b/src/LightInject.xUnit2/LightInject.xUnit2.csproj.DotSettings
deleted file mode 100644
index 662f956..0000000
--- a/src/LightInject.xUnit2/LightInject.xUnit2.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-
- CSharp50
\ No newline at end of file
diff --git a/src/LightInject.xUnit2/Properties/AssemblyInfo.cs b/src/LightInject.xUnit2/Properties/AssemblyInfo.cs
deleted file mode 100644
index 3598ee4..0000000
--- a/src/LightInject.xUnit2/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyTitle("LightInject.xUnit2")]
-#if NET45
- [assembly: AssemblyProduct("LightInject.xUnit2 (NET45)")]
-#endif
-#if NET46
-[assembly: AssemblyProduct("LightInject.xUnit2 (NET46)")]
-#endif
-#if DNX451
- [assembly: AssemblyProduct("LightInject.xUnit2 (DNX451)")]
-#endif
-#if DNXCORE50
- [assembly: AssemblyProduct("LightInject.xUnit2 (DNXCORE50)")]
-#endif
-[assembly: AssemblyCopyright("Copyright © Bernhard Richter 2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
-[assembly: AssemblyInformationalVersion("4.0.0")]
-[module: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1633:FileMustHaveHeader", Justification = "Custom header.")]
diff --git a/src/LightInject.xUnit2/packages.config b/src/LightInject.xUnit2/packages.config
deleted file mode 100644
index 27c2412..0000000
--- a/src/LightInject.xUnit2/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/LightInject.xUnit2/project.json_ b/src/LightInject.xUnit2/project.json_
deleted file mode 100644
index e4f7cea..0000000
--- a/src/LightInject.xUnit2/project.json_
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "version": "3.0.0.10",
- "dependencies": {
- "LightInject" : "4.0.2",
- "xunit.core" : "2.1.0"
- },
- "frameworks": {
- "dnx451" :
- {
- "dependencies": {
- "System.Runtime" : "4.0.20"
- }
- },
- "dnxcore50": {
- "dependencies": {
- "System.Collections": "4.0.10",
- "System.Collections.Concurrent": "4.0.10",
- "System.IO": "4.0.10",
- "System.Linq": "4.0.0",
- "System.Reflection": "4.0.10",
- "System.Reflection.Emit": "4.0.0",
- "System.Reflection.Emit.Lightweight": "4.0.0",
- "System.Runtime": "4.0.20",
- "System.Runtime.Extensions": "4.0.10",
- "System.Diagnostics.Tools": "4.0.0",
- "System.Reflection.TypeExtensions": "4.0.0",
- "System.Reflection.Extensions": "4.0.0"
- }
- }
- }
-}
\ No newline at end of file