Browse Source
Bump MicroCOM and use source generators (#21218)
* Bump MicroCom
* Use MicroCOM source generators instead of msbuild task
pull/21228/head
Max Katz
6 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
8 additions and
10 deletions
-
Directory.Packages.props
-
src/Avalonia.Native/Avalonia.Native.csproj
-
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
|
|
|
@ -15,9 +15,10 @@ |
|
|
|
<PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" /> |
|
|
|
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" /> |
|
|
|
<PackageVersion Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="8.3.1.3" /> |
|
|
|
<PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.4" /> |
|
|
|
<PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.4" /> |
|
|
|
<PackageVersion Include="MicroCom.Runtime" Version="0.11.4" /> |
|
|
|
<PackageVersion Include="MicroCom.CodeGenerator" Version="0.11.6" /> |
|
|
|
<PackageVersion Include="MicroCom.CodeGenerator.MSBuild" Version="0.11.6" /> |
|
|
|
<PackageVersion Include="MicroCom.CodeGenerator.Roslyn" Version="0.11.6" /> |
|
|
|
<PackageVersion Include="MicroCom.Runtime" Version="0.11.6" /> |
|
|
|
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" /> |
|
|
|
<PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" /> |
|
|
|
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="15.1.548" /> |
|
|
|
|
|
|
|
@ -7,7 +7,7 @@ |
|
|
|
<IsPackable Condition="'$(ForcePackAvaloniaNative)' == 'True'">True</IsPackable> |
|
|
|
<TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks> |
|
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
|
<UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild> |
|
|
|
<UseMicroComGeneratorRoslyn>true</UseMicroComGeneratorRoslyn> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup Condition="'$(PackAvaloniaNative)' == 'true'"> |
|
|
|
@ -22,7 +22,7 @@ |
|
|
|
<ItemGroup> |
|
|
|
<ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" /> |
|
|
|
<ProjectReference Include="..\Avalonia.Dialogs\Avalonia.Dialogs.csproj" /> |
|
|
|
<MicroComIdl Include="avn.idl" CSharpInteropPath="Interop.Generated.cs" /> |
|
|
|
<MicroComIdl Include="avn.idl" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<Import Project="..\..\build\MicroCOM.props" /> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks)</TargetFrameworks> |
|
|
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> |
|
|
|
<EnableRuntimeMarshalling>true</EnableRuntimeMarshalling> |
|
|
|
<UseMicroComGeneratorMSBuild>true</UseMicroComGeneratorMSBuild> |
|
|
|
<UseMicroComGeneratorRoslyn>true</UseMicroComGeneratorRoslyn> |
|
|
|
</PropertyGroup> |
|
|
|
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))"> |
|
|
|
<PackageReference Include="System.Numerics.Vectors" /> |
|
|
|
@ -18,10 +18,6 @@ |
|
|
|
<ItemGroup> |
|
|
|
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> |
|
|
|
<PackageReference Include="Avalonia.Angle.Windows.Natives" /> |
|
|
|
<MicroComIdl Include="WinRT\winrt.idl" CSharpInteropPath="WinRT\WinRT.Generated.cs" /> |
|
|
|
<MicroComIdl Include="Win32Com\win32.idl" CSharpInteropPath="Win32Com\Win32.Generated.cs" /> |
|
|
|
<MicroComIdl Include="DirectX\directx.idl" CSharpInteropPath="DirectX\directx.Generated.cs" /> |
|
|
|
<MicroComIdl Include="DComposition\dcomp.idl" CSharpInteropPath="DComposition\DComp.Generated.cs" /> |
|
|
|
<ProjectReference Include="..\Avalonia.Win32.Automation\Avalonia.Win32.Automation.csproj" /> |
|
|
|
</ItemGroup> |
|
|
|
<Import Project="..\..\..\build\MicroCOM.props" /> |
|
|
|
@ -29,6 +25,7 @@ |
|
|
|
<Import Project="..\..\..\build\DevAnalyzers.props" /> |
|
|
|
<Import Project="..\..\..\build\SourceGenerators.props" /> |
|
|
|
<ItemGroup> |
|
|
|
<MicroComIdl Include="**/*.idl" /> |
|
|
|
<Compile Remove="..\..\Shared\SourceGeneratorAttributes.cs" /> |
|
|
|
</ItemGroup> |
|
|
|
<Import Project="..\..\..\build\TrimmingEnable.props" /> |
|
|
|
|
