Interface Generics and Constraints (#91)

* - Update testing to use TestLibrary project pattern.
- Update unit tests project to .NET 10.

* Delete SampleLibrary2 project.

* Update SampleApp project to .NET 10.

* Add TestLibrary assembly to all tests.

* Implement support for generic types and constraints on interface.

* Migrate to .slnx solution file format.

* Update PR workflow to use .NET 10 instead of 8.

Author: CodingFlow

.github/workflows/pull-request.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: ["8.0.x"]
+        dotnet-version: ["10.0.x"]
 
     steps:
       - uses: actions/checkout@v4

DecoratorGenerator.UnitTests/DecoratorGenerator.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.103.8" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
@@ -29,6 +28,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DecoratorGenerator\DecoratorGenerator.csproj" />
+    <ProjectReference Include="..\TestLibrary\TestLibrary.csproj" />
   </ItemGroup>
 
 </Project>

DecoratorGenerator.UnitTests/ITigerConstraints.cs

@@ -20,16 +20,17 @@ public void Setup() {
 
     [Test]
     public async Task OneInterface() {
-        var source = await ReadCSharpFile<IBird>();
-        var generated = await ReadCSharpFile<BirdDecorator>();
+        var source = await ReadCSharpFile<IBird>(true);
+        var generated = await ReadCSharpFile<BirdDecorator>(true);
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
+                    GetAssembly("TestLibrary")
                 },
                 Sources = { source },
                 GeneratedSources =
@@ -42,16 +43,17 @@ public async Task OneInterface() {
 
     [Test]
     public async Task OneInterface_Properties() {
-        var source = await ReadCSharpFile<ILionProperties>();
-        var generated = await ReadCSharpFile<LionPropertiesDecorator>();
+        var source = await ReadCSharpFile<ILionProperties>(true);
+        var generated = await ReadCSharpFile<LionPropertiesDecorator>(true);
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
+                    GetAssembly("TestLibrary")
                 },
                 Sources = { source },
                 GeneratedSources =
@@ -64,17 +66,17 @@ public async Task OneInterface_Properties() {
 
     [Test]
     public async Task OneInterface_Constraints() {
-        var source = await ReadCSharpFile<ITigerConstraints>();
-        var generated = await ReadCSharpFile<TigerConstraintsDecorator>();
+        var source = await ReadCSharpFileByName(true, "ITigerConstraints");
+        var generated = await ReadCSharpFileByName(true, "TigerConstraintsDecorator.generated");
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
-                    Assembly.GetExecutingAssembly()
+                    GetAssembly("TestLibrary")
                 },
                 Sources = { source },
                 GeneratedSources =
@@ -87,16 +89,17 @@ public async Task OneInterface_Constraints() {
 
     [Test]
     public async Task OneInterface_NestedNamespace() {
-        var source = await ReadCSharpFile<INested>();
-        var generated = await ReadCSharpFile<NestedDecorator>();
+        var source = await ReadCSharpFile<INested>(true);
+        var generated = await ReadCSharpFile<NestedDecorator>(true);
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
+                    GetAssembly("TestLibrary")
                 },
                 Sources = { source },
                 GeneratedSources =
@@ -109,19 +112,20 @@ public async Task OneInterface_NestedNamespace() {
 
     [Test]
     public async Task TwoInterfaces() {
-        var sourceOne = await ReadCSharpFile<IBird>();
-        var sourceTwo = await ReadCSharpFile<ICat>();
+        var sourceOne = await ReadCSharpFile<IBird>(true);
+        var sourceTwo = await ReadCSharpFile<ICat>(true);
 
-        var generatedOne = await ReadCSharpFile<BirdDecorator>();
-        var generatedTwo = await ReadCSharpFile<CatDecorator>();
+        var generatedOne = await ReadCSharpFile<BirdDecorator>(true);
+        var generatedTwo = await ReadCSharpFile<CatDecorator>(true);
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
+                    GetAssembly("TestLibrary")
                 },
                 Sources = { sourceOne, sourceTwo },
                 GeneratedSources =
@@ -135,19 +139,20 @@ public async Task TwoInterfaces() {
 
     [Test]
     public async Task WrapperList() {
-        var source = await ReadCSharpFile<IBird>();
-        var wrapperList = await ReadCSharpFile<WrapperList>();
-        var generated = await ReadCSharpFile<BirdDecorator>();
-        var generatedThirdParty = await ReadCSharpFile<DynamoDBContextDecorator>();
+        var source = await ReadCSharpFile<IBird>(true);
+        var wrapperList = await ReadCSharpFile<WrapperList>(true);
+        var generated = await ReadCSharpFile<BirdDecorator>(true);
+        var generatedThirdParty = await ReadCSharpFileByName(true, "DynamoDBContextDecorator.generated");
 
         await new VerifyCS.Test
         {
             TestState = {
-                ReferenceAssemblies = ReferenceAssemblies.Net.Net60,
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net90,
                 AdditionalReferences =
                 {
                     implementationAssembly,
-                    GetAssembly("AWSSDK.DynamoDBv2")
+                    GetAssembly("TestLibrary"),
+                    Assembly.GetAssembly(typeof(DynamoDBContext)),
                 },
                 Sources = { wrapperList, source },
                 GeneratedSources =
@@ -164,13 +169,32 @@ private static Assembly GetAssembly(string name) {
         return Assembly.Load(implementationAssemblyName);
     }
 
-    private static async Task<string> ReadCSharpFile<T>() {
-        var currentDirectory = Directory.GetParent(Directory.GetParent(AppDomain.CurrentDomain.BaseDirectory).Parent.Parent.FullName);
+    private static async Task<string> ReadCSharpFile<T>(bool isTestLibrary) {
+        var filenameWithoutExtension = typeof(T).Name;
+        return await ReadCSharpFileByName(isTestLibrary, filenameWithoutExtension);
+    }
+
+    private static async Task<string> ReadCSharpFileByName(bool isTestLibrary, string filenameWithoutExtension) {
+        var searchPattern = $"{filenameWithoutExtension}*.cs";
+        return await ReadFile(isTestLibrary, searchPattern);
+    }
+
+    private static async Task<string> ReadFile(bool isTestLibrary, string searchPattern) {
+        var currentDirectory = GetCurrentDirectory();
+
+        var targetDirectory = isTestLibrary ? GetTestLibraryDirectory(currentDirectory) : currentDirectory;
 
-        var searchPattern = $"{typeof(T).Name}*.cs";
-        var file = currentDirectory.GetFiles(searchPattern).First();
+        var file = targetDirectory.GetFiles(searchPattern).First();
 
         using var fileReader = new StreamReader(file.OpenRead());
         return await fileReader.ReadToEndAsync();
     }
-}
+
+    private static DirectoryInfo? GetCurrentDirectory() {
+        return Directory.GetParent(Directory.GetParent(AppDomain.CurrentDomain.BaseDirectory).Parent.Parent.FullName);
+    }
+
+    private static DirectoryInfo GetTestLibraryDirectory(DirectoryInfo currentDirectory) {
+        return currentDirectory.Parent.GetDirectories("TestLibrary").First();
+    }
+}

DecoratorGenerator.UnitTests/Tests.cs

@@ -0,0 +1,10 @@
+<Solution>
+  <Folder Name="/SolutionItems/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project Path="DecoratorGenerator.UnitTests/DecoratorGenerator.UnitTests.csproj" />
+  <Project Path="DecoratorGenerator/DecoratorGenerator.csproj" />
+  <Project Path="SampleApp/SampleApp.csproj" />
+  <Project Path="SampleLibrary/SampleLibrary.csproj" />
+  <Project Path="TestLibrary/TestLibrary.csproj" />
+</Solution>