Include Avalonia.Generators.props properly

3 years ago · c0cf6deb24
3 changed files with 5 additions and 1 deletions
--- 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>
--- 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>
--- 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>