Browse Source

Merge pull request #10630 from AvaloniaUI/fix-generator

Include Avalonia.Generators.props properly
pull/10647/head
Nikita Tsukanov 3 years ago
committed by GitHub
parent
commit
c298a7ffbf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      packages/Avalonia/Avalonia.csproj
  2. 1
      packages/Avalonia/Avalonia.props
  3. 1
      src/tools/Avalonia.Generators/Avalonia.Generators.csproj

4
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>

1
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>

1
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>

Loading…
Cancel
Save