Update CI and allow definition inside partial classes

.github/workflows/build-ci.yml

@@ -5,24 +5,23 @@ name: .NET
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
-    runs-on: windows-2025
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            9.0.x
-            5.0.x
-    - name: Build
-      run: dotnet build -c Release
-    - name: Test
-      run: dotnet test -c Release
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            10.0.x
+      - name: Build
+        run: dotnet build -c Release
+      - name: Test
+        run: dotnet test -c Release

.github/workflows/release.yml

@@ -3,29 +3,31 @@ name: Release to NuGet
 on:
   release:
     types: [published]
-
+
+env:
+  VERSION: ${{ github.event.release.draft && format('{0}-beta', github.event.release.tag_name) || github.event.release.tag_name }}
+
 jobs:
   build:
-    runs-on: windows-2025
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: |
-            9.0.x
-            5.0.x
-    - name: Build
-      run: dotnet build -c Release /p:Version=${{github.event.release.tag_name}}
-    - name: Test
-      run: dotnet test -c Release --no-build
-    - name: Pack Funzo
-      run: dotnet pack Funzo -c Release --no-build --output . /p:PackageVersion=${{github.event.release.tag_name}}
-    - name: Pack Serialization
-      run: dotnet pack Funzo.Serialization -c Release --no-build --output . /p:PackageVersion=${{github.event.release.tag_name}}
-    - name: Pack Source Generators
-      run: dotnet pack Funzo.SourceGenerators -c Release --no-build --output . /p:PackageVersion=${{github.event.release.tag_name}}
-    - name: Push to NuGet
-      run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            10.0.x
+      - name: Build
+        run: dotnet build -c Release /p:Version=$VERSION
+      - name: Test
+        run: dotnet test -c Release --no-build
+      - name: Pack Funzo
+        run: dotnet pack Funzo -c Release --no-build --output . /p:PackageVersion=$VERSION
+      - name: Pack Serialization
+        run: dotnet pack Funzo.Serialization -c Release --no-build --output . /p:PackageVersion=$VERSION
+      - name: Pack Source Generators
+        run: dotnet pack Funzo.SourceGenerators -c Release --no-build --output . /p:PackageVersion=$VERSION
+      - name: Push to NuGet
+        run: dotnet nuget push "*.nupkg" --api-key ${{secrets.nuget_api_key}} --source https://api.nuget.org/v3/index.json

Funzo.Example/Funzo.Example.csproj

@@ -2,8 +2,9 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 

Funzo.Generator/Funzo.Generator.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IncludeBuildOutput>false</IncludeBuildOutput>

Funzo.Serialization/Funzo.Serialization.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
@@ -31,7 +31,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="System.Text.Json" Version="9.0.6" />
+		<PackageReference Include="System.Text.Json" Version="10.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Funzo.SourceGenerators.Test/Funzo.SourceGenerators.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net481;net5.0</TargetFrameworks>
+		<TargetFramework>net10.0</TargetFramework>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
@@ -10,10 +10,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
 		<PackageReference Include="xunit" Version="2.9.3" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

Funzo.SourceGenerators.Test/ResultBuilderTEsts.cs → Funzo.SourceGenerators.Test/ResultBuilderTests.cs

@@ -126,4 +126,4 @@ public partial class MyError ;
 
 public class ArgumentError;
 public class InvalidError;
-public class UnknownError;
+public class UnknownError;

Funzo.SourceGenerators.Test/ResultGeneratorTests.cs

@@ -62,6 +62,14 @@ static TwoUnionResult process(int value)
 
         Assert.True(isOk);
     }
+
+    [Fact]
+    public void Generates_Nested_Results()
+    {
+        InnerClass.InnerResult result = "test";
+
+        Assert.True(result.IsErr(out _));
+    }
 }
 
 [Result<int, string>]
@@ -70,7 +78,7 @@ public partial class TestResult;
 public partial class TestUnitResult;
 
 [Union<int, string>]
-public partial class MyOk ;
+public partial class MyOk;
 
 [Result<MyOk, MyError>]
 public partial class TwoUnionResult;
@@ -82,4 +90,11 @@ public partial class ClonedErr;
 public partial class ClonedOk;
 
 [Result<ClonedOk, ClonedErr>]
-public partial class CheapClone;
+public partial class CheapClone;
+
+
+public static partial class InnerClass
+{
+    [Result<int, string>]
+    public partial class InnerResult;
+}

Funzo.SourceGenerators.Test/UnionGeneratorTests.cs

@@ -1,6 +1,7 @@
 using System;
 
 namespace Funzo.SourceGenerators.Test;
+
 public class UnionGeneratorTests
 {
     [Fact]
@@ -42,6 +43,14 @@ public void Generates_Shared_Property()
         Assert.Equal("b", u2.Text);
         Assert.Equal("c", u3.Text);
     }
+
+    [Fact]
+    public void Generates_Inner_Union()
+    {
+        TestUnionInPartialClass.InnerUnion u = new TestUnionInPartialClass.A();
+
+        u.Switch(a => { }, b => throw new InvalidOperationException());
+    }
 }
 
 
@@ -67,4 +76,14 @@ public class C(string text)
 {
     public string Text { get; set; } = text;
     public DateTime Date { get; set; }
+}
+
+
+public static partial class TestUnionInPartialClass
+{
+    public record A;
+    public record B;
+
+    [Union<A, B>]
+    public partial class InnerUnion;
 }

Funzo.SourceGenerators/Funzo.SourceGenerators.csproj

@@ -36,11 +36,11 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1">
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

Funzo.SourceGenerators/Generators/ResultSourceGenerator.cs

@@ -1,7 +1,11 @@
 using Funzo.SourceGenerators.Generators.Results;
 using Funzo.SourceGenerators.Helpers;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System;
+using System.Linq;
+using System.Text;
 
 namespace Funzo.SourceGenerators.Generators;
 
@@ -20,11 +24,21 @@ internal class ResultSourceGenerator : SourceGeneratorBase
             ? new Result1AritySourceGenerator(symbolWithAttribute)
             : new Result2AritySourceGenerator(symbolWithAttribute);
 
-        var source = $@"// <auto-generated />
+        var containingType = symbolWithAttribute.Symbol.ContainingType?.Name;
+
+        var sb = new StringBuilder($@"// <auto-generated />
 
 namespace {symbolWithAttribute.Symbol.ContainingNamespace.ToDisplayString()}
-{{
-    {generator.ClassDefinition}
+{{");
+
+        if (containingType is not null)
+        {
+            var isStatic = symbolWithAttribute.Symbol.ContainingType!.IsStatic ? "static " : "";
+            sb.AppendLine($"{isStatic}partial class {containingType} {{");
+        }
+
+        sb.AppendLine($@"
+        {generator.ClassDefinition}
     {{
         {generator.OkConstructor}
         {generator.OkStaticHelper}
@@ -33,15 +47,26 @@ namespace {symbolWithAttribute.Symbol.ContainingNamespace.ToDisplayString()}
         {generator.ErrStaticHelper}
         {generator.ErrImplicitConverter}
     }}
-}}";
+}}");
 
-        return source;
+        if (containingType is not null)
+        {
+            sb.AppendLine("}");
+        }
+
+        var src = sb.ToString();
+
+        return src;
     }
 
     private bool HasErrors(SourceProductionContext context, SymbolWithAttribute symbolWithAttribute)
     {
         var (ClassSymbol, _) = symbolWithAttribute;
-        if (!ClassSymbol.ContainingSymbol.Equals(ClassSymbol.ContainingNamespace, SymbolEqualityComparer.Default))
+
+        if (!ClassSymbol.ContainingSymbol.Equals(ClassSymbol.ContainingNamespace, SymbolEqualityComparer.Default) && ClassSymbol.ContainingType is { } containerType
+           && containerType.DeclaringSyntaxReferences.Any(syntax =>
+               syntax.GetSyntax() is BaseTypeDeclarationSyntax declaration
+               && !declaration.Modifiers.Any(mod => mod.IsKind(SyntaxKind.PartialKeyword))))
         {
             CreateDiagnosticError(context, FunzoDiagnosticDescriptors.Result.TopLevelError, ClassSymbol);
             return true;

Funzo.SourceGenerators/Generators/Unions/UnionSourceGenerator.cs

@@ -1,5 +1,7 @@
 using Funzo.SourceGenerators.Helpers;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System;
 using System.Collections.Immutable;
 using System.Linq;
@@ -22,11 +24,20 @@ internal class UnionSourceGenerator : SourceGeneratorBase
         var className = $"{classSymbol.Name}";
         var typeArguments = symbolWithAttribute.TypeArguments;
 
+        var containingType = classSymbol.ContainingType?.Name;
+
         StringBuilder source = new($@"// <auto-generated />
 
 namespace {classSymbol.ContainingNamespace.ToDisplayString()}
-{{
-    partial class {className} : global::Funzo.Union{typeArguments.OpenGenericPart()}
+{{");
+
+        if (containingType is not null)
+        {
+            var isStatic = classSymbol.IsStatic ? "static " : "";
+            source.AppendLine($"{isStatic}partial class {containingType} {{");
+        }
+
+        source.AppendLine($@"         partial class {className} : global::Funzo.Union{typeArguments.OpenGenericPart()}
     {{");
 
         foreach (var type in typeArguments)
@@ -37,7 +48,7 @@ partial class {className} : global::Funzo.Union{typeArguments.OpenGenericPart()}
 ");
         }
 
-        foreach(var prop in commonProperties)
+        foreach (var prop in commonProperties)
         {
             source.Append($@"
         public {prop.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {prop.Name} => Match({string.Join(",", Enumerable.Range(0, typeArguments.Length).Select(_ => $"x => x.{prop.Name}"))});
@@ -46,6 +57,10 @@ partial class {className} : global::Funzo.Union{typeArguments.OpenGenericPart()}
 
         source.Append(@"    }
 }");
+        if (containingType is not null)
+        {
+            source.AppendLine("}");
+        }
 
         var src = source.ToString();
         return src;
@@ -56,8 +71,12 @@ private bool HasErrors(SourceProductionContext context, SymbolWithAttribute symb
         var (classSymbol, attributeData) = symbol;
         var attributeLocation = classSymbol.Locations.FirstOrDefault() ?? Location.None;
 
-        if (!classSymbol.ContainingSymbol.Equals(classSymbol.ContainingNamespace, SymbolEqualityComparer.Default))
+        if (!classSymbol.ContainingSymbol.Equals(classSymbol.ContainingNamespace, SymbolEqualityComparer.Default) && classSymbol.ContainingType is { } containerType
+            && containerType.DeclaringSyntaxReferences.Any(syntax =>
+                syntax.GetSyntax() is BaseTypeDeclarationSyntax declaration
+                && !declaration.Modifiers.Any(mod => mod.IsKind(SyntaxKind.PartialKeyword))))
         {
+            System.Diagnostics.Debugger.Launch();
             CreateDiagnosticError(context, FunzoDiagnosticDescriptors.Union.TopLevelError, classSymbol);
             return true;
         }