New: Update Unity

This commit is contained in:
ta264
2019-10-14 21:21:00 +01:00
committed by Qstick
parent 8b9d64b15a
commit 53ffc9867c
3 changed files with 14 additions and 14 deletions

View File

@@ -6,11 +6,12 @@ using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using Microsoft.Practices.Unity;
using Unity;
using Moq;
using Moq.Language.Flow;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Test.Common.AutoMoq.Unity;
using Unity.Resolution;
[assembly: InternalsVisibleTo("AutoMoq.Tests")]

View File

@@ -1,12 +1,11 @@

using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using Microsoft.Practices.ObjectBuilder2;
using Microsoft.Practices.Unity;
using Unity;
using Moq;
using Unity.Strategies;
using Unity.Builder;
namespace NzbDrone.Test.Common.AutoMoq.Unity
{
@@ -24,7 +23,7 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
_container = container;
}
public override void PreBuildUp(IBuilderContext context)
public override void PreBuildUp(ref BuilderContext context)
{
var autoMoqer = _container.Resolve<AutoMoqer>();
@@ -43,12 +42,12 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
{
var mocker = _container.Resolve<AutoMoqer>();
return TypeIsNotRegistered(type) && (mocker.ResolveType == null || mocker.ResolveType != type);
//return TypeIsNotRegistered(type) && type.IsInterface;
}
private static Type GetTheTypeFromTheBuilderContext(IBuilderContext context)
private static Type GetTheTypeFromTheBuilderContext(BuilderContext context)
{
return (context.OriginalBuildKey).Type;
// return (context.OriginalBuildKey).Type;
return context.Type;
}
private bool TypeIsNotRegistered(Type type)
@@ -82,4 +81,4 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
#endregion
}
}
}

View File

@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using Microsoft.Practices.Unity;
using Microsoft.Practices.Unity.ObjectBuilder;
using Unity.Builder;
using Unity.Extension;
namespace NzbDrone.Test.Common.AutoMoq.Unity
{
@@ -36,4 +36,4 @@ namespace NzbDrone.Test.Common.AutoMoq.Unity
#endregion
}
}
}