Particular · andreasohlund · Feb 15, 2020 · Feb 14, 2020 · Feb 14, 2020 · Feb 14, 2020
diff --git a/...jection.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.AcceptanceTests.csproj b/...jection.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.AcceptanceTests.csproj
@@ -2,17 +2,22 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.Extensions.DependencyInjection.AcceptanceTests/TestSuiteConstraints.cs b/src/NServiceBus.Extensions.DependencyInjection.AcceptanceTests/TestSuiteConstraints.cs
@@ -1,12 +1,17 @@
-namespace NServiceBus.AcceptanceTests {
+namespace NServiceBus.AcceptanceTests
+{
     using AcceptanceTesting.Support;
 
     public partial class TestSuiteConstraints
     {
         public bool SupportsDtc { get; } = false;
+
         public bool SupportsCrossQueueTransactions { get; } = false;
+
         public bool SupportsNativePubSub { get; } = true;
+
         public bool SupportsNativeDeferral { get; } = true;
+
         public bool SupportsOutbox { get; } = false;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration()

diff --git a/src/NServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests/DefaultServer.cs b/src/NServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests/DefaultServer.cs
@@ -7,7 +7,7 @@
     using Autofac.Core;
     using Autofac.Core.Registration;
     using Autofac.Extensions.DependencyInjection;
- 
+
     public class DefaultServer : ExternallyManagedContainerServer
     {
         public override Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomizationConfiguration, Action<EndpointConfiguration> configurationBuilderCustomization)

diff --git a/...AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests.csproj b/...AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests.csproj
@@ -2,11 +2,20 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
@@ -16,8 +25,4 @@
     <Compile Remove="\**\EndpointTemplates\**\DefaultServer.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/...ServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests/TestSuiteConstraints.cs b/...ServiceBus.Extensions.DependencyInjection.Autofac.AcceptanceTests/TestSuiteConstraints.cs
@@ -1,12 +1,17 @@
-namespace NServiceBus.AcceptanceTests {
+namespace NServiceBus.AcceptanceTests
+{
     using AcceptanceTesting.Support;
 
     public partial class TestSuiteConstraints
     {
         public bool SupportsDtc { get; } = false;
+
         public bool SupportsCrossQueueTransactions { get; } = false;
+
         public bool SupportsNativePubSub { get; } = true;
+
         public bool SupportsNativeDeferral { get; } = true;
+
         public bool SupportsOutbox { get; } = false;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration()

diff --git a/...anceTests/NServiceBus.Extensions.DependencyInjection.CastleWindsor.AcceptanceTests.csproj b/...anceTests/NServiceBus.Extensions.DependencyInjection.CastleWindsor.AcceptanceTests.csproj
@@ -1,12 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
@@ -16,8 +25,4 @@
     <Compile Remove="\**\EndpointTemplates\**\DefaultServer.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/...eBus.Extensions.DependencyInjection.CastleWindsor.AcceptanceTests/TestSuiteConstraints.cs b/...eBus.Extensions.DependencyInjection.CastleWindsor.AcceptanceTests/TestSuiteConstraints.cs
@@ -5,9 +5,13 @@
     public partial class TestSuiteConstraints
     {
         public bool SupportsDtc { get; } = false;
+
         public bool SupportsCrossQueueTransactions { get; } = false;
+
         public bool SupportsNativePubSub { get; } = true;
+
         public bool SupportsNativeDeferral { get; } = true;
+
         public bool SupportsOutbox { get; } = false;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration()

diff --git a/...r.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Lamar.AcceptanceTests.csproj b/...r.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Lamar.AcceptanceTests.csproj
@@ -2,11 +2,20 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
@@ -16,8 +25,4 @@
     <Compile Remove="\**\EndpointTemplates\**\DefaultServer.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/NServiceBus.Extensions.DependencyInjection.Lamar.AcceptanceTests/TestSuiteConstraints.cs b/src/NServiceBus.Extensions.DependencyInjection.Lamar.AcceptanceTests/TestSuiteConstraints.cs
@@ -1,12 +1,17 @@
-namespace NServiceBus.AcceptanceTests {
+namespace NServiceBus.AcceptanceTests
+{
     using AcceptanceTesting.Support;
 
     public partial class TestSuiteConstraints
     {
         public bool SupportsDtc { get; } = false;
+
         public bool SupportsCrossQueueTransactions { get; } = false;
+
         public bool SupportsNativePubSub { get; } = true;
+
         public bool SupportsNativeDeferral { get; } = true;
+
         public bool SupportsOutbox { get; } = false;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration()

diff --git a/...tanceTests/NServiceBus.Extensions.DependencyInjection.StructureMap.AcceptanceTests.csproj b/...tanceTests/NServiceBus.Extensions.DependencyInjection.StructureMap.AcceptanceTests.csproj
@@ -2,11 +2,20 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="2.0.0" />
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.2" />
+    <PackageReference Include="StructureMap.Microsoft.DependencyInjection" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
@@ -16,8 +25,4 @@
     <Compile Remove="\**\EndpointTemplates\**\DefaultServer.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/...ceBus.Extensions.DependencyInjection.StructureMap.AcceptanceTests/TestSuiteConstraints.cs b/...ceBus.Extensions.DependencyInjection.StructureMap.AcceptanceTests/TestSuiteConstraints.cs
@@ -5,9 +5,13 @@
     public partial class TestSuiteConstraints
     {
         public bool SupportsDtc { get; } = false;
+
         public bool SupportsCrossQueueTransactions { get; } = false;
+
         public bool SupportsNativePubSub { get; } = true;
+
         public bool SupportsNativeDeferral { get; } = true;
+
         public bool SupportsOutbox { get; } = false;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration()

diff --git a/...ensions.DependencyInjection.Tests/NServiceBus.Extensions.DependencyInjection.Tests.csproj b/...ensions.DependencyInjection.Tests/NServiceBus.Extensions.DependencyInjection.Tests.csproj
@@ -8,16 +8,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Include="NServiceBus" Version="7.2.2" />
     <PackageReference Include="Particular.Approvals" Version="0.2.0" />
     <PackageReference Include="PublicApiGenerator" Version="9.3.0" />
-    <PackageReference Include="NServiceBus" Version="7.2.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...y.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Unity.AcceptanceTests.csproj b/...y.AcceptanceTests/NServiceBus.Extensions.DependencyInjection.Unity.AcceptanceTests.csproj
@@ -2,18 +2,23 @@
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.2.2" />
     <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.11.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NServiceBus.Extensions.DependencyInjection\NServiceBus.Extensions.DependencyInjection.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...rviceBus.Extensions.DependencyInjection/NServiceBus.Extensions.DependencyInjection.csproj b/...rviceBus.Extensions.DependencyInjection/NServiceBus.Extensions.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="NServiceBus" Version="7.2.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Include="NServiceBus" Version="[7.2.2, 8.0.0)" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
     <PackageReference Include="Particular.Packaging" Version="0.5.0" PrivateAssets="All" />
   </ItemGroup>