Browse Source

Fix double build of Avalonia.Build.Tasks (#17813)

pull/17816/head
Julien Lebosquain 1 year ago
committed by GitHub
parent
commit
6b812c8468
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 7
      packages/Avalonia/Avalonia.csproj
  2. 4
      src/Avalonia.Base/Avalonia.Base.csproj
  3. 9
      src/Avalonia.MicroCom/Avalonia.MicroCom.csproj

7
packages/Avalonia/Avalonia.csproj

@ -7,11 +7,8 @@
<ItemGroup>
<PackageReference Include="Avalonia.BuildServices" Version="0.0.29" />
<ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" />
<ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj">
<PrivateAssets>all</PrivateAssets>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
</ProjectReference>
<ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj"
PrivateAssets="all" />
<ProjectReference Include="..\..\src\tools\Avalonia.Generators\Avalonia.Generators.csproj"
ReferenceOutputAssembly="false"
PrivateAssets="all"

4
src/Avalonia.Base/Avalonia.Base.csproj

@ -64,6 +64,8 @@
</ItemGroup>
<ItemGroup Label="Build dependency">
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"
ReferenceOutputAssembly="false"
PrivateAssets="all" />
</ItemGroup>
</Project>

9
src/Avalonia.MicroCom/Avalonia.MicroCom.csproj

@ -5,12 +5,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MicroCom.Runtime" Version="0.11.0" />
<ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<ExcludeAssets>all</ExcludeAssets>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
</ProjectReference>
<ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"
ReferenceOutputAssembly="false"
PrivateAssets="all" />
</ItemGroup>
<Import Project="..\..\build\BuildTargets.targets" />
<Import Project="..\..\build\TrimmingEnable.props" />

Loading…
Cancel
Save