Skip to content
This repository has been archived by the owner on Dec 12, 2022. It is now read-only.

Update to Unity 5.11.1 #110

Merged
merged 1 commit into from Jul 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -10,11 +10,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.1.6" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.1.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Unity.Container" Version="5.10.1" />
<PackageReference Include="Unity.Container" Version="5.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
Expand Down
2 changes: 0 additions & 2 deletions src/NServiceBus.Unity.Tests/BuildAllTests.cs
Expand Up @@ -11,9 +11,7 @@ public void ShouldResolveAllInterfaces()
{
var builder = new UnityObjectBuilder();


builder.Configure(typeof(First), DependencyLifecycle.InstancePerCall);

builder.Configure(typeof(Second), DependencyLifecycle.InstancePerCall);

var result = builder.BuildAll(typeof(ISomeInterface));
Expand Down
4 changes: 2 additions & 2 deletions src/NServiceBus.Unity.Tests/NServiceBus.Unity.Tests.csproj
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NServiceBus.ContainerTests.Sources" Version="7.1.6" />
<PackageReference Include="NServiceBus.ContainerTests.Sources" Version="7.1.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Unity.Container" Version="5.10.1" />
<PackageReference Include="Unity.Container" Version="5.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/NServiceBus.Unity/NServiceBus.Unity.csproj
Expand Up @@ -14,12 +14,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Unity.Container" Version="[5.9.7, 6.0.0)" />
<PackageReference Include="Unity.Container" Version="[5.11.1, 6.0.0)" />
<PackageReference Include="NServiceBus" Version="[7.0.1, 8.0.0)" />
<PackageReference Include="Fody" Version="3.3.5" PrivateAssets="All" />
<PackageReference Include="Janitor.Fody" Version="1.6.5" PrivateAssets="All" />
<PackageReference Include="Particular.CodeRules" Version="0.2.1" PrivateAssets="All" />
<PackageReference Include="Particular.Packaging" Version="0.2.1" PrivateAssets="All" />
<PackageReference Include="Particular.Packaging" Version="0.3.0" PrivateAssets="All" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/NServiceBus.Unity/SingletonLifetimeManager.cs
Expand Up @@ -20,7 +20,7 @@ public SingletonLifetimeManager(SingletonInstanceStore instanceStore)

public override object GetValue(ILifetimeContainer container = null)
{
return instanceStore.GetValue();
return instanceStore.GetValue() ?? NoValue;
}

public override void SetValue(object newValue, ILifetimeContainer container = null)
Expand Down