Merge branch 'main' of https://github.com/unitycontainer/container-regression-tests

Container.Version.4.0.1.csproj

@@ -54,12 +54,13 @@
     <Compile Remove="Container\Extension\BuilderAware\IBuilderAware.cs" />
     <Compile Remove="Registration\Validation\Factory.cs" />
   </ItemGroup>
-	
+  
   <ItemGroup>
     <Using Remove="System.Net.Http" />
+    <None Remove=".git" />
     <None Remove=".gitignore" />
-	<None Remove="*.slnf" />
-	<None Remove="*.props" />
+	  <None Remove="*.slnf" />
+	  <None Remove="*.props" />
   </ItemGroup>
 
 </Project>

Container.Version.5.11.x.csproj

@@ -36,12 +36,13 @@
     <Compile Remove="Registration\Validation\Factory.cs" />
   </ItemGroup>
   
-
+  
   <ItemGroup>
     <Using Remove="System.Net.Http" />
+    <None Remove=".git" />
     <None Remove=".gitignore" />
-	<None Remove="*.slnf" />
-	<None Remove="*.props" />
+	  <None Remove="*.slnf" />
+	  <None Remove="*.props" />
   </ItemGroup>
 
 </Project>

Container.Version.6.0.x.csproj

@@ -4,7 +4,7 @@
   
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework> 
-    <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
+    <UnityContainer>..\Container\src\Unity.Container.csproj</UnityContainer>
     <DefineConstants>UNITY_V6;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   
@@ -18,6 +18,7 @@
   <PropertyGroup>
     <DefineConstants Condition="'$(Configuration)'=='v6'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
     <DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
+    <DefineConstants Condition="'$(Configuration)'=='Debug'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
   </PropertyGroup>
 
 
@@ -37,12 +38,13 @@
     <Compile Remove="Registration\Validation\Factory.cs" />
   </ItemGroup>
   
-
+  
   <ItemGroup>
     <Using Remove="System.Net.Http" />
+    <None Remove=".git" />
     <None Remove=".gitignore" />
-	<None Remove="*.slnf" />
-	<None Remove="*.props" />
+	  <None Remove="*.slnf" />
+	  <None Remove="*.props" />
   </ItemGroup>
 
 </Project>

Patterns/Injection/Override/Member.Injected.cs

@@ -37,7 +37,9 @@ namespace Injection
                 InjectionMember_Value(new InjectionParameter(injected)),
                 MemberOverride(new InjectionParameter(overridden)), overridden);
 
-
+#if BEHAVIOR_V5
+        [Ignore("https://github.com/unitycontainer/container/issues/357")]
+#endif
         [TestProperty(OVERRIDE, MEMBER_OVERRIDE)]
         [DataTestMethod, DynamicData(nameof(Type_Compatibility_Data), typeof(PatternBase))]
         [ExpectedException(typeof(ResolutionFailedException))]