implab/ImplabNet Commit - r289:95896f882995

0

Implab.ServiceHost.Test/Implab.ServiceHost.Test.csproj created 644 +29 0

			@@ -0,0 +1,29
		1	<Project Sdk="Microsoft.NET.Sdk">
		2	<PropertyGroup Condition="'$(OSTYPE)'=='linux'">
		3	<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
		4	<FrameworkPathOverride Condition="'$(TargetFramework)'=='net46'">/usr/lib/mono/4.5/</FrameworkPathOverride>
		5	</PropertyGroup>
		6
		7	<PropertyGroup Condition="'$(OSTYPE)'=='windows'">
		8	<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
		9	</PropertyGroup>
		10
		11	<PropertyGroup>
		12	<IsPackable>false</IsPackable>
		13	</PropertyGroup>
		14
		15	<ItemGroup>
		16	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0-preview-20180109-01" />
		17	<PackageReference Include="System.Reactive" Version="4.0.0" />
		18	<PackageReference Include="xunit" Version="2.3.1" />
		19	<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
		20	<ProjectReference Include="../Implab/Implab.csproj"/>
		21	<ProjectReference Include="../Implab.ServiceHost/Implab.ServiceHost.csproj"/>
		22	<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
		23	</ItemGroup>
		24
		25	<ItemGroup>
		26	<None Include="data/*/.*" CopyToOutputDirectory="PreserveNewest" />
		27	</ItemGroup>
		28
		29	</Project>

0

Implab.ServiceHost.Test/data/container/basic.xml created 644 +74 0

			@@ -0,0 +1,74
		1	<?xml version="1.0" encoding="UTF-8"?>
		2	<container xmlns="http://implab.org/schemas/servicehost/unity.v1.xsd">
		3	<namespace name="System"/>
		4	<namespace name="System.Collections.Generic"/>
		5	<namespace name="Implab.Components"/>
		6	<namespace name="Implab.ServiceHost.Test.Mock"/>
		7
		8	<!-- Default FooService -->
		9	<register type="FooService{}">
		10	<property name="Name">
		11	<value>I'm default!</value>
		12	</property>
		13	</register>
		14
		15	<!-- foo2 -->
		16	<register name="foo2" type="Foo">
		17	<property name="Name">
		18	<value>GOOD</value>
		19	</property>
		20	<property name="IntValue">
		21	<value>2</value>
		22	</property>
		23	</register>
		24
		25	<register type="Foo">
		26	<method name="AddRange">
		27	<array itemsType="Foo">
		28	<dependency name="foo2"/>
		29	</array>
		30	</method>
		31	</register>
		32
		33	<register type="IContainer{}" mapTo="Container{}">
		34	<constructor/>
		35	<method name="SetInstance">
		36	<dependency type="T"/>
		37	</method>
		38	<method name="AddRange">
		39	<array itemsType="T">
		40	<dependency name="foo2-bar"/>
		41	</array>
		42	</method>
		43	</register>
		44
		45	<register type="List{}">
		46	<constructor />
		47	</register>
		48
		49	<register type="IContainer{String}" mapTo="Container{String}">
		50	<constructor/>
		51	<method name="SetInstance">
		52	<dependency type="String" name="name1"/>
		53	</method>
		54	</register>
		55
		56	<serialized type="Foo+Bar">
		57	<Bar xmlns="" id="1">
		58	<Name>Baaar</Name>
		59	</Bar>
		60	</serialized>
		61
		62	<value name="connection1" type="String"><![CDATA[Connect me <here>!]]></value>
		63	<value name="name1" type="String" value="Hello!"/>
		64
		65	<factory name="foo3" type="IFactory{Foo}" mapTo="FooFactory">
		66	<property name="Connection">
		67	<value><![CDATA[Wired "" objecty <> name @#$%^&]]></value>
		68	</property>
		69	<property name="UseSsl">
		70	<value>false</value>
		71	</property>
		72	</factory>
		73
		74	</container> No newline at end of file

0

Implab.ServiceHost.Test/data/container/empty.xml created 644 +2 0

			@@ -0,0 +1,2
		1	<container xmlns="http://implab.org/schemas/servicehost/unity.v1.xsd">
		2	</container> No newline at end of file

0

Implab.ServiceHost.Test/data/container/generic.services.xml created 644 +65 0

			@@ -0,0 +1,65
		1	<?xml version="1.0"?>
		2	<container xmlns="http://implab.org/schemas/servicehost/unity.v1.xsd">
		3	<namespace name="System"/>
		4	<namespace name="System.Collections.Generic"/>
		5	<namespace name="Implab.Components"/>
		6	<namespace name="Implab.ServiceHost.Test.Mock"/>
		7
		8	<register name="Big" type="Baz+Nut">
		9	<property name="Size">
		10	<value>5</value>
		11	</property>
		12	</register>
		13	<register name="Mid" type="Baz+Nut">
		14	<property name="Size">
		15	<value>3</value>
		16	</property>
		17	</register>
		18	<register name="Small" type="Baz+Nut">
		19	<property name="Size">
		20	<value>1</value>
		21	</property>
		22	</register>
		23	<register type="Baz+Nut">
		24	<property name="Size">
		25	<value>2</value>
		26	</property>
		27	</register>
		28
		29	<!-- register a generic interface mapping to the generic type -->
		30	<register type="IBox{}" mapTo="Box{}">
		31	<property name="Value">
		32	<!-- the dependency type is implied from the property and will be the generic parameter {T} -->
		33	<dependency optional="true"/>
		34	</property>
		35	</register>
		36
		37	<factory name="Box2" type="BoxFactory{}">
		38	</factory>
		39
		40	<register type="IBox{String}" mapTo="Box{String}">
		41	<property name="Name">
		42	<value>boxForString</value>
		43	</property>
		44	</register>
		45
		46	<register name="Small" type="IBox{}" mapTo="Box{}">
		47	<property name="Value">
		48	<dependency name="Small" optional="true"/>
		49	</property>
		50	</register>
		51
		52	<register type="SetOfBoxes{}">
		53	<constructor/>
		54	<method name="BoxValues">
		55	<!-- only generic parameter or type without unresolved parameters
		56	can be used, this is a limitation of Unity container. TODO -->
		57	<array itemsType="T">
		58	<default />
		59	<dependency optional="true"/>
		60	<dependency name="Small" optional="true"/>
		61	</array>
		62	</method>
		63	</register>
		64
		65	</container> No newline at end of file

0

Implab.ServiceHost.Test/data/container/p2.xml created 644 +6 0

			@@ -0,0 +1,6
		1	<?xml version="1.0"?>
		2	<Person xmlns="urn:implab:test:model">
		3	<FirstName>Trohn</FirstName>
		4	<LastName>Javolta</LastName>
		5	<Age>88</Age>
		6	</Person> No newline at end of file

0

Implab.ServiceHost.Test/data/container/serialized.instances.xml created 644 +16 0

			@@ -0,0 +1,16
		1	<?xml version="1.0"?>
		2	<container xmlns="http://implab.org/schemas/servicehost/unity.v1.xsd">
		3	<namespace name="System"/>
		4	<namespace name="System.Collections.Generic"/>
		5	<namespace name="Implab.Components"/>
		6	<namespace name="Implab.ServiceHost.Test.Mock"/>
		7
		8	<serialized name="p1" type="Person">
		9	<Person xmlns="urn:implab:test:model">
		10	<FirstName>Com</FirstName>
		11	<LastName>Truise</LastName>
		12	<Age>99</Age>
		13	</Person>
		14	</serialized>
		15	<serialized name="p2" type="Person" href="p2.xml"/>
		16	</container> No newline at end of file

0

Implab.ServiceHost.Test/data/container/simple.services.xml created 644 +63 0

			@@ -0,0 +1,63
		1	<?xml version="1.0"?>
		2	<container xmlns="http://implab.org/schemas/servicehost/unity.v1.xsd">
		3	<namespace name="System"/>
		4	<namespace name="System.Collections.Generic"/>
		5	<namespace name="Implab.Components"/>
		6	<namespace name="Implab.ServiceHost.Test.Mock"/>
		7
		8	<register name="Baz1" type="Baz">
		9	<property name="Numbers">
		10	<array>
		11	<value>1</value>
		12	<value>2</value>
		13	<value>3</value>
		14	</array>
		15	</property>
		16	</register>
		17
		18	<register type="Baz">
		19	<property name="Nuts">
		20	<array>
		21	<dependency/>
		22	<dependency name="Big"/>
		23	<dependency name="Big"/>
		24	<dependency name="Small"/>
		25	<dependency name="Mid"/>
		26	</array>
		27	</property>
		28	</register>
		29
		30	<register name="Big" type="Baz+Nut">
		31	<property name="Size">
		32	<value>5</value>
		33	</property>
		34	</register>
		35	<register name="Mid" type="Baz+Nut">
		36	<property name="Size">
		37	<value>3</value>
		38	</property>
		39	</register>
		40	<register name="Small" type="Baz+Nut">
		41	<property name="Size">
		42	<value>1</value>
		43	</property>
		44	</register>
		45	<register type="Baz+Nut">
		46	<property name="Size">
		47	<value>2</value>
		48	</property>
		49	</register>
		50	<factory type="BazFactory">
		51	<provides name="Baz2" type="Baz"/>
		52	</factory>
		53
		54	<factory name="Baz3" type="BazFactory">
		55	<property name="IdGenerator">
		56	<dependency/>
		57	</property>
		58	</factory>
		59
		60	<factory type="GuidFactory">
		61	<singleton/>
		62	</factory>
		63	</container> No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/Baz.cs created 644 +23 0

			@@ -0,0 +1,23
		1	using System;
		2	using System.Collections.Generic;
		3
		4	namespace Implab.ServiceHost.Test.Mock {
		5	public class Baz {
		6
		7	public Guid Id {
		8	get; set;
		9	}
		10
		11	public int[] Numbers {
		12	get; set;
		13	}
		14
		15	public Nut[] Nuts {
		16	get; set;
		17	}
		18
		19	public class Nut {
		20	public int Size { get; set; }
		21	}
		22	}
		23	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/BazFactory.cs created 644 +17 0

			@@ -0,0 +1,17
		1	using System;
		2	using Implab.Components;
		3
		4	namespace Implab.ServiceHost.Test.Mock {
		5	public class BazFactory : IFactory<Baz> {
		6
		7	public Func<Guid> IdGenerator {
		8	get; set;
		9	}
		10
		11	Baz IFactory<Baz>.Create() {
		12	return new Baz {
		13	Id = IdGenerator?.Invoke() ?? Guid.Empty
		14	};
		15	}
		16	}
		17	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/BoxFactory`1.cs created 644 +13 0

			@@ -0,0 +1,13
		1	using System;
		2	using Implab.Components;
		3
		4	namespace Implab.ServiceHost.Test.Mock {
		5	public class BoxFactory<T> : IFactory<IBox<T>> {
		6	public IBox<T> Create() {
		7	return new Box<T> {
		8	Name = "Creepy sugar"
		9	};
		10	}
		11	}
		12
		13	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/Box`1.cs created 644 +13 0

			@@ -0,0 +1,13
		1	namespace Implab.ServiceHost.Test.Mock {
		2	public class Box<T> : IBox<T> {
		3
		4	public string Name { get; set; }
		5
		6	public T Value { get; set; }
		7
		8	public T GetBoxValue() {
		9	return Value;
		10	}
		11
		12	}
		13	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/GuidFactory.cs created 644 +10 0

			@@ -0,0 +1,10
		1	using System;
		2	using Implab.Components;
		3
		4	namespace Implab.ServiceHost.Test.Mock {
		5	public class GuidFactory : IFactory<Guid> {
		6	public Guid Create() {
		7	return Guid.NewGuid();
		8	}
		9	}
		10	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/IBox.cs created 644 +6 0

			@@ -0,0 +1,6
		1	namespace Implab.ServiceHost.Test.Mock {
		2	public interface IBox<T> {
		3	string Name { get; }
		4	T GetBoxValue();
		5	}
		6	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/Person.cs created 644 +20 0

			@@ -0,0 +1,20
		1	using System.Xml.Serialization;
		2
		3	namespace Implab.ServiceHost.Test.Mock
		4	{
		5	[XmlRoot(Namespace="urn:implab:test:model")]
		6	public class Person {
		7	public string FirstName { get; set; }
		8
		9	public string LastName { get; set; }
		10
		11	public int Age { get; set; }
		12
		13	[XmlIgnore]
		14	public bool AgeSpecified { get; set; }
		15
		16
		17	[XmlElement("Tag")]
		18	public string[] Tags { get; set; }
		19	}
		20	} No newline at end of file

0

Implab.ServiceHost.Test/src/Mock/SetOfBoxes`1.cs created 644 +21 0

			@@ -0,0 +1,21
		1	using System;
		2	using System.Linq;
		3
		4	namespace Implab.ServiceHost.Test.Mock {
		5	public class SetOfBoxes<T> {
		6
		7	public Guid Uuid { get; set; }
		8
		9	public IBox<T>[] Boxes {
		10	get; set;
		11	}
		12
		13	public void BoxValues(T[] items) {
		14	if (items == null \|\| items.Length == 0)
		15	return;
		16
		17	Boxes = items.Select(x => new Box<T> {Value = x}).ToArray();
		18	}
		19
		20	}
		21	} No newline at end of file

0

Implab.ServiceHost.Test/src/UnityConfigTest.cs created 644 +94 0

			@@ -0,0 +1,94
		1	using System;
		2	using System.Collections.Generic;
		3	using System.IO;
		4	using System.Linq;
		5	using System.Threading;
		6	using System.Threading.Tasks;
		7	using Implab.Components;
		8	using Implab.Diagnostics;
		9	using Implab.ServiceHost.Test.Mock;
		10	using Implab.ServiceHost.Unity;
		11	using Unity;
		12	using Xunit;
		13
		14	namespace Implab.Test {
		15
		16	public class UnityConfigTest {
		17
		18	[Fact]
		19	public void CreateContainer() {
		20	var container = new UnityContainer();
		21
		22	container.LoadXmlConfiguration(Path.Combine("data","container","empty.xml"));
		23	}
		24
		25	[Fact]
		26	public void SimpleServicesContainer() {
		27	var container = new UnityContainer();
		28
		29	container.LoadXmlConfiguration(Path.Combine("data","container","simple.services.xml"));
		30
		31	// named service registration
		32	var baz1 = container.Resolve<Baz>("Baz1");
		33
		34	Assert.Equal(new [] {1,2,3}, baz1.Numbers);
		35
		36	// default service registration
		37	var baz = container.Resolve<Baz>();
		38
		39	Assert.Equal(new [] {2,5,5,1,3}, baz.Nuts.Select(x => x.Size));
		40
		41	// ServiceFactory registered without a name
		42	// explicitly provides 'Baz2' service
		43	var baz2 = container.Resolve<Baz>("Baz2");
		44
		45	// ServiceFactory registered with name 'Baz3'
		46	// provides by default the service registration with same name
		47	var baz3 = container.Resolve<Baz>("Baz3");
		48
		49	// This factory uses GuidGenerator registration
		50	// to generate a new id value
		51	Assert.NotEqual(Guid.Empty, baz3.Id);
		52	}
		53
		54	[Fact]
		55	public void GenericServicesContainer() {
		56	var container = new UnityContainer();
		57	container.LoadXmlConfiguration(Path.Combine("data","container","generic.services.xml"));
		58
		59	// resolve using a generig interface mapping
		60	var box = container.Resolve<IBox<Baz.Nut>>();
		61
		62	Assert.NotNull(box.GetBoxValue());
		63
		64	// registered generic defines dependency of type {T}
		65	// in this case it should resolve to the default Nut with Size=2
		66	Assert.Equal(box.GetBoxValue().Size,2);
		67
		68	// generic factory which provides generic services
		69	var box2 = container.Resolve<IBox<Baz.Nut>>();
		70
		71	var set1 = container.Resolve<SetOfBoxes<Baz.Nut>>();
		72
		73	Assert.Equal(new int?[] {null,2,1}, set1.Boxes?.Select(x => x.GetBoxValue()?.Size));
		74	}
		75
		76	[Fact]
		77	public void SerializedInstances() {
		78	var container = new UnityContainer();
		79	container.LoadXmlConfiguration(Path.Combine("data","container","serialized.instances.xml"));
		80
		81	var p1 = container.Resolve<Person>("p1");
		82	var p2 = container.Resolve<Person>("p2");
		83
		84	Assert.Equal("Com", p1.FirstName);
		85	Assert.True(p1.AgeSpecified);
		86	Assert.Equal(99, p1.Age);
		87
		88	Assert.Equal("Javolta", p2.LastName);
		89	Assert.True(p2.AgeSpecified);
		90	Assert.Equal(88, p2.Age);
		91	}
		92
		93	}
		94	} No newline at end of file

0

.hgignore +2 0

              syntax: glob
              Implab.Test/bin/
              *.user
              Implab.Test/obj/
              *.userprefs
              Implab/bin/
              Implab/obj/
              TestResults/
              Implab.Fx/obj/
              Implab.Fx/bin/
              Implab.Fx.Test/bin/
              Implab.Fx.Test/obj/
              _ReSharper.Implab/
              Implab.Diagnostics.Interactive/bin/
              Implab.Diagnostics.Interactive/obj/
              MonoPlay/bin/
              MonoPlay/obj/
              Implab.Test/Implab.Format.Test/bin/
              Implab.Test/Implab.Format.Test/obj/
              *.suo
              Implab.Format.Test/bin/
              Implab.Format.Test/obj/
              packages/
              Implab.Playground/obj/
              Implab.Playground/bin/
              Implab.ServiceHost/bin/
              Implab.ServiceHost/obj/
+             Implab.ServiceHost.Test/bin/
+             Implab.ServiceHost.Test/obj/

0

Implab.ServiceHost/src/Unity/AbstractContainerItem.cs ~~Implab.ServiceHost/Unity/AbstractContainerItem.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/AbstractContainerItem.cs to Implab.ServiceHost/src/Unity/AbstractContainerItem.cs

0

Implab.ServiceHost/src/Unity/AbstractInjectionParameter.cs ~~Implab.ServiceHost/Unity/AbstractInjectionParameter.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/AbstractInjectionParameter.cs to Implab.ServiceHost/src/Unity/AbstractInjectionParameter.cs

0

Implab.ServiceHost/src/Unity/AbstractMemberInjection.cs ~~Implab.ServiceHost/Unity/AbstractMemberInjection.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/AbstractMemberInjection.cs to Implab.ServiceHost/src/Unity/AbstractMemberInjection.cs

0

Implab.ServiceHost/src/Unity/AbstractRegistration.cs ~~Implab.ServiceHost/Unity/AbstractRegistration.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/AbstractRegistration.cs to Implab.ServiceHost/src/Unity/AbstractRegistration.cs

0

Implab.ServiceHost/src/Unity/ArrayParameterElement.cs ~~Implab.ServiceHost/Unity/ArrayParameterElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ArrayParameterElement.cs to Implab.ServiceHost/src/Unity/ArrayParameterElement.cs

0

Implab.ServiceHost/src/Unity/ArrayTypeReference.cs ~~Implab.ServiceHost/Unity/ArrayTypeReference.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ArrayTypeReference.cs to Implab.ServiceHost/src/Unity/ArrayTypeReference.cs

0

Implab.ServiceHost/src/Unity/AssemblyElement.cs ~~Implab.ServiceHost/Unity/AssemblyElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/AssemblyElement.cs to Implab.ServiceHost/src/Unity/AssemblyElement.cs

0

Implab.ServiceHost/src/Unity/ConstructorInjectionElement.cs ~~Implab.ServiceHost/Unity/ConstructorInjectionElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ConstructorInjectionElement.cs to Implab.ServiceHost/src/Unity/ConstructorInjectionElement.cs

0

Implab.ServiceHost/src/Unity/ContainerBuilder.cs ~~Implab.ServiceHost/Unity/ContainerBuilder.cs~~ renamed +13 -2

              using System;
              using System.IO;
              using System.Reflection;
              using Implab.Diagnostics;
              using Unity;
              namespace Implab.ServiceHost.Unity {
                  using Log = Trace<ContainerBuilder>;
                  public class ContainerBuilder {
                      readonly TypeResolver m_resolver;
                      readonly IUnityContainer m_container;
                      readonly ContainerConfigurationSchema m_schema;
                      Uri m_location;
                      public IUnityContainer Container {
                          get {
                              return m_container;
                          }
                      }
                      public ContainerBuilder() : this(null, null) {
                      }
                      public ContainerBuilder(IUnityContainer container, ContainerConfigurationSchema schema) {
                          m_container = container ?? new UnityContainer();
                          m_resolver = new TypeResolver();
                          m_schema = schema ?? ContainerConfigurationSchema.Default;
                      }
                      public Type ResolveType(string typeReference) {
                          var resolved = string.IsNullOrEmpty(typeReference) ? null : m_resolver.Resolve(typeReference, true);
                          Log.Debug("ResolveType('{0}'): {1}", typeReference, resolved?.FullName);
                          return resolved;
                      }
                      public void Visit(ITypeRegistration registration) {
                          Safe.ArgumentNotNull(registration, nameof(registration));
                          var registrationType = registration.GetRegistrationType(this);
                          var implementationType = registration.GetImplementationType(this) ?? registrationType;
                          if (registrationType == null)
                              throw new Exception($"A type must be specified for the registration {registration.Name}");
                          var builder = new TypeRegistrationBuilder(
                              m_resolver,
                              registrationType,
-                             implementationType
+                             implementationType,
+                             this
                          );
                          builder.Lifetime = registration.GetLifetime(this);
                          if (registration.MemberInjections != null) {
                              foreach(var member in registration.MemberInjections)
                                  member.Visit(builder);
                          }
                          m_container.RegisterType(
                              builder.RegistrationType,
                              builder.ImplementationType,
                              registration.Name,
                              builder.Lifetime,
                              builder.Injections
                          );
                      }
                      public void Visit(IInstanceRegistration registration) {
                          Safe.ArgumentNotNull(registration, nameof(registration));
                          var registrationType = registration.GetRegistrationType(this);
                          var builder = new InstanceRegistrationBuilder (
                              m_resolver,
-                             registrationType
+                             registrationType,
+                             this
                          );
                          builder.Lifetime = registration.GetLifetime(this);
                          if (registration.MemberInjections != null) {
                              foreach(var member in registration.MemberInjections)
                                  member.Visit(builder.ValueBuilder);
                          }
                          if (builder.RegistrationType == null && builder.ValueBuilder.ValueType == null)
                              throw new Exception($"A type must be specified for the registration {registration.Name}");
                          m_container.RegisterInstance(
                              builder.RegistrationType ?? builder.ValueBuilder.ValueType,
                              registration.Name,
                              builder.ValueBuilder.Value,
                              builder.Lifetime
                          );
                      }
                      public void AddNamespace(string ns) {
                          m_resolver.AddNamespace(ns);
                      }
                      public void AddAssembly(string assembly) {
                      }
                      /// <summary>
                      /// Includes the confguration. Creates a new <see cref="ContainerBuilder"/>,
                      /// and loads the configuration to it. The created builder will share the
                      /// container and will have its own isolated type resolver.
                      /// </summary>
                      /// <param name="file">A path to configuration relative to the current configuration.</param>
                      public void Include(string file) {
                          var includeContext = new ContainerBuilder(m_container, m_schema);
                          if (m_location != null) {
                              var uri =  new Uri(m_location, file);
                              includeContext.LoadConfig(uri);
                          } else {
                              includeContext.LoadConfig(file);
                          }
                      }
                      /// <summary>
+                     /// Resolves a path ralatively to the current container configuration location.
+                     /// </summary>
+                     /// <param name="location">A path yto resolve</param>
+                     /// <returns>Resolved Uri fot the specified location</returns>
+                     public Uri MakeLocationUri(string location) {
+                         return m_location != null ? new Uri(m_location, location) : new Uri(location);
+                     }
+                     /// <summary>
                      /// Loads a configuration from the specified local file.
                      /// </summary>
                      /// <param name="file">The path to the configuration file.</param>
                      public void LoadConfig(string file) {
                          Safe.ArgumentNotEmpty(file, nameof(file));
                          LoadConfig(new Uri(Path.GetFullPath(file)));
                      }
                      public void LoadConfig(Uri location) {
                          Safe.ArgumentNotNull(location, nameof(location));
                          m_location = location;
                          var config = m_schema.LoadConfig(location.ToString());
                          config.Visit(this);
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/ContainerConfigurationSchema.cs ~~Implab.ServiceHost/Unity/ContainerConfigurationSchema.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ContainerConfigurationSchema.cs to Implab.ServiceHost/src/Unity/ContainerConfigurationSchema.cs

0

Implab.ServiceHost/src/Unity/ContainerElement.cs ~~Implab.ServiceHost/Unity/ContainerElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ContainerElement.cs to Implab.ServiceHost/src/Unity/ContainerElement.cs

0

Implab.ServiceHost/src/Unity/ContainerLifetimeElement.cs ~~Implab.ServiceHost/Unity/ContainerLifetimeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ContainerLifetimeElement.cs to Implab.ServiceHost/src/Unity/ContainerLifetimeElement.cs

0

Implab.ServiceHost/src/Unity/ContextLifetimeElement.cs ~~Implab.ServiceHost/Unity/ContextLifetimeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ContextLifetimeElement.cs to Implab.ServiceHost/src/Unity/ContextLifetimeElement.cs

0

Implab.ServiceHost/src/Unity/DefaultParameterElement.cs ~~Implab.ServiceHost/Unity/DefaultParameterElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/DefaultParameterElement.cs to Implab.ServiceHost/src/Unity/DefaultParameterElement.cs

0

Implab.ServiceHost/src/Unity/DependencyParameterElement.cs ~~Implab.ServiceHost/Unity/DependencyParameterElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/DependencyParameterElement.cs to Implab.ServiceHost/src/Unity/DependencyParameterElement.cs

0

Implab.ServiceHost/src/Unity/FactoryActivator.cs ~~Implab.ServiceHost/Unity/FactoryActivator.cs~~ renamed +15 0

              using System;
              using System.Collections.Generic;
              using System.Reflection;
              using Implab.Components;
              using Unity;
              using Unity.Injection;
              using Unity.Lifetime;
              namespace Implab.ServiceHost.Unity {
                  public class FactoryActivator : ITypeRegistration {
                      class FactoryInjector : ITypeMemberInjection {
                          public InjectionFactory Factory { get; set; }
                          public void Visit(TypeRegistrationBuilder builder) {
                              builder.AddInjectionMember(Factory);
                          }
                      }
                      public Type FactoryType { get; set; }
                      public string FactoryName { get; set; }
                      public Type RegistrationType { get; set; }
                      public LifetimeManager Lifetime { get; set; }
                      public IEnumerable<ITypeMemberInjection> MemberInjections {
                          get {
+                             if (RegistrationType == null)
+                                 throw new Exception($"RegistrationType must be specified");
+                             if (!typeof(IFactory<>).MakeGenericType(RegistrationType).IsAssignableFrom(FactoryType))
+                                 throw new Exception($"The factory {FactoryType} can't be used to create {RegistrationType} instances");
+                             if (FactoryType.ContainsGenericParameters) {
+                                 yield return new FactoryInjector {
+                                     Factory = CreateDynamicInjectionFactory(FactoryName)
+                                 };
+                             } else {
                              yield return new FactoryInjector {
                                  Factory = (InjectionFactory)GetType()
                                      .GetMethod(nameof(CreateInjectionFactory), BindingFlags.Static | BindingFlags.NonPublic)
                                      .MakeGenericMethod(FactoryType, RegistrationType)
                                      .Invoke(null, new [] { FactoryName })
                              };
                          }
                      }
+                     }
                      public string Name { get; set; }
                      public Type GetRegistrationType(ContainerBuilder builder) {
                          return RegistrationType;
                      }
                      public LifetimeManager GetLifetime(ContainerBuilder builder) {
                          return Lifetime;
                      }
                      public Type GetImplementationType(ContainerBuilder builder) {
                          return null;
                      }
                      /// <summary>
                      /// Указывает зависимость, реализующую интерфейс <see cref="IFactory{TObj}"/>,
                      /// которая будет использоваться в качестве фабрики для создания объектов
                      /// </summary>
                      /// <param name="dependencyName"></param>
                      static InjectionFactory CreateInjectionFactory<TFac, TObj>(string dependencyName) where TFac : IFactory<TObj> {
                          return new InjectionFactory(c => c.Resolve<TFac>(dependencyName).Create());
                      }
+                     static InjectionFactory CreateDynamicInjectionFactory(string dependencyName) {
+                         return new InjectionFactory((c,t,name) => ((IFactory<object>)c.Resolve(t, dependencyName)).Create());
+                     }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/FactoryElement.cs ~~Implab.ServiceHost/Unity/FactoryElement.cs~~ renamed +1 -1

              using System;
              using System.Xml.Serialization;
              using Implab.Components;
              namespace Implab.ServiceHost.Unity {
                  /// <summary>
                  /// Расширяет стандартную регистрацию типа до фабрики, вместе с регистрацией
                  /// самой фабрики создаются регистрации сервисов, которые она предоставляет.
                  /// </summary>
                  public class FactoryElement : RegisterElement, ITypeRegistration {
                      /// <summary>
                      /// Записи о сервисах, которые создаются данной фабрикой.
                      /// </summary>
                      /// <remarks>
                      /// Сервисы, которые указаны в регистарциях они должны соответсвовать тому,
                      /// что фабрика возвращает, но это остается на откуп контейнера
                      /// </remarks>
                      [XmlElement("provides")]
                      public ProvidesElement[] Provides { get; set; }
                      /// <summary>
                      /// Переопределяет стандарное поведение регистрации типа в контейнере,
                      /// дополняя его регистрацией фабричных методов для получения типов.
                      /// </summary>
                      /// <param name="builder">Объект для конфигурирования контейнера.</param>
                      public override void Visit(ContainerBuilder builder) {
                          var factoryType = GetRegistrationType(builder.ResolveType);
                          base.Visit(builder);
                          if (Provides != null && Provides.Length > 0) {
                              // если регистрации явно заданы, используеися информация из них
                              foreach(var item in Provides) {
                                  var activator = new FactoryActivator {
                                      Name = item.RegistrationName,
                                      RegistrationType = builder.ResolveType(item.RegistrationType),
                                      FactoryName = Name,
                                      FactoryType = factoryType,
-                                     Lifetime = item.Lifetime.GetLifetime(builder)
+                                     Lifetime = item.Lifetime?.GetLifetime(builder)
                                  };
                                  builder.Visit(activator);
                              }
                          } else {
                              // если регистрация явно не задана, в качестве сервиса для регистрации
                              // используется тип создаваемый фабрикой, который будет добавлен в контейнер
                              // с темже именем, что и сама фабрика (разные типы могут иметь одно имя для регистрации)
                              var providedType = (
                                      factoryType.IsGenericType && factoryType.GetGenericTypeDefinition() == typeof(IFactory<>) ?
                                      factoryType :
                                      factoryType.GetInterface(typeof(IFactory<>).FullName)
                                  )?
                                  .GetGenericArguments()[0];
                              // не удалось определеить тип
                              if (providedType == null)
                                  throw new ArgumentException("Failed to determine a type provided by the factory");
                              if (providedType.IsGenericParameter)
                                  throw new ArgumentException("Can't register a generic type paramter as a service");
                              var activator = new FactoryActivator {
                                  Name = Name,
                                  RegistrationType = providedType,
                                  FactoryName = Name,
                                  FactoryType = factoryType
                              };
                              builder.Visit(activator);
                          }
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/HierarchicalLifetimeElement.cs ~~Implab.ServiceHost/Unity/HierarchicalLifetimeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/HierarchicalLifetimeElement.cs to Implab.ServiceHost/src/Unity/HierarchicalLifetimeElement.cs

0

Implab.ServiceHost/src/Unity/IInjectionParameter.cs ~~Implab.ServiceHost/Unity/IInjectionParameter.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/IInjectionParameter.cs to Implab.ServiceHost/src/Unity/IInjectionParameter.cs

0

Implab.ServiceHost/src/Unity/IInstanceRegistration.cs ~~Implab.ServiceHost/Unity/IInstanceRegistration.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/IInstanceRegistration.cs to Implab.ServiceHost/src/Unity/IInstanceRegistration.cs

0

Implab.ServiceHost/src/Unity/IRegistration.cs ~~Implab.ServiceHost/Unity/IRegistration.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/IRegistration.cs to Implab.ServiceHost/src/Unity/IRegistration.cs

0

Implab.ServiceHost/src/Unity/ITypeMemberInjection.cs ~~Implab.ServiceHost/Unity/ITypeMemberInjection.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ITypeMemberInjection.cs to Implab.ServiceHost/src/Unity/ITypeMemberInjection.cs

0

Implab.ServiceHost/src/Unity/ITypeRegistration.cs ~~Implab.ServiceHost/Unity/ITypeRegistration.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ITypeRegistration.cs to Implab.ServiceHost/src/Unity/ITypeRegistration.cs

0

Implab.ServiceHost/src/Unity/IncludeElement.cs ~~Implab.ServiceHost/Unity/IncludeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/IncludeElement.cs to Implab.ServiceHost/src/Unity/IncludeElement.cs

0

Implab.ServiceHost/src/Unity/InjectionValueBuilder.cs ~~Implab.ServiceHost/Unity/InjectionValueBuilder.cs~~ renamed +12 -7

              using System;
              using System.Collections;
              using System.Collections.Generic;
              using System.ComponentModel;
              using System.Linq;
              using System.Xml.Serialization;
              using Unity.Injection;
              namespace Implab.ServiceHost.Unity {
                  public class InjectionParameterBuilder {
                      readonly TypeResolver m_resolver;
                      public Type DefaultType { get; private set; }
                      public Type ValueType { get; private set; }
+                     public ContainerBuilder Root { get; private set; }
                      object m_value;
                      public object Value {
                          get {
                              if (!ValueSpecified)
                                  throw new InvalidOperationException("The regular value must be set (dependency or array are not situable in this context)");
                              return m_value;
                          }
                      }
                      public bool ValueSpecified { get; private set; }
                      InjectionParameterValue m_injection;
                      public InjectionParameterValue Injection {
                          get {
                              if (m_injection == null)
                                  throw new InvalidOperationException("The injection parameter is not specified");
                              return m_injection;
                          }
                      }
                      public bool InjectionSpecified {
                          get { return m_injection != null; }
                      }
-                     internal InjectionParameterBuilder(TypeResolver resolver, Type defaultType) {
+                     internal InjectionParameterBuilder(TypeResolver resolver, Type defaultType, ContainerBuilder root) {
                          m_resolver = resolver;
                          DefaultType = defaultType;
+                         Root = root;
                      }
                      public Type ResolveInjectedValueType(string typeSpec) {
                          if (string.IsNullOrEmpty(typeSpec)) {
                              if (DefaultType == null)
                                  throw new Exception("The type must be specified");
                              return DefaultType;
                          }
                          return m_resolver.Resolve(typeSpec, true);
                      }
                      public Type ResolveType(string typeSpec) {
                          return string.IsNullOrEmpty(typeSpec) ? null : m_resolver.Resolve(typeSpec, true);
                      }
                      public void SetValue(Type type, object value) {
                          Safe.ArgumentNotNull(type, nameof(type));
                          ValueType = type;
                          m_value = value;
                          ValueSpecified = true;
                          m_injection = new InjectionParameter(type, value);
                      }
                      public void SetDependency(Type type, string name, bool optional) {
                          Safe.ArgumentNotNull(type, nameof(type));
                          ValueType = type;
                          ValueSpecified = false;
                          m_value = null;
-                         m_injection = optional ? (InjectionParameterValue)new OptionalParameter(type, name) : new ResolvedParameter(type, name);
+                         m_injection = optional ?
+                             type.IsGenericParameter ?
+                                 new OptionalGenericParameter(type.Name, name)
+                                 : (InjectionParameterValue)new OptionalParameter(type, name)
+                             : new ResolvedParameter(type, name);
                      }
                      internal void Visit(ArrayParameterElement arrayParameter) {
                          Type itemsType = null;
                          var arrayType = string.IsNullOrEmpty(arrayParameter.TypeName) ? null : ResolveType(arrayParameter.TypeName);
                          if (arrayType == null)
                              arrayType = DefaultType;
                          if (!string.IsNullOrEmpty(arrayParameter.ItemsType)) {
                              itemsType = ResolveType(arrayParameter.ItemsType);
                              arrayType = itemsType.MakeArrayType();
                          } else {
                              itemsType = GetItemsType(arrayType);
                          }
                          if (itemsType == null)
                              throw new Exception("Failed to determine array elements type");
                          InjectionParameterValue[] injections = (arrayParameter.Items ?? new AbstractInjectionParameter[0])
                              .Select(x => {
-                                 var builder = new InjectionParameterBuilder(m_resolver, itemsType);
+                                 var builder = new InjectionParameterBuilder(m_resolver, itemsType, Root);
                                  x.Visit(builder);
                                  return builder.Injection;
                              })
                              .ToArray();
-                         var array = itemsType.IsGenericParameter ?
+                         m_injection = itemsType.IsGenericParameter ?
                              (InjectionParameterValue)new GenericResolvedArrayParameter(itemsType.Name, injections) :
                              new ResolvedArrayParameter(itemsType, injections);
                          ValueType = arrayType;
                          m_value = null;
                          ValueSpecified = false;
-                         m_injection = array;
                      }
                      Type GetItemsType(Type collectionType) {
                          if (collectionType == null)
                              return null;
                          Type itemsType = null;
-                         if (collectionType.GetGenericTypeDefinition() == typeof(IEnumerable<>)) {
+                         if (collectionType.IsGenericType && collectionType.GetGenericTypeDefinition() == typeof(IEnumerable<>)) {
                              itemsType = collectionType.GetGenericArguments()[0];
                          } else if (collectionType == typeof(IEnumerable)) {
                              itemsType = typeof(object);
                          } else {
                              itemsType = collectionType.GetInterface(typeof(IEnumerable<>).FullName)?.GetGenericArguments()[0];
                          }
                          return itemsType;
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/InstanceRegistrationBuilder.cs ~~Implab.ServiceHost/Unity/InstanceRegistrationBuilder.cs~~ renamed +2 -2

              using System;
              namespace Implab.ServiceHost.Unity
              {
                  public class InstanceRegistrationBuilder : RegistrationBuilder {
                      public InjectionParameterBuilder ValueBuilder { get; private set; }
-                     internal InstanceRegistrationBuilder(TypeResolver typeResolver, Type registrationType) : base(registrationType) {
-                         ValueBuilder = new InjectionParameterBuilder(typeResolver, registrationType);
+                     internal InstanceRegistrationBuilder(TypeResolver typeResolver, Type registrationType, ContainerBuilder root) : base(registrationType, root) {
+                         ValueBuilder = new InjectionParameterBuilder(typeResolver, registrationType, root);
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/LifetimeElement.cs ~~Implab.ServiceHost/Unity/LifetimeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/LifetimeElement.cs to Implab.ServiceHost/src/Unity/LifetimeElement.cs

0

Implab.ServiceHost/src/Unity/MethodInjectionElement.cs ~~Implab.ServiceHost/Unity/MethodInjectionElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/MethodInjectionElement.cs to Implab.ServiceHost/src/Unity/MethodInjectionElement.cs

0

Implab.ServiceHost/src/Unity/NamespaceElement.cs ~~Implab.ServiceHost/Unity/NamespaceElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/NamespaceElement.cs to Implab.ServiceHost/src/Unity/NamespaceElement.cs

0

Implab.ServiceHost/src/Unity/NestedTypeReference.cs ~~Implab.ServiceHost/Unity/NestedTypeReference.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/NestedTypeReference.cs to Implab.ServiceHost/src/Unity/NestedTypeReference.cs

0

Implab.ServiceHost/src/Unity/PropertyInjectionElement.cs ~~Implab.ServiceHost/Unity/PropertyInjectionElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/PropertyInjectionElement.cs to Implab.ServiceHost/src/Unity/PropertyInjectionElement.cs

0

Implab.ServiceHost/src/Unity/ProvidesElement.cs ~~Implab.ServiceHost/Unity/ProvidesElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ProvidesElement.cs to Implab.ServiceHost/src/Unity/ProvidesElement.cs

0

Implab.ServiceHost/src/Unity/RegisterElement.cs ~~Implab.ServiceHost/Unity/RegisterElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/RegisterElement.cs to Implab.ServiceHost/src/Unity/RegisterElement.cs

0

Implab.ServiceHost/src/Unity/RegistrationBuilder.cs ~~Implab.ServiceHost/Unity/RegistrationBuilder.cs~~ renamed +6 -1

              using System;
              using System.Collections.Generic;
              using System.ComponentModel;
              using System.Linq;
              using System.Xml.Serialization;
              using Implab.Xml;
              using Unity.Injection;
              using Unity.Lifetime;
              using Unity.Registration;
              namespace Implab.ServiceHost.Unity {
                  /// <summary>
                  /// Базовый класс для формирования записей в контейнере, созволяет указать время жизни для записи
                  /// </summary>
                  public abstract class RegistrationBuilder {
+                     public ContainerBuilder Root {
+                         get; private set;
+                     }
                      public Type RegistrationType {
                          get;
                          private set;
                      }
                      internal LifetimeManager Lifetime { get; set; }
-                     protected RegistrationBuilder(Type registrationType) {
+                     protected RegistrationBuilder(Type registrationType, ContainerBuilder root) {
+                         Root = root;
                          RegistrationType = registrationType;
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/RootTypeReference.cs ~~Implab.ServiceHost/Unity/RootTypeReference.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/RootTypeReference.cs to Implab.ServiceHost/src/Unity/RootTypeReference.cs

0

Implab.ServiceHost/src/Unity/Schema.cs ~~Implab.ServiceHost/Unity/Schema.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/Schema.cs to Implab.ServiceHost/src/Unity/Schema.cs

0

Implab.ServiceHost/src/Unity/SerializedElement.cs ~~Implab.ServiceHost/Unity/SerializedElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/SerializedElement.cs to Implab.ServiceHost/src/Unity/SerializedElement.cs

0

Implab.ServiceHost/src/Unity/SerializedParameterElement.cs ~~Implab.ServiceHost/Unity/SerializedParameterElement.cs~~ renamed +3 -3

              using System;
              using System.Xml;
              using System.Xml.Schema;
              using System.Xml.Serialization;
              namespace Implab.ServiceHost.Unity
              {
                  public class SerializedParameterElement : AbstractInjectionParameter {
                      [XmlAttribute("href")]
                      public string Location { get; set; }
                      [XmlAnyElement]
                      public XmlElement[] Content { get; set; }
-                     public XmlReader GetReader() {
+                     public XmlReader GetReader(InjectionParameterBuilder builder) {
                          if (!string.IsNullOrEmpty(Location))
-                             return XmlReader.Create(Location);
+                             return XmlReader.Create(builder.Root.MakeLocationUri(Location).ToString());
                          if (Content != null && Content.Length > 0)
                              return Content[0].CreateNavigator().ReadSubtree();
                          throw new Exception("No content found, expected XML document");
                      }
                      public override void Visit(InjectionParameterBuilder builder) {
                          var type = builder.ResolveInjectedValueType(TypeName);
                          var serializer = new XmlSerializer(type);
-                         using(var reader = GetReader())
+                         using(var reader = GetReader(builder))
                              builder.SetValue(type, serializer.Deserialize(reader));
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/SingletonLifetimeElement.cs ~~Implab.ServiceHost/Unity/SingletonLifetimeElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/SingletonLifetimeElement.cs to Implab.ServiceHost/src/Unity/SingletonLifetimeElement.cs

0

Implab.ServiceHost/src/Unity/SpecializedTypeReference.cs ~~Implab.ServiceHost/Unity/SpecializedTypeReference.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/SpecializedTypeReference.cs to Implab.ServiceHost/src/Unity/SpecializedTypeReference.cs

0

Implab.ServiceHost/src/Unity/TypeReference.cs ~~Implab.ServiceHost/Unity/TypeReference.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/TypeReference.cs to Implab.ServiceHost/src/Unity/TypeReference.cs

0

Implab.ServiceHost/src/Unity/TypeReferenceParser.cs ~~Implab.ServiceHost/Unity/TypeReferenceParser.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/TypeReferenceParser.cs to Implab.ServiceHost/src/Unity/TypeReferenceParser.cs

0

Implab.ServiceHost/src/Unity/TypeRegistrationBuilder.cs ~~Implab.ServiceHost/Unity/TypeRegistrationBuilder.cs~~ renamed +4 -4

              using System;
              using System.Collections.Generic;
              using System.Linq;
              using Unity.Injection;
              using Unity.Registration;
              namespace Implab.ServiceHost.Unity {
                  public class TypeRegistrationBuilder : RegistrationBuilder {
                      readonly TypeResolver m_resolver;
                      readonly List<InjectionMember> m_injections = new List<InjectionMember>();
                      internal InjectionMember[] Injections { get { return m_injections.ToArray(); } }
                      public Type ImplementationType {
                          get;
                          private set;
                      }
-                     internal TypeRegistrationBuilder(TypeResolver resolver, Type registrationType, Type implementationType) : base(registrationType) {
+                     internal TypeRegistrationBuilder(TypeResolver resolver, Type registrationType, Type implementationType, ContainerBuilder root) : base(registrationType, root) {
                          ImplementationType = implementationType;
                          // when registering a generic mapping, register all generic parameter names as local types
                          if (ImplementationType.IsGenericTypeDefinition) {
                              m_resolver = new TypeResolver(resolver);
                              foreach (var p in ImplementationType.GetGenericArguments())
                                  m_resolver.AddMapping(p.Name, p);
                          } else {
                              m_resolver = resolver;
                          }
                      }
                      internal void Visit(ConstructorInjectionElement constructorInjection) {
                          var parameters = constructorInjection.Parameters?
                              .Select(x => {
-                                 var valueBuilder = new InjectionParameterBuilder(m_resolver, null);
+                                 var valueBuilder = new InjectionParameterBuilder(m_resolver, null, Root);
                                  x.Visit(valueBuilder);
                                  return valueBuilder.Injection;
                              })
                              .ToArray();
                          var injection = parameters != null ? new InjectionConstructor(parameters) : new InjectionConstructor();
                          m_injections.Add(injection);
                      }
                      internal void Visit(MethodInjectionElement methodInjection) {
                          var parameters = methodInjection.Parameters?
                              .Select(x => {
-                                 var valueBuilder = new InjectionParameterBuilder(m_resolver, null);
+                                 var valueBuilder = new InjectionParameterBuilder(m_resolver, null, Root);
                                  x.Visit(valueBuilder);
                                  return valueBuilder.Injection;
                              })
                              .ToArray();
                          var injection = parameters != null ? new InjectionMethod(methodInjection.Name, parameters) : new InjectionMethod(methodInjection.Name);
                          m_injections.Add(injection);
                      }
                      internal void Visit(PropertyInjectionElement propertyInjection) {
                          if (propertyInjection.Value == null)
                              throw new Exception($"A value value must be specified for the property '{propertyInjection.Name}'");
                          var propertyType = ImplementationType.GetProperty(propertyInjection.Name)?.PropertyType;
-                         var valueContext = new InjectionParameterBuilder(m_resolver, propertyType);
+                         var valueContext = new InjectionParameterBuilder(m_resolver, propertyType, Root);
                          propertyInjection.Value.Visit(valueContext);
                          var injection = new InjectionProperty(propertyInjection.Name, valueContext.Injection);
                          m_injections.Add(injection);
                      }
                      public void AddInjectionMember(InjectionMember injection) {
                          Safe.ArgumentNotNull(injection, nameof(injection));
                          m_injections.Add(injection);
                      }
                  }
              }
  No newline at end of file

0

Implab.ServiceHost/src/Unity/TypeResolutionContext.cs ~~Implab.ServiceHost/Unity/TypeResolutionContext.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/TypeResolutionContext.cs to Implab.ServiceHost/src/Unity/TypeResolutionContext.cs

0

Implab.ServiceHost/src/Unity/TypeResolver.cs ~~Implab.ServiceHost/Unity/TypeResolver.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/TypeResolver.cs to Implab.ServiceHost/src/Unity/TypeResolver.cs

0

Implab.ServiceHost/src/Unity/UnityContainerExtensions.cs ~~Implab.ServiceHost/Unity/UnityContainerExtensions.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/UnityContainerExtensions.cs to Implab.ServiceHost/src/Unity/UnityContainerExtensions.cs

0

Implab.ServiceHost/src/Unity/ValueElement.cs ~~Implab.ServiceHost/Unity/ValueElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ValueElement.cs to Implab.ServiceHost/src/Unity/ValueElement.cs

0

Implab.ServiceHost/src/Unity/ValueParameterElement.cs ~~Implab.ServiceHost/Unity/ValueParameterElement.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.ServiceHost/Unity/ValueParameterElement.cs to Implab.ServiceHost/src/Unity/ValueParameterElement.cs

0

Implab.Test/src/DiagnosticsTest.cs ~~Implab.Test/DiagnosticsTest.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/DiagnosticsTest.cs to Implab.Test/src/DiagnosticsTest.cs

0

Implab.Test/src/JsonTests.cs ~~Implab.Test/JsonTests.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/JsonTests.cs to Implab.Test/src/JsonTests.cs

0

Implab.Test/src/MockPollComponent.cs ~~Implab.Test/MockPollComponent.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/MockPollComponent.cs to Implab.Test/src/MockPollComponent.cs

0

Implab.Test/src/Model/Person.cs ~~Implab.Test/Model/Person.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/Model/Person.cs to Implab.Test/src/Model/Person.cs

0

Implab.Test/src/PromiseHelper.cs ~~Implab.Test/PromiseHelper.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/PromiseHelper.cs to Implab.Test/src/PromiseHelper.cs

0

Implab.Test/src/RunnableComponentTests.cs ~~Implab.Test/RunnableComponentTests.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab.Test/RunnableComponentTests.cs to Implab.Test/src/RunnableComponentTests.cs

0

Implab.sln +14 0

              Microsoft Visual Studio Solution File, Format Version 12.00
              # Visual Studio 15
              VisualStudioVersion = 15.0.27428.2005
              MinimumVisualStudioVersion = 10.0.40219.1
              Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implab", "Implab\Implab.csproj", "{FF2052B6-9C8F-4022-A347-F07ABF635885}"
              EndProject
              Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Implab.Test", "Implab.Test\Implab.Test.csproj", "{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}"
              EndProject
              Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Playground", "Implab.Playground\Implab.Playground.csproj", "{100DFEB0-75BE-436F-ADDF-1F46EF433F46}"
              EndProject
              Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.ServiceHost", "Implab.ServiceHost\Implab.ServiceHost.csproj", "{8B79FCBE-50DD-40A0-9B5E-E572072E4868}"
              EndProject
+             Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.ServiceHost.Test", "Implab.ServiceHost.Test\Implab.ServiceHost.Test.csproj", "{CB844F94-E555-4F25-A932-7CB85C98CF86}"
+             EndProject
              Global
              	GlobalSection(SolutionConfigurationPlatforms) = preSolution
              		Debug|Any CPU = Debug|Any CPU
              		Release|Any CPU = Release|Any CPU
              		Debug|x64 = Debug|x64
              		Debug|x86 = Debug|x86
              		Release|x64 = Release|x64
              		Release|x86 = Release|x86
              	EndGlobalSection
              	GlobalSection(ProjectConfigurationPlatforms) = postSolution
              		{FF2052B6-9C8F-4022-A347-F07ABF635885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
              		{FF2052B6-9C8F-4022-A347-F07ABF635885}.Debug|Any CPU.Build.0 = Debug|Any CPU
              		{FF2052B6-9C8F-4022-A347-F07ABF635885}.Release|Any CPU.ActiveCfg = Release|Any CPU
              		{FF2052B6-9C8F-4022-A347-F07ABF635885}.Release|Any CPU.Build.0 = Release|Any CPU
              		{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
              		{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Debug|Any CPU.Build.0 = Debug|Any CPU
              		{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Release|Any CPU.ActiveCfg = Release|Any CPU
              		{6CD0DA18-8D9B-4AA8-A3DC-17322E27335E}.Release|Any CPU.Build.0 = Release|Any CPU
              		{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
              		{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
              		{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
              		{100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release|Any CPU.Build.0 = Release|Any CPU
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|Any CPU.Build.0 = Debug|Any CPU
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|x64.ActiveCfg = Debug|x64
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|x64.Build.0 = Debug|x64
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|x86.ActiveCfg = Debug|x86
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Debug|x86.Build.0 = Debug|x86
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|Any CPU.ActiveCfg = Release|Any CPU
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|Any CPU.Build.0 = Release|Any CPU
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|x64.ActiveCfg = Release|x64
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|x64.Build.0 = Release|x64
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|x86.ActiveCfg = Release|x86
              		{8B79FCBE-50DD-40A0-9B5E-E572072E4868}.Release|x86.Build.0 = Release|x86
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|x64.ActiveCfg = Debug|x64
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|x64.Build.0 = Debug|x64
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|x86.ActiveCfg = Debug|x86
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Debug|x86.Build.0 = Debug|x86
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|Any CPU.Build.0 = Release|Any CPU
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|x64.ActiveCfg = Release|x64
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|x64.Build.0 = Release|x64
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|x86.ActiveCfg = Release|x86
+             		{CB844F94-E555-4F25-A932-7CB85C98CF86}.Release|x86.Build.0 = Release|x86
              	EndGlobalSection
              	GlobalSection(SolutionProperties) = preSolution
              		HideSolutionNode = FALSE
              	EndGlobalSection
              	GlobalSection(ExtensibilityGlobals) = postSolution
              		SolutionGuid = {36D837FC-4CDD-4AEA-87BF-F130FEB22E02}
              	EndGlobalSection
              EndGlobal

0

Implab/Implab.csproj +1 -1

              <Project Sdk="Microsoft.NET.Sdk">
                <PropertyGroup>
                  <Authors>Sergey Smirnov</Authors>
                  <Title>Implab library</Title>
                  <Description>Provides some helper clesses like XML serialization helpers, JSON XML reader,
                  JSON pull-parser, ECMA-style promises, lightweight synchonization routines Signal
                  and SharedLock, Trace helpers on top of System.Diagnostics, ObjectPool etc.
                  </Description>
                  <Copyright>2012-2018 Sergey Smirnov</Copyright>
                  <Version>3.0.14</Version>
                  <PackageLicenseUrl>https://hg.implab.org/pub/ImplabNet/file/tip/Implab/license.txt</PackageLicenseUrl>
                  <PackageProjectUrl>https://implab.org</PackageProjectUrl>
                  <RepositoryUrl>https://hg.implab.org/pub/ImplabNet/</RepositoryUrl>
                  <RepositoryType>mercurial</RepositoryType>
                  <PackageTags>IMPLAB;Json pull-parser;Json Xml;async;diagnostics;serialization;</PackageTags>
                  <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
                  <FrameworkPathOverride Condition="'$(TargetFramework)'=='net46' and '$(OSTYPE)'=='linux'">/usr/lib/mono/4.5/</FrameworkPathOverride>
                  <DefineConstants Condition="'$(TargetFramework)'=='net46'">NETFX_TRACE_BUG;$(DefineConstants)</DefineConstants>
                </PropertyGroup>
                <ItemGroup>
-                 <EmbeddedResource Include="Xml\json.xsl"/>
+                 <EmbeddedResource Include="src\Xml\json.xsl"/>
                </ItemGroup>
              </Project>

0

Implab/src/AbstractEvent.cs ~~Implab/AbstractEvent.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/AbstractEvent.cs to Implab/src/AbstractEvent.cs

0

Implab/src/Automaton/AutomatonConst.cs ~~Implab/Automaton/AutomatonConst.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/AutomatonConst.cs to Implab/src/Automaton/AutomatonConst.cs

0

Implab/src/Automaton/AutomatonTransition.cs ~~Implab/Automaton/AutomatonTransition.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/AutomatonTransition.cs to Implab/src/Automaton/AutomatonTransition.cs

0

Implab/src/Automaton/DFATable.cs ~~Implab/Automaton/DFATable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/DFATable.cs to Implab/src/Automaton/DFATable.cs

0

Implab/src/Automaton/IAlphabet.cs ~~Implab/Automaton/IAlphabet.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/IAlphabet.cs to Implab/src/Automaton/IAlphabet.cs

0

Implab/src/Automaton/IAlphabetBuilder.cs ~~Implab/Automaton/IAlphabetBuilder.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/IAlphabetBuilder.cs to Implab/src/Automaton/IAlphabetBuilder.cs

0

Implab/src/Automaton/IDFATable.cs ~~Implab/Automaton/IDFATable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/IDFATable.cs to Implab/src/Automaton/IDFATable.cs

0

Implab/src/Automaton/IDFATableBuilder.cs ~~Implab/Automaton/IDFATableBuilder.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/IDFATableBuilder.cs to Implab/src/Automaton/IDFATableBuilder.cs

0

Implab/src/Automaton/IndexedAlphabetBase.cs ~~Implab/Automaton/IndexedAlphabetBase.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/IndexedAlphabetBase.cs to Implab/src/Automaton/IndexedAlphabetBase.cs

0

Implab/src/Automaton/MapAlphabet.cs ~~Implab/Automaton/MapAlphabet.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/MapAlphabet.cs to Implab/src/Automaton/MapAlphabet.cs

0

Implab/src/Automaton/ParserException.cs ~~Implab/Automaton/ParserException.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/ParserException.cs to Implab/src/Automaton/ParserException.cs

0

Implab/src/Automaton/RegularExpressions/AltToken.cs ~~Implab/Automaton/RegularExpressions/AltToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/AltToken.cs to Implab/src/Automaton/RegularExpressions/AltToken.cs

0

Implab/src/Automaton/RegularExpressions/BinaryToken.cs ~~Implab/Automaton/RegularExpressions/BinaryToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/BinaryToken.cs to Implab/src/Automaton/RegularExpressions/BinaryToken.cs

0

Implab/src/Automaton/RegularExpressions/CatToken.cs ~~Implab/Automaton/RegularExpressions/CatToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/CatToken.cs to Implab/src/Automaton/RegularExpressions/CatToken.cs

0

Implab/src/Automaton/RegularExpressions/EmptyToken.cs ~~Implab/Automaton/RegularExpressions/EmptyToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/EmptyToken.cs to Implab/src/Automaton/RegularExpressions/EmptyToken.cs

0

Implab/src/Automaton/RegularExpressions/EndToken.cs ~~Implab/Automaton/RegularExpressions/EndToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/EndToken.cs to Implab/src/Automaton/RegularExpressions/EndToken.cs

0

Implab/src/Automaton/RegularExpressions/EndTokenT.cs ~~Implab/Automaton/RegularExpressions/EndTokenT.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/EndTokenT.cs to Implab/src/Automaton/RegularExpressions/EndTokenT.cs

0

Implab/src/Automaton/RegularExpressions/ITaggedDFABuilder.cs ~~Implab/Automaton/RegularExpressions/ITaggedDFABuilder.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/ITaggedDFABuilder.cs to Implab/src/Automaton/RegularExpressions/ITaggedDFABuilder.cs

0

Implab/src/Automaton/RegularExpressions/IVisitor.cs ~~Implab/Automaton/RegularExpressions/IVisitor.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/IVisitor.cs to Implab/src/Automaton/RegularExpressions/IVisitor.cs

0

Implab/src/Automaton/RegularExpressions/RegularDFA.cs ~~Implab/Automaton/RegularExpressions/RegularDFA.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/RegularDFA.cs to Implab/src/Automaton/RegularExpressions/RegularDFA.cs

0

Implab/src/Automaton/RegularExpressions/RegularExpressionVisitor.cs ~~Implab/Automaton/RegularExpressions/RegularExpressionVisitor.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/RegularExpressionVisitor.cs to Implab/src/Automaton/RegularExpressions/RegularExpressionVisitor.cs

0

Implab/src/Automaton/RegularExpressions/RegularExpressionVisitorT.cs ~~Implab/Automaton/RegularExpressions/RegularExpressionVisitorT.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/RegularExpressionVisitorT.cs to Implab/src/Automaton/RegularExpressions/RegularExpressionVisitorT.cs

0

Implab/src/Automaton/RegularExpressions/StarToken.cs ~~Implab/Automaton/RegularExpressions/StarToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/StarToken.cs to Implab/src/Automaton/RegularExpressions/StarToken.cs

0

Implab/src/Automaton/RegularExpressions/SymbolToken.cs ~~Implab/Automaton/RegularExpressions/SymbolToken.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/SymbolToken.cs to Implab/src/Automaton/RegularExpressions/SymbolToken.cs

0

Implab/src/Automaton/RegularExpressions/Token.cs ~~Implab/Automaton/RegularExpressions/Token.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Automaton/RegularExpressions/Token.cs to Implab/src/Automaton/RegularExpressions/Token.cs

0

Implab/src/Components/Disposable.cs ~~Implab/Components/Disposable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/Disposable.cs to Implab/src/Components/Disposable.cs

0

Implab/src/Components/DisposablePool.cs ~~Implab/Components/DisposablePool.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/DisposablePool.cs to Implab/src/Components/DisposablePool.cs

0

Implab/src/Components/ExecutionState.cs ~~Implab/Components/ExecutionState.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/ExecutionState.cs to Implab/src/Components/ExecutionState.cs

0

Implab/src/Components/IAsyncComponent.cs ~~Implab/Components/IAsyncComponent.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/IAsyncComponent.cs to Implab/src/Components/IAsyncComponent.cs

0

Implab/src/Components/IFactory.cs ~~Implab/Components/IFactory.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/IFactory.cs to Implab/src/Components/IFactory.cs

0

Implab/src/Components/IInitializable.cs ~~Implab/Components/IInitializable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/IInitializable.cs to Implab/src/Components/IInitializable.cs

0

Implab/src/Components/IRunnable.cs ~~Implab/Components/IRunnable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/IRunnable.cs to Implab/src/Components/IRunnable.cs

0

Implab/src/Components/IServiceLocator.cs ~~Implab/Components/IServiceLocator.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/IServiceLocator.cs to Implab/src/Components/IServiceLocator.cs

0

Implab/src/Components/LazyAndWeak.cs ~~Implab/Components/LazyAndWeak.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/LazyAndWeak.cs to Implab/src/Components/LazyAndWeak.cs

0

Implab/src/Components/ObjectPool.cs ~~Implab/Components/ObjectPool.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/ObjectPool.cs to Implab/src/Components/ObjectPool.cs

0

Implab/src/Components/PollingComponent.cs ~~Implab/Components/PollingComponent.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/PollingComponent.cs to Implab/src/Components/PollingComponent.cs

0

Implab/src/Components/RunnableComponent.cs ~~Implab/Components/RunnableComponent.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/RunnableComponent.cs to Implab/src/Components/RunnableComponent.cs

0

Implab/src/Components/ServiceLocator.cs ~~Implab/Components/ServiceLocator.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/ServiceLocator.cs to Implab/src/Components/ServiceLocator.cs

0

Implab/src/Components/StateChangeEventArgs.cs ~~Implab/Components/StateChangeEventArgs.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Components/StateChangeEventArgs.cs to Implab/src/Components/StateChangeEventArgs.cs

0

Implab/src/CustomEqualityComparer.cs ~~Implab/CustomEqualityComparer.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/CustomEqualityComparer.cs to Implab/src/CustomEqualityComparer.cs

0

Implab/src/Deferred.cs ~~Implab/Deferred.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Deferred.cs to Implab/src/Deferred.cs

0

Implab/src/Deferred`1.cs ~~Implab/Deferred`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Deferred`1.cs to Implab/src/Deferred`1.cs

0

Implab/src/Diagnostics/ActivityScope.cs ~~Implab/Diagnostics/ActivityScope.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/ActivityScope.cs to Implab/src/Diagnostics/ActivityScope.cs

0

Implab/src/Diagnostics/LogicalOperation.cs ~~Implab/Diagnostics/LogicalOperation.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/LogicalOperation.cs to Implab/src/Diagnostics/LogicalOperation.cs

0

Implab/src/Diagnostics/LogicalOperationScope.cs ~~Implab/Diagnostics/LogicalOperationScope.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/LogicalOperationScope.cs to Implab/src/Diagnostics/LogicalOperationScope.cs

0

Implab/src/Diagnostics/SimpleTraceListener.cs ~~Implab/Diagnostics/SimpleTraceListener.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/SimpleTraceListener.cs to Implab/src/Diagnostics/SimpleTraceListener.cs

0

Implab/src/Diagnostics/Trace.cs ~~Implab/Diagnostics/Trace.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/Trace.cs to Implab/src/Diagnostics/Trace.cs

0

Implab/src/Diagnostics/TraceChannel.cs ~~Implab/Diagnostics/TraceChannel.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceChannel.cs to Implab/src/Diagnostics/TraceChannel.cs

0

Implab/src/Diagnostics/TraceEventCodes.cs ~~Implab/Diagnostics/TraceEventCodes.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceEventCodes.cs to Implab/src/Diagnostics/TraceEventCodes.cs

0

Implab/src/Diagnostics/TraceRegistry.cs ~~Implab/Diagnostics/TraceRegistry.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceRegistry.cs to Implab/src/Diagnostics/TraceRegistry.cs

0

Implab/src/Diagnostics/TraceSourceAttribute.cs ~~Implab/Diagnostics/TraceSourceAttribute.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceSourceAttribute.cs to Implab/src/Diagnostics/TraceSourceAttribute.cs

0

Implab/src/Diagnostics/TraceSourceChannel.cs ~~Implab/Diagnostics/TraceSourceChannel.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceSourceChannel.cs to Implab/src/Diagnostics/TraceSourceChannel.cs

0

Implab/src/Diagnostics/TraceSourceChannel`1.cs ~~Implab/Diagnostics/TraceSourceChannel`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Diagnostics/TraceSourceChannel`1.cs to Implab/src/Diagnostics/TraceSourceChannel`1.cs

0

Implab/src/ExceptionHelpers.cs ~~Implab/ExceptionHelpers.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/ExceptionHelpers.cs to Implab/src/ExceptionHelpers.cs

0

Implab/src/Formats/ByteAlphabet.cs ~~Implab/Formats/ByteAlphabet.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/ByteAlphabet.cs to Implab/src/Formats/ByteAlphabet.cs

0

Implab/src/Formats/CharAlphabet.cs ~~Implab/Formats/CharAlphabet.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/CharAlphabet.cs to Implab/src/Formats/CharAlphabet.cs

0

Implab/src/Formats/CharMap.cs ~~Implab/Formats/CharMap.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/CharMap.cs to Implab/src/Formats/CharMap.cs

0

Implab/src/Formats/FastInpurScanner.cs ~~Implab/Formats/FastInpurScanner.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/FastInpurScanner.cs to Implab/src/Formats/FastInpurScanner.cs

0

Implab/src/Formats/Grammar.cs ~~Implab/Formats/Grammar.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Grammar.cs to Implab/src/Formats/Grammar.cs

0

Implab/src/Formats/InputScanner.cs ~~Implab/Formats/InputScanner.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/InputScanner.cs to Implab/src/Formats/InputScanner.cs

0

Implab/src/Formats/Json/JsonElementContext.cs ~~Implab/Formats/Json/JsonElementContext.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonElementContext.cs to Implab/src/Formats/Json/JsonElementContext.cs

0

Implab/src/Formats/Json/JsonElementType.cs ~~Implab/Formats/Json/JsonElementType.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonElementType.cs to Implab/src/Formats/Json/JsonElementType.cs

0

Implab/src/Formats/Json/JsonGrammar.cs ~~Implab/Formats/Json/JsonGrammar.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonGrammar.cs to Implab/src/Formats/Json/JsonGrammar.cs

0

Implab/src/Formats/Json/JsonReader.cs ~~Implab/Formats/Json/JsonReader.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonReader.cs to Implab/src/Formats/Json/JsonReader.cs

0

Implab/src/Formats/Json/JsonScanner.cs ~~Implab/Formats/Json/JsonScanner.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonScanner.cs to Implab/src/Formats/Json/JsonScanner.cs

0

Implab/src/Formats/Json/JsonStringScanner.cs ~~Implab/Formats/Json/JsonStringScanner.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonStringScanner.cs to Implab/src/Formats/Json/JsonStringScanner.cs

0

Implab/src/Formats/Json/JsonTextScanner.cs ~~Implab/Formats/Json/JsonTextScanner.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonTextScanner.cs to Implab/src/Formats/Json/JsonTextScanner.cs

0

Implab/src/Formats/Json/JsonTokenType.cs ~~Implab/Formats/Json/JsonTokenType.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonTokenType.cs to Implab/src/Formats/Json/JsonTokenType.cs

0

Implab/src/Formats/Json/JsonWriter.cs ~~Implab/Formats/Json/JsonWriter.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/JsonWriter.cs to Implab/src/Formats/Json/JsonWriter.cs

0

Implab/src/Formats/Json/StringTranslator.cs ~~Implab/Formats/Json/StringTranslator.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Formats/Json/StringTranslator.cs to Implab/src/Formats/Json/StringTranslator.cs

0

Implab/src/IDispatcher.cs ~~Implab/IDispatcher.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/IDispatcher.cs to Implab/src/IDispatcher.cs

0

Implab/src/IPromise.cs ~~Implab/IPromise.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/IPromise.cs to Implab/src/IPromise.cs

0

Implab/src/IPromiseT.cs ~~Implab/IPromiseT.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/IPromiseT.cs to Implab/src/IPromiseT.cs

0

Implab/src/IResolvable.cs ~~Implab/IResolvable.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/IResolvable.cs to Implab/src/IResolvable.cs

0

Implab/src/IResolvable`1.cs ~~Implab/IResolvable`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/IResolvable`1.cs to Implab/src/IResolvable`1.cs

0

Implab/src/Messaging/IConsumer.cs ~~Implab/Messaging/IConsumer.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Messaging/IConsumer.cs to Implab/src/Messaging/IConsumer.cs

0

Implab/src/Messaging/IProducer.cs ~~Implab/Messaging/IProducer.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Messaging/IProducer.cs to Implab/src/Messaging/IProducer.cs

0

Implab/src/Parallels/AsyncQueue.cs ~~Implab/Parallels/AsyncQueue.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/AsyncQueue.cs to Implab/src/Parallels/AsyncQueue.cs

0

Implab/src/Parallels/BlockingQueue.cs ~~Implab/Parallels/BlockingQueue.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/BlockingQueue.cs to Implab/src/Parallels/BlockingQueue.cs

0

Implab/src/Parallels/DispatchPool.cs ~~Implab/Parallels/DispatchPool.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/DispatchPool.cs to Implab/src/Parallels/DispatchPool.cs

0

Implab/src/Parallels/SharedLock.cs ~~Implab/Parallels/SharedLock.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/SharedLock.cs to Implab/src/Parallels/SharedLock.cs

0

Implab/src/Parallels/Signal.cs ~~Implab/Parallels/Signal.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/Signal.cs to Implab/src/Parallels/Signal.cs

0

Implab/src/Parallels/SimpleAsyncQueue.cs ~~Implab/Parallels/SimpleAsyncQueue.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/SimpleAsyncQueue.cs to Implab/src/Parallels/SimpleAsyncQueue.cs

0

Implab/src/Parallels/SyncContextDispatcher.cs ~~Implab/Parallels/SyncContextDispatcher.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/SyncContextDispatcher.cs to Implab/src/Parallels/SyncContextDispatcher.cs

0

Implab/src/Parallels/ThreadPoolDispatcher.cs ~~Implab/Parallels/ThreadPoolDispatcher.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Parallels/ThreadPoolDispatcher.cs to Implab/src/Parallels/ThreadPoolDispatcher.cs

0

Implab/src/Promise.cs ~~Implab/Promise.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Promise.cs to Implab/src/Promise.cs

0

Implab/src/PromiseActionReaction.cs ~~Implab/PromiseActionReaction.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseActionReaction.cs to Implab/src/PromiseActionReaction.cs

0

Implab/src/PromiseActionReaction`1.cs ~~Implab/PromiseActionReaction`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseActionReaction`1.cs to Implab/src/PromiseActionReaction`1.cs

0

Implab/src/PromiseAll.cs ~~Implab/PromiseAll.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseAll.cs to Implab/src/PromiseAll.cs

0

Implab/src/PromiseAll`1.cs ~~Implab/PromiseAll`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseAll`1.cs to Implab/src/PromiseAll`1.cs

0

Implab/src/PromiseAwaiter.cs ~~Implab/PromiseAwaiter.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseAwaiter.cs to Implab/src/PromiseAwaiter.cs

0

Implab/src/PromiseAwaiter`1.cs ~~Implab/PromiseAwaiter`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseAwaiter`1.cs to Implab/src/PromiseAwaiter`1.cs

0

Implab/src/PromiseExecutor.cs ~~Implab/PromiseExecutor.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseExecutor.cs to Implab/src/PromiseExecutor.cs

0

Implab/src/PromiseExecutor`1.cs ~~Implab/PromiseExecutor`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseExecutor`1.cs to Implab/src/PromiseExecutor`1.cs

0

Implab/src/PromiseExtensions.cs ~~Implab/PromiseExtensions.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseExtensions.cs to Implab/src/PromiseExtensions.cs

0

Implab/src/PromiseFuncReaction`1.cs ~~Implab/PromiseFuncReaction`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseFuncReaction`1.cs to Implab/src/PromiseFuncReaction`1.cs

0

Implab/src/PromiseFuncReaction`2.cs ~~Implab/PromiseFuncReaction`2.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseFuncReaction`2.cs to Implab/src/PromiseFuncReaction`2.cs

0

Implab/src/PromiseHandler.cs ~~Implab/PromiseHandler.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseHandler.cs to Implab/src/PromiseHandler.cs

0

Implab/src/PromiseState.cs ~~Implab/PromiseState.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseState.cs to Implab/src/PromiseState.cs

0

Implab/src/PromiseTransientException.cs ~~Implab/PromiseTransientException.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/PromiseTransientException.cs to Implab/src/PromiseTransientException.cs

0

Implab/src/Promise`1.cs ~~Implab/Promise`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Promise`1.cs to Implab/src/Promise`1.cs

0

Implab/src/RejectedPromise.cs ~~Implab/RejectedPromise.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/RejectedPromise.cs to Implab/src/RejectedPromise.cs

0

Implab/src/RejectedPromise`1.cs ~~Implab/RejectedPromise`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/RejectedPromise`1.cs to Implab/src/RejectedPromise`1.cs

0

Implab/src/ResolvedPromise.cs ~~Implab/ResolvedPromise.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/ResolvedPromise.cs to Implab/src/ResolvedPromise.cs

0

Implab/src/ResolvedPromise`1.cs ~~Implab/ResolvedPromise`1.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/ResolvedPromise`1.cs to Implab/src/ResolvedPromise`1.cs

0

Implab/src/Safe.cs ~~Implab/Safe.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Safe.cs to Implab/src/Safe.cs

0

Implab/src/TaskHelpers.cs ~~Implab/TaskHelpers.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/TaskHelpers.cs to Implab/src/TaskHelpers.cs

0

Implab/src/Xml/JsonXmlCaseTransform.cs ~~Implab/Xml/JsonXmlCaseTransform.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/JsonXmlCaseTransform.cs to Implab/src/Xml/JsonXmlCaseTransform.cs

0

Implab/src/Xml/JsonXmlReader.cs ~~Implab/Xml/JsonXmlReader.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/JsonXmlReader.cs to Implab/src/Xml/JsonXmlReader.cs

0

Implab/src/Xml/JsonXmlReaderOptions.cs ~~Implab/Xml/JsonXmlReaderOptions.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/JsonXmlReaderOptions.cs to Implab/src/Xml/JsonXmlReaderOptions.cs

0

Implab/src/Xml/JsonXmlReaderPosition.cs ~~Implab/Xml/JsonXmlReaderPosition.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/JsonXmlReaderPosition.cs to Implab/src/Xml/JsonXmlReaderPosition.cs

0

Implab/src/Xml/SerializationHelpers.cs ~~Implab/Xml/SerializationHelpers.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/SerializationHelpers.cs to Implab/src/Xml/SerializationHelpers.cs

0

Implab/src/Xml/SerializersPool.cs ~~Implab/Xml/SerializersPool.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/SerializersPool.cs to Implab/src/Xml/SerializersPool.cs

0

Implab/src/Xml/XmlDefaultSerializer.cs ~~Implab/Xml/XmlDefaultSerializer.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/XmlDefaultSerializer.cs to Implab/src/Xml/XmlDefaultSerializer.cs

0

Implab/src/Xml/XmlNameContext.cs ~~Implab/Xml/XmlNameContext.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/XmlNameContext.cs to Implab/src/Xml/XmlNameContext.cs

0

Implab/src/Xml/XmlSerializerExtensions.cs ~~Implab/Xml/XmlSerializerExtensions.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/XmlSerializerExtensions.cs to Implab/src/Xml/XmlSerializerExtensions.cs

0

Implab/src/Xml/XmlSimpleAttribute.cs ~~Implab/Xml/XmlSimpleAttribute.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/XmlSimpleAttribute.cs to Implab/src/Xml/XmlSimpleAttribute.cs

0

Implab/src/Xml/XmlToJson.cs ~~Implab/Xml/XmlToJson.cs~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/XmlToJson.cs to Implab/src/Xml/XmlToJson.cs

0

Implab/src/Xml/json.xsl ~~Implab/Xml/json.xsl~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/json.xsl to Implab/src/Xml/json.xsl

0

Implab/src/Xml/readme.txt ~~Implab/Xml/readme.txt~~ renamed 0 0

1

NO CONTENT: file renamed from Implab/Xml/readme.txt to Implab/src/Xml/readme.txt

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages