Skip to content

Commit 3be6064

Browse files
ENikSENikS
committed
Changing adapters
1 parent 23fdd33 commit 3be6064

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+742
-754
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,4 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
/NuGet.Config

Diff for: ‎Adapters/Container.v4.csproj

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<!-- Unity v4 -->
4+
5+
<PropertyGroup>
6+
<TargetFramework Condition="$(TargetFramework) == ''">netstandard2.1</TargetFramework>
7+
<DefineConstants>UNITY_V4;$(DefineConstants)</DefineConstants>
8+
<UnityContainer>..\..\unity\source\Unity\Src\Unity.csproj</UnityContainer>
9+
<LangVersion>latest</LangVersion>
10+
<OutDir>$(SolutionDir)artifacts\$(Configuration)\Adapters\$(MSBuildProjectName)</OutDir>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
<NoWarn>1701;1702;NU1701</NoWarn>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<SignAssembly>true</SignAssembly>
17+
<AssemblyOriginatorKeyFile>$(SolutionDir)Benchmarks\package.snk</AssemblyOriginatorKeyFile>
18+
<DelaySign>false</DelaySign>
19+
</PropertyGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\Base\Container.Adapter.csproj" />
23+
<ProjectReference Condition="Exists('$(UnityContainer)') " Include="$(UnityContainer)" />
24+
<PackageReference Condition="!Exists('$(UnityContainer)')" Include="Unity" Version="4.0.1" />
25+
</ItemGroup>
26+
27+
<!-- Configuration Settings -->
28+
29+
<PropertyGroup>
30+
<DefineConstants Condition="'$(Configuration)'=='v4'">$(DefineConstants);BEHAVIOR_V4</DefineConstants>
31+
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);BEHAVIOR_V4</DefineConstants>
32+
</PropertyGroup>
33+
34+
<!-- v4 Exclusions -->
35+
<ItemGroup>
36+
<Compile Remove="**\*.!v4.cs" />
37+
<Compile Remove="**\*.v5.cs" />
38+
<Compile Remove="**\*.v6.cs" />
39+
<Compile Remove="**\*.v7.cs" />
40+
<Compile Remove="**\*.v8.cs" />
41+
</ItemGroup>
42+
43+
<ItemGroup>
44+
<Using Remove="System.Net.Http" />
45+
<Compile Remove="obj\**" />
46+
<Compile Remove="bin\**" />
47+
<None Remove="obj\**" />
48+
<None Remove="bin\**" />
49+
<None Remove=".git" />
50+
<None Remove=".gitignore" />
51+
<None Remove="NuGet.Config" />
52+
<None Remove="*.slnf" />
53+
<None Remove="*.props" />
54+
<None Remove="README.md" />
55+
</ItemGroup>
56+
57+
</Project>

Diff for: ‎Adapters/Container.v5.csproj

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<!-- Unity v5 -->
4+
5+
<PropertyGroup>
6+
<TargetFramework Condition="$(TargetFramework) == ''">netstandard2.1</TargetFramework>
7+
<UnityContainer>..\Container\src\Unity.Container.csproj</UnityContainer>
8+
<DefineConstants>UNITY_V5;$(DefineConstants)</DefineConstants>
9+
<LangVersion>latest</LangVersion>
10+
<OutDir>$(SolutionDir)artifacts\$(Configuration)\Adapters\$(MSBuildProjectName)</OutDir>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>$(SolutionDir)Benchmarks\package.snk</AssemblyOriginatorKeyFile>
17+
<DelaySign>false</DelaySign>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\Base\Container.Adapter.csproj" />
22+
<ProjectReference Condition="Exists('$(UnityContainer)') " Include="$(UnityContainer)" />
23+
<PackageReference Condition="!Exists('$(UnityContainer)')" Include="Unity.Container" Version="5.11.*" />
24+
</ItemGroup>
25+
26+
<!-- Configuration Settings -->
27+
28+
<PropertyGroup>
29+
<DefineConstants Condition="'$(Configuration)'=='v5'">$(DefineConstants);BEHAVIOR_V5</DefineConstants>
30+
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);BEHAVIOR_V5</DefineConstants>
31+
</PropertyGroup>
32+
33+
34+
<!-- v5 Exclusions -->
35+
36+
<ItemGroup>
37+
<Compile Remove="**\*.v4.cs" />
38+
<Compile Remove="**\*.!v5.cs" />
39+
<Compile Remove="**\*.v6.cs" />
40+
<Compile Remove="**\*.v7.cs" />
41+
<Compile Remove="**\*.v8.cs" />
42+
</ItemGroup>
43+
44+
<ItemGroup>
45+
<Using Remove="System.Net.Http" />
46+
<Compile Remove="obj\**" />
47+
<Compile Remove="bin\**" />
48+
<None Remove="obj\**" />
49+
<None Remove="bin\**" />
50+
<None Remove=".git" />
51+
<None Remove=".gitignore" />
52+
<None Remove="NuGet.Config" />
53+
<None Remove="*.slnf" />
54+
<None Remove="*.props" />
55+
<None Remove="README.md" />
56+
</ItemGroup>
57+
58+
</Project>

Diff for: ‎Adapters/Container.v6.csproj

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<!-- Unity v6 -->
4+
5+
<PropertyGroup>
6+
<TargetFramework Condition="$(TargetFramework) == ''">netstandard2.1</TargetFramework>
7+
<DefineConstants>UNITY_V6;$(DefineConstants)</DefineConstants>
8+
<UnityContainer>..\Container\src\Unity.Container.csproj</UnityContainer>
9+
<LangVersion>latest</LangVersion>
10+
<OutDir>$(SolutionDir)artifacts\$(Configuration)\Adapters\$(MSBuildProjectName)</OutDir>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>$(SolutionDir)Benchmarks\package.snk</AssemblyOriginatorKeyFile>
17+
<DelaySign>false</DelaySign>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\Base\Container.Adapter.csproj" />
22+
<ProjectReference Condition="Exists('$(UnityContainer)') " Include="$(UnityContainer)" />
23+
<PackageReference Condition="!Exists('$(UnityContainer)')" Include="Unity.Container" Version="6.0.0-beta.42" />
24+
</ItemGroup>
25+
26+
<!-- Configuration Settings -->
27+
28+
<PropertyGroup>
29+
<DefineConstants Condition="'$(Configuration)'=='v6'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
30+
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
31+
<DefineConstants Condition="'$(Configuration)'=='Debug'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
32+
</PropertyGroup>
33+
34+
35+
<!-- v6 Exclusions -->
36+
37+
<ItemGroup>
38+
<Compile Remove="**\*.v4.cs" />
39+
<Compile Remove="**\*.v5.cs" />
40+
<Compile Remove="**\*.!v6.cs" />
41+
<Compile Remove="**\*.v7.cs" />
42+
<Compile Remove="**\*.v8.cs" />
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<Using Remove="System.Net.Http" />
47+
<Compile Remove="obj\**" />
48+
<Compile Remove="bin\**" />
49+
<None Remove="obj\**" />
50+
<None Remove="bin\**" />
51+
<None Remove=".git" />
52+
<None Remove=".gitignore" />
53+
<None Remove="NuGet.Config" />
54+
<None Remove="README.md" />
55+
<None Remove="*.slnf" />
56+
<None Remove="*.props" />
57+
</ItemGroup>
58+
59+
</Project>

Diff for: ‎Adapters/Container.v8.csproj

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<!-- Unity v6 -->
4+
5+
<PropertyGroup>
6+
<TargetFramework Condition="$(TargetFramework) == ''">netstandard2.1</TargetFramework>
7+
<UnityContainer>..\Container\src\Unity.Container.csproj</UnityContainer>
8+
<DefineConstants>UNITY_V8;$(DefineConstants)</DefineConstants>
9+
<LangVersion>latest</LangVersion>
10+
<OutDir>$(SolutionDir)artifacts\$(Configuration)\Adapters\$(MSBuildProjectName)</OutDir>
11+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>$(SolutionDir)Benchmarks\package.snk</AssemblyOriginatorKeyFile>
17+
<DelaySign>false</DelaySign>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\Base\Container.Adapter.csproj" />
22+
<ProjectReference Condition="Exists('$(UnityContainer)') " Include="$(UnityContainer)" />
23+
<PackageReference Condition="!Exists('$(UnityContainer)')" Include="Unity.Container" Version="8.0.0-beta.*" />
24+
</ItemGroup>
25+
26+
<!-- Configuration Settings -->
27+
28+
<PropertyGroup>
29+
<DefineConstants Condition="'$(Configuration)'=='v4'">$(DefineConstants);BEHAVIOR_V4</DefineConstants>
30+
<DefineConstants Condition="'$(Configuration)'=='v5'">$(DefineConstants);BEHAVIOR_V5</DefineConstants>
31+
<DefineConstants Condition="'$(Configuration)'=='v6'">$(DefineConstants);BEHAVIOR_V6</DefineConstants>
32+
<DefineConstants Condition="'$(Configuration)'=='v7'">$(DefineConstants);BEHAVIOR_V7</DefineConstants>
33+
<DefineConstants Condition="'$(Configuration)'=='v8'">$(DefineConstants);BEHAVIOR_V8</DefineConstants>
34+
<DefineConstants Condition="'$(Configuration)'=='Release'">$(DefineConstants);BEHAVIOR_V8</DefineConstants>
35+
</PropertyGroup>
36+
37+
38+
<!-- v6 Exclusions -->
39+
40+
<ItemGroup>
41+
<Compile Remove="**\*.v4.cs" />
42+
<Compile Remove="**\*.v5.cs" />
43+
<Compile Remove="**\*.v6.cs" />
44+
<Compile Remove="**\*.v7.cs" />
45+
<Compile Remove="**\*.!v8.cs" />
46+
</ItemGroup>
47+
48+
<ItemGroup>
49+
<Using Remove="System.Net.Http" />
50+
<Compile Remove="obj\**" />
51+
<Compile Remove="bin\**" />
52+
<None Remove="obj\**" />
53+
<None Remove="bin\**" />
54+
<None Remove=".git" />
55+
<None Remove=".gitignore" />
56+
<None Remove="NuGet.Config" />
57+
<None Remove="README.md" />
58+
<None Remove="*.slnf" />
59+
<None Remove="*.props" />
60+
</ItemGroup>
61+
62+
</Project>

Diff for: ‎Adapters/Directory.Build.props

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<LangVersion>latest</LangVersion>
5+
<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
6+
</PropertyGroup>
7+
8+
</Project>

Diff for: ‎Adapters/UnityAdapter.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#if UNITY_V4
2+
namespace Unity.v4;
3+
4+
#elif UNITY_V5
5+
namespace Unity.v5;
6+
7+
#elif UNITY_V6
8+
namespace Unity.v6;
9+
10+
#elif UNITY_V7
11+
namespace Unity.v7;
12+
13+
#elif UNITY_V8
14+
namespace Unity.v8;
15+
16+
#else
17+
namespace Unity.vX;
18+
#endif
19+
20+
21+
public class UnityAdapter : ContainerAdapter
22+
{
23+
private readonly UnityContainer _container;
24+
25+
public UnityAdapter()
26+
{
27+
_container = new UnityContainer();
28+
}
29+
30+
public override object Resolve(Type type) => _container.Resolve(type);
31+
}

Diff for: ‎Adapters/Usings.cs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
global using System;
2+
global using Unity.Benchmarks;
3+
4+
5+
#if UNITY_V4
6+
global using Microsoft.Practices.Unity;
7+
#else
8+
global using Unity;
9+
#endif

Diff for: ‎Adapters/V4/Unity.v4.csproj

-14
This file was deleted.

Diff for: ‎Adapters/V4/UnityAdapterV4.cs

-12
This file was deleted.

Diff for: ‎Adapters/V4/UnityContainerAPI.cs

-11
This file was deleted.

Diff for: ‎Adapters/V4/UnityRegisterAPI.cs

-11
This file was deleted.

Diff for: ‎Adapters/V4/UnityResolution.cs

-11
This file was deleted.

Diff for: ‎Adapters/V5/Unity.v5.csproj

-14
This file was deleted.

Diff for: ‎Adapters/V5/UnityAdapterV5.cs

-12
This file was deleted.

0 commit comments

Comments
 (0)