From d6bb9305c16e391559d0a4725702c13492edea15 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 20 Apr 2026 09:35:03 -0700
Subject: [PATCH] Bump MicroCOM and use source generators (#21218)

* Bump MicroCom

* Use MicroCOM source generators instead of msbuild task
---
 Directory.Packages.props                         | 7 ++++---
 src/Avalonia.Native/Avalonia.Native.csproj       | 4 ++--
 src/Windows/Avalonia.Win32/Avalonia.Win32.csproj | 7 ++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e7d59ee139..7d2780e29e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -15,9 +15,10 @@
     <PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.3" />
-    <PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.4" />
-    <PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.4" />
-    <PackageVersion Include="MicroCom.Runtime" Version="0.11.4" />
+    <PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.6" />
+    <PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.6" />
+    <PackageVersion Include="MicroCom.CodeGenerator.Roslyn" Version="0.11.6" />
+    <PackageVersion Include="MicroCom.Runtime" Version="0.11.6" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.1.548" />
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index fb38606254..da64838fb9 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -7,7 +7,7 @@
     <IsPackable Condition="'$(ForcePackAvaloniaNative)' == 'True'">True</IsPackable>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild>
+    <UseMicroComGeneratorRoslyn>true</UseMicroComGeneratorRoslyn>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackAvaloniaNative)' == 'true'">
@@ -22,7 +22,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
-    <MicroComIdl Include="avn.idl" CSharpInteropPath="Interop.Generated.cs" />
+    <MicroComIdl Include="avn.idl" />
   </ItemGroup>
 
   <Import Project="..\..\build\MicroCOM.props" />
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 29ccafd02e..ea834e26a6 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
-    <UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild>
+    <UseMicroComGeneratorRoslyn>true</UseMicroComGeneratorRoslyn>
   </PropertyGroup>
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Numerics.Vectors" />
@@ -18,10 +18,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
     <PackageReference Include="Avalonia.Angle.Windows.Natives" />
-    <MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" />
-    <MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" />
-    <MicroComIdl Include="DirectX\directx.idl" CSharpInteropPath="DirectX\directx.Generated.cs" />
-    <MicroComIdl Include="DComposition\dcomp.idl" CSharpInteropPath="DComposition\DComp.Generated.cs" />
     <ProjectReference Include="..\Avalonia.Win32.Automation\Avalonia.Win32.Automation.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\MicroCOM.props" />
@@ -29,6 +25,7 @@
   <Import Project="..\..\..\build\DevAnalyzers.props" />
   <Import Project="..\..\..\build\SourceGenerators.props" />
   <ItemGroup>
+    <MicroComIdl Include="**/*.idl" />
     <Compile Remove="..\..\Shared\SourceGeneratorAttributes.cs" />
   </ItemGroup>
   <Import Project="..\..\..\build\TrimmingEnable.props" />