Merge branch 'main' of https://github.com/unitycontainer/container-regression-tests
# Conflicts: # Container.Version.6.0.x.csproj
This commit is contained in:
Коммит
1d78c226ae
|
@ -142,3 +142,4 @@ project.lock.json
|
|||
testresults.xml
|
||||
testresults.xml
|
||||
/*.slnf
|
||||
/NuGet.Config
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
using Microsoft.Practices.ObjectBuilder2;
|
||||
using Microsoft.Practices.Unity;
|
||||
using Microsoft.Practices.Unity.ObjectBuilder;
|
||||
#elif UNITY_V5 || UNITY_V6
|
||||
#elif UNITY_V5
|
||||
using Unity;
|
||||
using Unity.Builder;
|
||||
using Unity.Extension;
|
||||
|
@ -17,7 +17,7 @@ namespace Regression.Container
|
|||
{
|
||||
protected override void Initialize()
|
||||
{
|
||||
#if UNITY_V4 || UNITY_V5 || UNITY_V6
|
||||
#if UNITY_V4 || UNITY_V5
|
||||
Context.Strategies.Add(new BuilderAwareStrategy(), UnityBuildStage.PostInitialization);
|
||||
#else
|
||||
Context.TypePipelineChain.Add(UnityBuildStage.PostInitialization, new BuilderAwareStrategy());
|
||||
|
|
Загрузка…
Ссылка в новой задаче