Skip to content

Commit 77a407d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into feature/FormattedTextPort
2 parents f0a747d + 1a39210 commit 77a407d

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
<ProjectConfiguration>
2-
<Settings>
3-
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
4-
</Settings>
2+
<Settings />
53
</ProjectConfiguration>

.ncrunch/Avalonia.Win32.v3.ncrunchproject

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<ProjectConfiguration>
22
<Settings>
3+
<AdditionalFilesToIncludeForProject>
4+
<Value>..\..\tools\MicroComGenerator\bin\Debug\netcoreapp3.1\**.*</Value>
5+
</AdditionalFilesToIncludeForProject>
36
<HiddenComponentWarnings>
47
<Value>MissingOrIgnoredProjectReference</Value>
58
</HiddenComponentWarnings>

.ncrunch/Direct3DInteropSample.v3.ncrunchproject

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<HiddenComponentWarnings>
44
<Value>MissingOrIgnoredProjectReference</Value>
55
</HiddenComponentWarnings>
6+
<IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
67
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
78
</Settings>
89
</ProjectConfiguration>

tests/Avalonia.Markup.Xaml.UnitTests/Converters/PointsListTypeConverterTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
using System.Collections.Generic;
2+
using System.Runtime.CompilerServices;
23
using Avalonia.Controls.Shapes;
4+
using Avalonia.Data;
35
using Avalonia.Markup.Xaml.Converters;
46
using Xunit;
57

68
namespace Avalonia.Markup.Xaml.UnitTests.Converters
79
{
810
public class PointsListTypeConverterTests
911
{
12+
static PointsListTypeConverterTests()
13+
{
14+
RuntimeHelpers.RunClassConstructor(typeof(RelativeSource).TypeHandle);
15+
}
16+
1017
[Theory]
1118
[InlineData("1,2 3,4")]
1219
[InlineData("1 2 3 4")]

0 commit comments

Comments
 (0)