diff --git a/README.md b/README.md
index c9540357e..33d8b2e4f 100644
--- a/README.md
+++ b/README.md
@@ -937,192 +937,103 @@ Installed [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
Transient
Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Gen1 | Allocated | Alloc Ratio |
-'Pure.DI composition root' | 9.540 ns | 0.1055 ns | 0.0935 ns | 0.95 | 0.03 | 0.0013 | - | 24 B | 1.00 |
-
'Hand Coded' | 10.116 ns | 0.2824 ns | 0.3021 ns | 1.00 | 0.00 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve<T>()' | 11.570 ns | 0.3141 ns | 0.3617 ns | 1.14 | 0.04 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve(Type)' | 11.992 ns | 0.2704 ns | 0.2529 ns | 1.19 | 0.05 | 0.0013 | - | 24 B | 1.00 |
-
LightInject | 20.542 ns | 0.1679 ns | 0.1489 ns | 2.04 | 0.06 | 0.0013 | - | 24 B | 1.00 |
-
'Microsoft DI' | 25.624 ns | 0.1971 ns | 0.1747 ns | 2.55 | 0.08 | 0.0013 | - | 24 B | 1.00 |
-
DryIoc | 27.149 ns | 0.2081 ns | 0.1845 ns | 2.70 | 0.09 | 0.0013 | - | 24 B | 1.00 |
-
'Simple Injector' | 34.035 ns | 0.2053 ns | 0.1714 ns | 3.39 | 0.10 | 0.0013 | - | 24 B | 1.00 |
-
Unity | 11,144.949 ns | 62.3348 ns | 55.2582 ns | 1,107.63 | 34.56 | 0.2747 | - | 5176 B | 215.67 |
-
Autofac | 30,281.347 ns | 396.4851 ns | 370.8724 ns | 3,005.07 | 103.20 | 1.7700 | 0.0610 | 33224 B | 1,384.33 |
-
'Castle Windsor' | 60,466.436 ns | 209.8572 ns | 186.0330 ns | 6,009.57 | 192.23 | 2.8687 | - | 54360 B | 2,265.00 |
-
Ninject | 270,253.848 ns | 5,217.8211 ns | 6,008.8505 ns | 26,671.30 | 991.97 | 6.8359 | 1.4648 | 131008 B | 5,458.67 |
+
'Hand Coded' | 8.300 ns | 0.2275 ns | 0.2017 ns | 1.00 | 0.00 | 0.0014 | - | 24 B | 1.00 |
+
'Pure.DI composition root' | 8.417 ns | 0.2472 ns | 0.2313 ns | 1.02 | 0.04 | 0.0014 | - | 24 B | 1.00 |
+
'Pure.DI Resolve<T>()' | 10.007 ns | 0.2170 ns | 0.1924 ns | 1.21 | 0.03 | 0.0014 | - | 24 B | 1.00 |
+
'Pure.DI Resolve(Type)' | 10.739 ns | 0.2942 ns | 0.4915 ns | 1.29 | 0.06 | 0.0014 | - | 24 B | 1.00 |
+
LightInject | 18.968 ns | 0.4292 ns | 0.3805 ns | 2.29 | 0.07 | 0.0014 | - | 24 B | 1.00 |
+
'Microsoft DI' | 24.761 ns | 0.2356 ns | 0.2089 ns | 2.98 | 0.07 | 0.0014 | - | 24 B | 1.00 |
+
DryIoc | 26.034 ns | 0.3170 ns | 0.2810 ns | 3.14 | 0.06 | 0.0014 | - | 24 B | 1.00 |
+
'Simple Injector' | 33.862 ns | 0.4485 ns | 0.3976 ns | 4.08 | 0.11 | 0.0014 | - | 24 B | 1.00 |
+
Unity | 11,055.904 ns | 85.9931 ns | 76.2306 ns | 1,332.65 | 31.50 | 0.2899 | - | 5176 B | 215.67 |
+
Autofac | 28,686.734 ns | 523.7684 ns | 464.3070 ns | 3,458.02 | 103.75 | 1.9226 | 0.0916 | 33224 B | 1,384.33 |
+
'Castle Windsor' | 57,113.574 ns | 417.0749 ns | 369.7260 ns | 6,883.84 | 138.26 | 3.1128 | - | 54360 B | 2,265.00 |
+
Ninject | 259,310.814 ns | 5,082.3164 ns | 5,438.0217 ns | 31,238.77 | 1,101.53 | 7.3242 | 1.9531 | 131008 B | 5,458.67 |
[Transient details](readme/TransientDetails.md)
@@ -1134,7 +1045,7 @@ Installed [.NET SDK 8.0](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
+Intel Xeon Platinum 8175M CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
.NET SDK 8.0.201
[Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
diff --git a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Array-report.html b/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Array-report.html
deleted file mode 100644
index dc19bd333..000000000
--- a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Array-report.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-Pure.DI.Benchmarks.Benchmarks.Array-20240412-095223
-
-
-
-
-
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
- [Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
- DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-
-
-
-
-Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Gen1 | Allocated | Alloc Ratio |
-
-'Simple Injector' | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
'Microsoft DI' | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
'Castle Windsor' | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
Ninject | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
'Pure.DI Resolve<T>()' | 174.7 ns | 2.99 ns | 2.65 ns | 1.00 | 0.03 | 0.0336 | - | 632 B | 1.00 |
-
'Hand Coded' | 174.9 ns | 3.11 ns | 2.60 ns | 1.00 | 0.00 | 0.0336 | - | 632 B | 1.00 |
-
'Pure.DI composition root' | 176.0 ns | 3.55 ns | 4.35 ns | 1.01 | 0.03 | 0.0336 | - | 632 B | 1.00 |
-
'Pure.DI Resolve(Type)' | 177.2 ns | 2.47 ns | 2.06 ns | 1.01 | 0.01 | 0.0336 | - | 632 B | 1.00 |
-
DryIoc | 200.4 ns | 4.13 ns | 7.02 ns | 1.11 | 0.04 | 0.0334 | - | 632 B | 1.00 |
-
LightInject | 221.0 ns | 4.44 ns | 4.15 ns | 1.27 | 0.03 | 0.0336 | - | 632 B | 1.00 |
-
Unity | 10,213.1 ns | 173.93 ns | 154.19 ns | 58.49 | 0.70 | 0.7629 | - | 14520 B | 22.97 |
-
Autofac | 27,742.9 ns | 134.03 ns | 118.82 ns | 158.63 | 2.39 | 1.5259 | 0.0610 | 28816 B | 45.59 |
-
-
-
diff --git a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Enum-report.html b/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Enum-report.html
deleted file mode 100644
index 944a84d60..000000000
--- a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Enum-report.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-Pure.DI.Benchmarks.Benchmarks.Enum-20240412-095534
-
-
-
-
-
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
- [Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
- DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-
-
-
-
-Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Gen1 | Allocated | Alloc Ratio |
-
-'Simple Injector' | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
'Castle Windsor' | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
Ninject | NA | NA | NA | ? | ? | NA | NA | NA | ? |
-
'Pure.DI Resolve(Type)' | 133.1 ns | 1.92 ns | 1.60 ns | 0.83 | 0.01 | 0.0184 | - | 344 B | 1.00 |
-
'Pure.DI Resolve<T>()' | 136.7 ns | 2.76 ns | 4.04 ns | 0.87 | 0.02 | 0.0184 | - | 344 B | 1.00 |
-
'Pure.DI composition root' | 147.2 ns | 1.87 ns | 1.56 ns | 0.92 | 0.02 | 0.0184 | - | 344 B | 1.00 |
-
'Hand Coded' | 160.4 ns | 3.02 ns | 2.68 ns | 1.00 | 0.00 | 0.0184 | - | 344 B | 1.00 |
-
'Microsoft DI' | 191.0 ns | 2.29 ns | 1.91 ns | 1.19 | 0.02 | 0.0250 | - | 472 B | 1.37 |
-
LightInject | 287.5 ns | 5.61 ns | 5.24 ns | 1.79 | 0.04 | 0.0458 | - | 856 B | 2.49 |
-
DryIoc | 290.3 ns | 5.81 ns | 6.22 ns | 1.80 | 0.05 | 0.0458 | - | 856 B | 2.49 |
-
Unity | 7,807.3 ns | 153.87 ns | 164.64 ns | 48.98 | 1.43 | 0.7324 | - | 13752 B | 39.98 |
-
Autofac | 28,057.8 ns | 201.48 ns | 168.25 ns | 175.32 | 2.37 | 1.5259 | 0.0610 | 28944 B | 84.14 |
-
-
-
diff --git a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Func-report.html b/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Func-report.html
deleted file mode 100644
index 32b96e0cd..000000000
--- a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Func-report.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-Pure.DI.Benchmarks.Benchmarks.Func-20240412-095838
-
-
-
-
-
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
- [Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
- DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-
-
-
-
-Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Allocated | Alloc Ratio |
-
-'Simple Injector' | NA | NA | NA | ? | ? | NA | NA | ? |
-
'Microsoft DI' | NA | NA | NA | ? | ? | NA | NA | ? |
-
'Castle Windsor' | NA | NA | NA | ? | ? | NA | NA | ? |
-
Ninject | NA | NA | NA | ? | ? | NA | NA | ? |
-
'Pure.DI composition root' | 9.795 ns | 0.1705 ns | 0.1424 ns | 0.98 | 0.02 | 0.0013 | 24 B | 1.00 |
-
'Hand Coded' | 9.988 ns | 0.1626 ns | 0.1441 ns | 1.00 | 0.00 | 0.0013 | 24 B | 1.00 |
-
'Pure.DI Resolve<T>()' | 12.079 ns | 0.1415 ns | 0.1255 ns | 1.21 | 0.02 | 0.0013 | 24 B | 1.00 |
-
'Pure.DI Resolve(Type)' | 12.984 ns | 0.1515 ns | 0.1417 ns | 1.30 | 0.02 | 0.0013 | 24 B | 1.00 |
-
DryIoc | 69.285 ns | 1.4315 ns | 1.4059 ns | 6.93 | 0.18 | 0.0063 | 120 B | 5.00 |
-
LightInject | 325.360 ns | 5.2084 ns | 4.6171 ns | 32.58 | 0.57 | 0.0267 | 504 B | 21.00 |
-
Unity | 4,620.579 ns | 36.4441 ns | 32.3067 ns | 462.68 | 6.64 | 0.1297 | 2552 B | 106.33 |
-
Autofac | 11,448.774 ns | 109.1515 ns | 85.2183 ns | 1,149.44 | 17.51 | 0.7477 | 14008 B | 583.67 |
-
-
-
diff --git a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html b/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html
deleted file mode 100644
index 55ff3d7ef..000000000
--- a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Singleton-report.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-Pure.DI.Benchmarks.Benchmarks.Singleton-20240412-100141
-
-
-
-
-
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
- [Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
- DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-
-
-
-
-Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Gen1 | Allocated | Alloc Ratio |
-
-'Hand Coded' | 10.05 ns | 0.273 ns | 0.256 ns | 1.00 | 0.00 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI composition root' | 10.56 ns | 0.194 ns | 0.172 ns | 1.05 | 0.03 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve<T>()' | 13.35 ns | 0.291 ns | 0.272 ns | 1.33 | 0.05 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve(Type)' | 13.98 ns | 0.361 ns | 0.320 ns | 1.39 | 0.04 | 0.0013 | - | 24 B | 1.00 |
-
DryIoc | 28.30 ns | 0.141 ns | 0.125 ns | 2.82 | 0.07 | 0.0013 | - | 24 B | 1.00 |
-
'Simple Injector' | 35.64 ns | 0.212 ns | 0.177 ns | 3.56 | 0.10 | 0.0013 | - | 24 B | 1.00 |
-
'Microsoft DI' | 39.29 ns | 0.257 ns | 0.227 ns | 3.92 | 0.10 | 0.0013 | - | 24 B | 1.00 |
-
LightInject | 880.93 ns | 2.642 ns | 2.342 ns | 87.86 | 2.29 | 0.0010 | - | 24 B | 1.00 |
-
Unity | 7,898.24 ns | 43.521 ns | 40.710 ns | 786.53 | 23.40 | 0.1678 | - | 3184 B | 132.67 |
-
Autofac | 20,565.78 ns | 240.056 ns | 212.804 ns | 2,050.79 | 37.88 | 1.2817 | 0.0305 | 24208 B | 1,008.67 |
-
'Castle Windsor' | 30,836.81 ns | 248.384 ns | 232.339 ns | 3,070.72 | 89.05 | 1.2207 | - | 23912 B | 996.33 |
-
Ninject | 124,114.61 ns | 2,323.047 ns | 2,059.321 ns | 12,377.23 | 311.24 | 3.9063 | 0.9766 | 74096 B | 3,087.33 |
-
-
-
diff --git a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Transient-report.html b/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Transient-report.html
deleted file mode 100644
index 7d2d0ab60..000000000
--- a/benchmarks/data/results/Pure.DI.Benchmarks.Benchmarks.Transient-report.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-Pure.DI.Benchmarks.Benchmarks.Transient-20240412-100607
-
-
-
-
-
-BenchmarkDotNet v0.13.12, Ubuntu 20.04.6 LTS (Focal Fossa)
-Intel Xeon Platinum 8259CL CPU 2.50GHz, 1 CPU, 2 logical cores and 1 physical core
-.NET SDK 8.0.201
- [Host] : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
- DefaultJob : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL
-
-
-
-
-Method | Mean | Error | StdDev | Ratio | RatioSD | Gen0 | Gen1 | Allocated | Alloc Ratio |
-
-'Pure.DI composition root' | 9.540 ns | 0.1055 ns | 0.0935 ns | 0.95 | 0.03 | 0.0013 | - | 24 B | 1.00 |
-
'Hand Coded' | 10.116 ns | 0.2824 ns | 0.3021 ns | 1.00 | 0.00 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve<T>()' | 11.570 ns | 0.3141 ns | 0.3617 ns | 1.14 | 0.04 | 0.0013 | - | 24 B | 1.00 |
-
'Pure.DI Resolve(Type)' | 11.992 ns | 0.2704 ns | 0.2529 ns | 1.19 | 0.05 | 0.0013 | - | 24 B | 1.00 |
-
LightInject | 20.542 ns | 0.1679 ns | 0.1489 ns | 2.04 | 0.06 | 0.0013 | - | 24 B | 1.00 |
-
'Microsoft DI' | 25.624 ns | 0.1971 ns | 0.1747 ns | 2.55 | 0.08 | 0.0013 | - | 24 B | 1.00 |
-
DryIoc | 27.149 ns | 0.2081 ns | 0.1845 ns | 2.70 | 0.09 | 0.0013 | - | 24 B | 1.00 |
-
'Simple Injector' | 34.035 ns | 0.2053 ns | 0.1714 ns | 3.39 | 0.10 | 0.0013 | - | 24 B | 1.00 |
-
Unity | 11,144.949 ns | 62.3348 ns | 55.2582 ns | 1,107.63 | 34.56 | 0.2747 | - | 5176 B | 215.67 |
-
Autofac | 30,281.347 ns | 396.4851 ns | 370.8724 ns | 3,005.07 | 103.20 | 1.7700 | 0.0610 | 33224 B | 1,384.33 |
-
'Castle Windsor' | 60,466.436 ns | 209.8572 ns | 186.0330 ns | 6,009.57 | 192.23 | 2.8687 | - | 54360 B | 2,265.00 |
-
Ninject | 270,253.848 ns | 5,217.8211 ns | 6,008.8505 ns | 26,671.30 | 991.97 | 6.8359 | 1.4648 | 131008 B | 5,458.67 |
-
-
-
diff --git a/build/BenchmarksTarget.cs b/build/BenchmarksTarget.cs
index f548c9231..c414d7271 100644
--- a/build/BenchmarksTarget.cs
+++ b/build/BenchmarksTarget.cs
@@ -51,7 +51,7 @@ public Task RunAsync(CancellationToken cancellationToken)
var reportFile = $"{index++:00} {Path.GetFileName(originalReportFile).Replace("Pure.DI.Benchmarks.Benchmarks.", "").Replace("-report", "")}";
reportFile = Path.Combine(logsDirectory, reportFile);
File.Copy(originalReportFile, reportFile, true);
- artifactsWriter.PublishArtifact($"{reportFile} => .");
+ artifactsWriter.PublishArtifact($"{originalReportFile} => .");
}
return Task.FromResult(0);
diff --git a/build/build.csproj b/build/build.csproj
index d7d411f19..c0a5c6857 100644
--- a/build/build.csproj
+++ b/build/build.csproj
@@ -9,7 +9,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/Avalonia.md b/readme/Avalonia.md
index c8258c7bf..9a53c081f 100644
--- a/readme/Avalonia.md
+++ b/readme/Avalonia.md
@@ -107,7 +107,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md
index b5800cd87..b3b7863a1 100644
--- a/readme/BlazorServerApp.md
+++ b/readme/BlazorServerApp.md
@@ -68,7 +68,7 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md
index 008f0e535..decf7524d 100644
--- a/readme/BlazorWebAssemblyApp.md
+++ b/readme/BlazorWebAssemblyApp.md
@@ -67,7 +67,7 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/Console.md b/readme/Console.md
index c4f34b3c0..f8b1d69c5 100644
--- a/readme/Console.md
+++ b/readme/Console.md
@@ -90,7 +90,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/ConsoleNativeAOT.md b/readme/ConsoleNativeAOT.md
index cd6ed4ad3..69bd06d1c 100644
--- a/readme/ConsoleNativeAOT.md
+++ b/readme/ConsoleNativeAOT.md
@@ -16,7 +16,7 @@ The [project file](/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.cs
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md
index 06565308d..26091711e 100644
--- a/readme/ConsoleTopLevelStatements.md
+++ b/readme/ConsoleTopLevelStatements.md
@@ -78,7 +78,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/GrpcService.md b/readme/GrpcService.md
index 83d12586a..435bbcf48 100644
--- a/readme/GrpcService.md
+++ b/readme/GrpcService.md
@@ -53,7 +53,7 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/Maui.md b/readme/Maui.md
index c576028c2..f1eb55fc7 100644
--- a/readme/Maui.md
+++ b/readme/Maui.md
@@ -208,7 +208,7 @@ The [project file](/samples/MAUIApp/MAUIApp.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md
index 5d1e055f3..44c5212e6 100644
--- a/readme/MinimalWebAPI.md
+++ b/readme/MinimalWebAPI.md
@@ -76,7 +76,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/WebAPI.md b/readme/WebAPI.md
index 7c9e9f435..903b81fc3 100644
--- a/readme/WebAPI.md
+++ b/readme/WebAPI.md
@@ -51,7 +51,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/WebApp.md b/readme/WebApp.md
index 8a33fc3a1..1081a6303 100644
--- a/readme/WebApp.md
+++ b/readme/WebApp.md
@@ -51,7 +51,7 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/WinFormsApp.md b/readme/WinFormsApp.md
index 1a732608b..59535e9c7 100644
--- a/readme/WinFormsApp.md
+++ b/readme/WinFormsApp.md
@@ -55,7 +55,7 @@ The [project file](/samples/WinFormsApp/WinFormsApp.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md
index 883c507a4..8ae490b9a 100644
--- a/readme/WinFormsAppNetCore.md
+++ b/readme/WinFormsAppNetCore.md
@@ -62,7 +62,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/readme/Wpf.md b/readme/Wpf.md
index bf4fcb929..35027c53f 100644
--- a/readme/Wpf.md
+++ b/readme/Wpf.md
@@ -68,7 +68,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this:
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/samples/Clock.Tests/Clock.Tests.csproj b/samples/Clock.Tests/Clock.Tests.csproj
index 90ecb6680..992d7143e 100644
--- a/samples/Clock.Tests/Clock.Tests.csproj
+++ b/samples/Clock.Tests/Clock.Tests.csproj
@@ -9,8 +9,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs
index 06b4b8106..255ac06a5 100644
--- a/src/Pure.DI.Core/Components/Api.g.cs
+++ b/src/Pure.DI.Core/Components/Api.g.cs
@@ -1,5 +1,5 @@
//
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
#pragma warning disable
#if !NET40_OR_GREATER && !NETSTANDARD2_0_OR_GREATER && !NETCOREAPP2_0_OR_GREATER
diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
index 5707dffbe..62ddcf5be 100644
--- a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
+++ b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs
@@ -1,5 +1,5 @@
//
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
#pragma warning disable
namespace Pure.DI
{
diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs
index 5bea645a7..714a1fd91 100644
--- a/src/Pure.DI.Core/Features/Default.g.cs
+++ b/src/Pure.DI.Core/Features/Default.g.cs
@@ -1,5 +1,5 @@
//
-#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1
+#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2
#pragma warning disable
namespace Pure.DI
diff --git a/src/Pure.DI.Core/Pure.DI.Core.csproj b/src/Pure.DI.Core/Pure.DI.Core.csproj
index 1bf3dfe01..cfac5241f 100644
--- a/src/Pure.DI.Core/Pure.DI.Core.csproj
+++ b/src/Pure.DI.Core/Pure.DI.Core.csproj
@@ -2,11 +2,11 @@
$(BasePackageId)
- $(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V1
+ $(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V2
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
index df2f4eb75..9cee1b513 100644
--- a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
+++ b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
@@ -7,8 +7,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/tests/Pure.DI.Tests/Pure.DI.Tests.csproj b/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
index 2fdd390b8..1cc775e8d 100644
--- a/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
+++ b/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
@@ -4,8 +4,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
index 275d97cf9..5df764e98 100644
--- a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
+++ b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
@@ -13,8 +13,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive