From 9b6e50036cec8c275678dab0c5c1489891cfb8e5 Mon Sep 17 00:00:00 2001
From: NikolayPianikov <Nikolay.Pianikov@jetbrains.com>
Date: Thu, 6 Feb 2020 13:18:12 +0300
Subject: [PATCH] Make generic type markers non abstract

---
 IoC.Source/IoC.cs                             | 66 +++++++++----------
 IoC/GenericTypeArguments.cs                   | 66 +++++++++----------
 IoC/GenericTypeArguments.tt                   |  2 +-
 Samples.sln                                   | 18 -----
 Samples/UwpApp/UwpApp.csproj                  |  2 +-
 .../XamarinXaml.Android.csproj                |  2 +-
 .../XamarinXaml/XamarinXaml.csproj            |  2 +-
 7 files changed, 70 insertions(+), 88 deletions(-)

diff --git a/IoC.Source/IoC.cs b/IoC.Source/IoC.cs
index 251e6baf..b78d0e83 100644
--- a/IoC.Source/IoC.cs
+++ b/IoC.Source/IoC.cs
@@ -6116,7 +6116,7 @@ namespace IoC
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT { }
+    public class TT { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6206,7 +6206,7 @@ public interface TTObserver<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT1 { }
+    public class TT1 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6296,7 +6296,7 @@ public interface TTObserver1<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT2 { }
+    public class TT2 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6386,7 +6386,7 @@ public interface TTObserver2<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT3 { }
+    public class TT3 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6476,7 +6476,7 @@ public interface TTObserver3<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT4 { }
+    public class TT4 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6566,7 +6566,7 @@ public interface TTObserver4<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT5 { }
+    public class TT5 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6656,7 +6656,7 @@ public interface TTObserver5<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT6 { }
+    public class TT6 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6746,7 +6746,7 @@ public interface TTObserver6<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT7 { }
+    public class TT7 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6836,7 +6836,7 @@ public interface TTObserver7<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT8 { }
+    public class TT8 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -6926,145 +6926,145 @@ public interface TTObserver8<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT9 { }
+    public class TT9 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT10 { }
+    public class TT10 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT11 { }
+    public class TT11 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT12 { }
+    public class TT12 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT13 { }
+    public class TT13 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT14 { }
+    public class TT14 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT15 { }
+    public class TT15 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT16 { }
+    public class TT16 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT17 { }
+    public class TT17 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT18 { }
+    public class TT18 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT19 { }
+    public class TT19 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT20 { }
+    public class TT20 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT21 { }
+    public class TT21 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT22 { }
+    public class TT22 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT23 { }
+    public class TT23 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT24 { }
+    public class TT24 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT25 { }
+    public class TT25 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT26 { }
+    public class TT26 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT27 { }
+    public class TT27 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT28 { }
+    public class TT28 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT29 { }
+    public class TT29 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT30 { }
+    public class TT30 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT31 { }
+    public class TT31 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT32 { }
+    public class TT32 { }
 
 
     internal class GenericTypeArguments
diff --git a/IoC/GenericTypeArguments.cs b/IoC/GenericTypeArguments.cs
index 415b797e..9a7d9e69 100644
--- a/IoC/GenericTypeArguments.cs
+++ b/IoC/GenericTypeArguments.cs
@@ -7,7 +7,7 @@ namespace IoC
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT { }
+    public class TT { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -97,7 +97,7 @@ public interface TTObserver<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT1 { }
+    public class TT1 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -187,7 +187,7 @@ public interface TTObserver1<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT2 { }
+    public class TT2 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -277,7 +277,7 @@ public interface TTObserver2<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT3 { }
+    public class TT3 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -367,7 +367,7 @@ public interface TTObserver3<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT4 { }
+    public class TT4 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -457,7 +457,7 @@ public interface TTObserver4<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT5 { }
+    public class TT5 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -547,7 +547,7 @@ public interface TTObserver5<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT6 { }
+    public class TT6 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -637,7 +637,7 @@ public interface TTObserver6<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT7 { }
+    public class TT7 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -727,7 +727,7 @@ public interface TTObserver7<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT8 { }
+    public class TT8 { }
 
 /// <summary>
     /// Represents the generic type parameter marker for <c>System.IDisposable</c>.
@@ -817,145 +817,145 @@ public interface TTObserver8<in T>: System.IObserver<T> { }
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT9 { }
+    public class TT9 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT10 { }
+    public class TT10 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT11 { }
+    public class TT11 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT12 { }
+    public class TT12 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT13 { }
+    public class TT13 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT14 { }
+    public class TT14 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT15 { }
+    public class TT15 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT16 { }
+    public class TT16 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT17 { }
+    public class TT17 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT18 { }
+    public class TT18 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT19 { }
+    public class TT19 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT20 { }
+    public class TT20 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT21 { }
+    public class TT21 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT22 { }
+    public class TT22 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT23 { }
+    public class TT23 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT24 { }
+    public class TT24 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT25 { }
+    public class TT25 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT26 { }
+    public class TT26 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT27 { }
+    public class TT27 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT28 { }
+    public class TT28 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT29 { }
+    public class TT29 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT30 { }
+    public class TT30 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT31 { }
+    public class TT31 { }
 
     /// <summary>
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT32 { }
+    public class TT32 { }
 
 
     internal class GenericTypeArguments
diff --git a/IoC/GenericTypeArguments.tt b/IoC/GenericTypeArguments.tt
index 46c3dee2..bd563d87 100644
--- a/IoC/GenericTypeArguments.tt
+++ b/IoC/GenericTypeArguments.tt
@@ -27,7 +27,7 @@ var baseTypes = new Dictionary<string, string> {
     /// Represents the generic type parameter marker.
     /// </summary>
     [PublicAPI, GenericTypeArgument]
-    public abstract class TT<#=i == 0 ? "" : i.ToString()#> { }
+    public class TT<#=i == 0 ? "" : i.ToString()#> { }
 
 <#
     if (i > 8)
diff --git a/Samples.sln b/Samples.sln
index 0a929a29..910abc04 100644
--- a/Samples.sln
+++ b/Samples.sln
@@ -31,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplication3", "Samples\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C0157565-1319-47E5-B55E-C12CCD466F1E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IoC.Features.Source", "IoC.Features.Source\IoC.Features.Source.csproj", "{A980ABBC-08AC-4950-9FAB-E35E60FD6447}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -265,22 +263,6 @@ Global
 		{80567B7F-2ABF-433B-8988-A194C4D9EDF0}.Release|x64.Build.0 = Release|Any CPU
 		{80567B7F-2ABF-433B-8988-A194C4D9EDF0}.Release|x86.ActiveCfg = Release|Any CPU
 		{80567B7F-2ABF-433B-8988-A194C4D9EDF0}.Release|x86.Build.0 = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|x64.Build.0 = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Debug|x86.Build.0 = Debug|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|ARM.Build.0 = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|x64.ActiveCfg = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|x64.Build.0 = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|x86.ActiveCfg = Release|Any CPU
-		{A980ABBC-08AC-4950-9FAB-E35E60FD6447}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Samples/UwpApp/UwpApp.csproj b/Samples/UwpApp/UwpApp.csproj
index a9d1d1a1..d07a8558 100644
--- a/Samples/UwpApp/UwpApp.csproj
+++ b/Samples/UwpApp/UwpApp.csproj
@@ -135,7 +135,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="IoC.Container">
-      <Version>1.2.0-beta368</Version>
+      <Version>1.2.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.9</Version>
diff --git a/Samples/XamarinXaml/XamarinXaml.Android/XamarinXaml.Android.csproj b/Samples/XamarinXaml/XamarinXaml.Android/XamarinXaml.Android.csproj
index b9415bda..4a1ba5f2 100644
--- a/Samples/XamarinXaml/XamarinXaml.Android/XamarinXaml.Android.csproj
+++ b/Samples/XamarinXaml/XamarinXaml.Android/XamarinXaml.Android.csproj
@@ -52,7 +52,7 @@
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.3.0.991221" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
diff --git a/Samples/XamarinXaml/XamarinXaml/XamarinXaml.csproj b/Samples/XamarinXaml/XamarinXaml/XamarinXaml.csproj
index eff45963..b468ed39 100644
--- a/Samples/XamarinXaml/XamarinXaml/XamarinXaml.csproj
+++ b/Samples/XamarinXaml/XamarinXaml/XamarinXaml.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991220-pre3" />
+    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
   </ItemGroup>