Browse Source
Merge branch 'master' into feature/glyphRunOptimization
pull/9153/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
14 additions and
3 deletions
-
.editorconfig
-
src/Markup/Avalonia.Markup.Xaml.Loader/Avalonia.Markup.Xaml.Loader.csproj
-
src/Windows/Avalonia.Win32/Win32Platform.cs
-
src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
|
|
|
@ -137,7 +137,9 @@ space_within_single_line_array_initializer_braces = true |
|
|
|
#Net Analyzer |
|
|
|
dotnet_analyzer_diagnostic.category-Performance.severity = none #error - Uncomment when all violations are fixed. |
|
|
|
|
|
|
|
#CA1825: Avoid zero-length array allocations |
|
|
|
# CA1802: Use literals where appropriate |
|
|
|
dotnet_diagnostic.CA1802.severity = warning |
|
|
|
# CA1825: Avoid zero-length array allocations |
|
|
|
dotnet_diagnostic.CA1825.severity = warning |
|
|
|
|
|
|
|
# Wrapping preferences |
|
|
|
|
|
|
|
@ -5,6 +5,11 @@ |
|
|
|
<IsPackable>true</IsPackable> |
|
|
|
<PackageId>Avalonia.Markup.Xaml.Loader</PackageId> |
|
|
|
<DefineConstants>$(DefineConstants);XAMLX_INTERNAL</DefineConstants> |
|
|
|
<LangVersion>10</LangVersion> |
|
|
|
</PropertyGroup> |
|
|
|
<!--Disable Net Perf. analyzer for submodule to avoid commit issue --> |
|
|
|
<PropertyGroup> |
|
|
|
<EnableNETAnalyzers>false</EnableNETAnalyzers> |
|
|
|
</PropertyGroup> |
|
|
|
<Import Project="IncludeXamlIlSre.props" /> |
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -241,8 +241,8 @@ namespace Avalonia.Win32 |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
private static readonly int SignalW = unchecked((int) 0xdeadbeaf); |
|
|
|
private static readonly int SignalL = unchecked((int)0x12345678); |
|
|
|
private const int SignalW = unchecked((int)0xdeadbeaf); |
|
|
|
private const int SignalL = unchecked((int)0x12345678); |
|
|
|
|
|
|
|
public void Signal(DispatcherPriority prio) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -3,6 +3,10 @@ |
|
|
|
<OutputType>Exe</OutputType> |
|
|
|
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> |
|
|
|
</PropertyGroup> |
|
|
|
<!--Disable Net Perf. analyzer for submodule to avoid commit issue --> |
|
|
|
<PropertyGroup> |
|
|
|
<EnableNETAnalyzers>false</EnableNETAnalyzers> |
|
|
|
</PropertyGroup> |
|
|
|
<ItemGroup> |
|
|
|
<ProjectReference Include="..\..\Avalonia.DesignerSupport\Avalonia.DesignerSupport.csproj" /> |
|
|
|
<ProjectReference Include="..\..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" /> |
|
|
|
|
