Browse Source
Merge pull request #2488 from AvaloniaUI/fixes/2451-build-fails
Fix build on VS2019
pull/2500/head
Steven Kirk
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
9 additions and
6 deletions
-
samples/ControlCatalog.Android/ControlCatalog.Android.csproj
-
samples/interop/WindowsInteropTest/Program.cs
-
samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
-
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
|
|
|
@ -32,7 +32,7 @@ |
|
|
|
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> |
|
|
|
<BundleAssemblies>False</BundleAssemblies> |
|
|
|
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> |
|
|
|
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86</AndroidSupportedAbis> |
|
|
|
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis> |
|
|
|
<Debugger>Xamarin</Debugger> |
|
|
|
<AndroidEnableMultiDex>False</AndroidEnableMultiDex> |
|
|
|
<AotAssemblies>False</AotAssemblies> |
|
|
|
@ -51,7 +51,7 @@ |
|
|
|
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> |
|
|
|
<BundleAssemblies>False</BundleAssemblies> |
|
|
|
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> |
|
|
|
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis> |
|
|
|
<AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis> |
|
|
|
<Debugger>Xamarin</Debugger> |
|
|
|
<AotAssemblies>False</AotAssemblies> |
|
|
|
<EnableLLVM>False</EnableLLVM> |
|
|
|
|
|
|
|
@ -15,7 +15,7 @@ namespace WindowsInteropTest |
|
|
|
{ |
|
|
|
System.Windows.Forms.Application.EnableVisualStyles(); |
|
|
|
System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false); |
|
|
|
AppBuilder.Configure<App>().UseWin32().UseDirect2D1().SetupWithoutStarting(); |
|
|
|
AppBuilder.Configure<App>().UseWin32().UseDirect2D1().UseDataGrid().SetupWithoutStarting(); |
|
|
|
System.Windows.Forms.Application.Run(new SelectorForm()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -104,6 +104,10 @@ |
|
|
|
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project> |
|
|
|
<Name>Avalonia.Base</Name> |
|
|
|
</ProjectReference> |
|
|
|
<ProjectReference Include="..\..\..\src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj"> |
|
|
|
<Project>{3278f3a9-9509-4a3f-a15b-bdc8b5bff632}</Project> |
|
|
|
<Name>Avalonia.Controls.DataGrid</Name> |
|
|
|
</ProjectReference> |
|
|
|
<ProjectReference Include="..\..\..\src\Avalonia.Controls\Avalonia.Controls.csproj"> |
|
|
|
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project> |
|
|
|
<Name>Avalonia.Controls</Name> |
|
|
|
@ -185,6 +189,5 @@ |
|
|
|
</ItemGroup> |
|
|
|
<Import Project="..\..\..\build\Rx.props" /> |
|
|
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
|
|
|
<Import Project="..\..\..\build\SkiaSharp.props" /> |
|
|
|
<Import Project="..\..\..\build\LegacyProject.targets" /> |
|
|
|
</Project> |
|
|
|
@ -32,7 +32,7 @@ |
|
|
|
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> |
|
|
|
<BundleAssemblies>False</BundleAssemblies> |
|
|
|
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> |
|
|
|
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86</AndroidSupportedAbis> |
|
|
|
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis> |
|
|
|
<Debugger>Xamarin</Debugger> |
|
|
|
<AndroidEnableMultiDex>False</AndroidEnableMultiDex> |
|
|
|
<DevInstrumentationEnabled>True</DevInstrumentationEnabled> |
|
|
|
@ -52,7 +52,7 @@ |
|
|
|
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> |
|
|
|
<BundleAssemblies>False</BundleAssemblies> |
|
|
|
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> |
|
|
|
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis> |
|
|
|
<AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis> |
|
|
|
<Debugger>Xamarin</Debugger> |
|
|
|
<AotAssemblies>False</AotAssemblies> |
|
|
|
<EnableLLVM>False</EnableLLVM> |
|
|
|
|
