From 08d3b9154d83051e1decbee347a03cac5b508883 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Thu, 5 Nov 2020 14:40:59 +0300
Subject: [PATCH] Extract microcom generator stuff into a separate .targets
 file

---
 build/MicroCom.targets                     | 33 ++++++++++++++++++++++
 src/Avalonia.Native/Avalonia.Native.csproj | 33 ++--------------------
 2 files changed, 35 insertions(+), 31 deletions(-)
 create mode 100644 build/MicroCom.targets

diff --git a/build/MicroCom.targets b/build/MicroCom.targets
new file mode 100644
index 0000000000..3a07950616
--- /dev/null
+++ b/build/MicroCom.targets
@@ -0,0 +1,33 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Ensure that code generator is actually built -->
+  <ItemGroup>
+    <ProjectReference Include="..\tools\MicroComGenerator\MicroComGenerator.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <ExcludeAssets>all</ExcludeAssets>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+    </ProjectReference>
+  </ItemGroup>
+  
+  <Target Name="GenerateAvaloniaNativeComInterop"
+          BeforeTargets="CoreCompile"
+          DependsOnTargets="ResolveReferences"
+          Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)/../tools/MicroComGenerator/**/*.cs"
+          Outputs="%(AvnComIdl.OutputFile)">
+    <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
+    <Exec Command="dotnet ../tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" LogStandardErrorAsError="true" />
+    <ItemGroup>
+      <!-- Remove and re-add generated file, this is needed for the clean build -->
+      <Compile Remove="%(AvnComIdl.OutputFile)"/>
+      <Compile Include="%(AvnComIdl.OutputFile)"/>
+    </ItemGroup>
+  </Target>
+  <ItemGroup>
+    <UpToDateCheckInput Include="@(AvnComIdl)"/>
+    <UpToDateCheckInput Include="$(MSBuildThisFileDirectory)/../tools/MicroComGenerator/**/*.cs"/>
+  </ItemGroup>
+  <PropertyGroup>
+    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
+  </PropertyGroup>
+  <Import Project="$(MSBuildThisFileDirectory)/BuildTargets.targets" />
+</Project>
diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj
index a08dc0f28f..3913484431 100644
--- a/src/Avalonia.Native/Avalonia.Native.csproj
+++ b/src/Avalonia.Native/Avalonia.Native.csproj
@@ -20,36 +20,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />
     <ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" />
+    <AvnComIdl Include="avn.idl" OutputFile="Interop.Generated.cs" />
   </ItemGroup>
-  
-  <!-- COM Interop generation -->
-  <ItemGroup>
-    <ProjectReference Include="..\tools\MicroComGenerator\MicroComGenerator.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <ExcludeAssets>all</ExcludeAssets>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-    </ProjectReference>
-  </ItemGroup>
-    
-  <Target Name="GenerateAvaloniaNativeComInterop" 
-          BeforeTargets="CoreCompile"
-          DependsOnTargets="ResolveReferences"
-          Inputs="avn.idl;$(MSBuildThisFileDirectory)/../tools/MicroComGenerator/**/*.cs"
-          Outputs="Interop.Generated.cs">
-    <Message Importance="high" Text="Generating Interop.Generated.cs" />
-    <Exec Command="dotnet ../tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll -i avn.idl --cs Interop.Generated.cs" LogStandardErrorAsError="true" />
-    <ItemGroup>
-      <!-- Remove and re-add generated file, this is needed for the clean build -->
-      <Compile Remove="Interop.Generated.cs"/>
-      <Compile Include="Interop.Generated.cs"/>
-    </ItemGroup>
-  </Target>
-  <ItemGroup>
-    <UpToDateCheckInput Include="avn.idl"/>
-    <UpToDateCheckInput Include="$(MSBuildThisFileDirectory)/../tools/MicroComGenerator/**/*.cs"/>
-  </ItemGroup>
-  <PropertyGroup>
-    <_AvaloniaPatchComInterop>true</_AvaloniaPatchComInterop>
-  </PropertyGroup>
-  <Import Project="..\..\build\BuildTargets.targets" />
+  <Import Project="../../build/MicroCom.targets" />
 </Project>