From c0cf6deb2409ee2c2c1158fd09bc85d816c69432 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 10 Mar 2023 23:31:16 +0900
Subject: [PATCH] Include Avalonia.Generators.props properly

---
 packages/Avalonia/Avalonia.csproj                        | 4 ++++
 packages/Avalonia/Avalonia.props                         | 1 +
 src/tools/Avalonia.Generators/Avalonia.Generators.csproj | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj
index 1d210172f0..f21d6fefb4 100644
--- a/packages/Avalonia/Avalonia.csproj
+++ b/packages/Avalonia/Avalonia.csproj
@@ -43,6 +43,10 @@
        <Pack>true</Pack>
        <PackagePath>build\;buildTransitive\</PackagePath>
     </Content>
+    <Content Include="..\..\src\tools\Avalonia.Generators\Avalonia.Generators.props">
+      <Pack>true</Pack>
+      <PackagePath>build\;buildTransitive\</PackagePath>
+    </Content>
     <Content Include="*.targets">
       <Pack>true</Pack>
       <PackagePath>build\;buildTransitive\</PackagePath>
diff --git a/packages/Avalonia/Avalonia.props b/packages/Avalonia/Avalonia.props
index 26908b1081..2334aa91bc 100644
--- a/packages/Avalonia/Avalonia.props
+++ b/packages/Avalonia/Avalonia.props
@@ -6,6 +6,7 @@
     <AvaloniaUseExternalMSBuild>false</AvaloniaUseExternalMSBuild>
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)\AvaloniaBuildTasks.props"/>
+  <Import Project="$(MSBuildThisFileDirectory)\Avalonia.Generators.props"/>
 
   <!-- Allow loading the AvaloniaVS extension when referencing the Avalonia nuget package -->
   <ItemGroup>
diff --git a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
index 586caee605..4ebece583c 100644
--- a/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
+++ b/src/tools/Avalonia.Generators/Avalonia.Generators.csproj
@@ -21,7 +21,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="Avalonia.Generators.props" Pack="true" PackagePath="buildTransitive/$(PackageId).props" />
     <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>